提交代码

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -341,6 +341,7 @@
                 width="150px"
               >
               </el-table-column>
+
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -484,15 +485,6 @@
               </el-table-column>
               <el-table-column
                 prop="addressPlace"
-                label="收货地址"
-                width="250px"
-                sortable
-                column-key="addressPlace"
-                :filters="filteraddressPlace"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="actualAddress"
                 label="实际收货地址"
                 width="250px"
                 sortable
@@ -586,28 +578,6 @@
                 width="150px"
               >
               </el-table-column>
-              <el-table-column
-                prop="priceValue"
-                label="系统建议运价"
-                width="100px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="detailsAmount"
-                label="系统建议运费"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futurePriceValue"
-                label="最终运价"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futureDetailsAmount"
-                label="最终运费"
-                width="100px"
-              >
-              </el-table-column>
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -829,6 +799,7 @@ export default {
       capacityList: [],
       carrierList: [],
       tableData: [],
+      tableData1: [],
       //筛选条件1（客户）
       filters1: [],
       spanArr: [],
@@ -854,6 +825,7 @@ export default {
         '承运商',
         '客户',
         '收货地址',
+        '实际收货地址',
         '业务员',
         '送货单打印',
         '收货客户电话',
@@ -863,7 +835,7 @@ export default {
         '销售片区',
         '抵达时间',
         '签收时间',
-        '系统建议运价',
+        '最终运价',
         '摘要'
       ],
       //钢材多拼车辆线路ID
@@ -1871,6 +1843,14 @@ export default {
           }
         }
       })
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        let data = this.tableData.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
       }else if(this.activeName === 'second'){
         console.log(this.$refs.tableRef1)
         this.$refs.tableRef1.$children.forEach(item => {
@@ -1883,15 +1863,15 @@ export default {
           }
         }
       })
-      }
       this.downloadLoading = true
       require.ensure([], () => {
         const {
           export_json_to_excel
         } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        let data = this.tableData.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        let data = this.tableData1.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
         export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
       })
+      }
       loading.close()
     },
     changeScreen() {},
@@ -2802,16 +2782,16 @@ export default {
           this.filterMap
         )
         .then(res => {
-          this.tableData = res.data.data
+          this.tableData1 = res.data.data
           this.totalHeight += this.itemHeight
           this.visibleList1 = []
-          this.visibleList1 = this.tableData.slice(
+          this.visibleList1 = this.tableData1.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
           console.log(this.visibleList1)
           this.getSpanArr(this.visibleList1)
-          this.getTotalNum(this.tableData)
+          this.getTotalNum(this.tableData1)
           loading.close()
         })
         .catch(() => {