修改

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    //target: 'http://localhost:8080',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -297,6 +297,13 @@
           width="50px"
         >
         </el-table-column>
+        <el-table-column
+          prop="materialThoWeight"
+          label="理重"
+          align="center"
+          width="50px"
+        >
+        </el-table-column>
         <el-table-column
           prop="addressPlace"
           label="收货地址"
@@ -485,6 +492,20 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="saleOrderInertUpdateRemark"
+          label="销售订单变更记录"
+          width="120px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="orderInsertUpdateRemark"
+          label="运输订单变更记录"
+          width="120px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
       </el-table>
     </div>
     <div>
@@ -1546,7 +1567,9 @@ export default {
         '排队开始时间',
         '钢材科放行时间',
         '备注',
-        '订单变更时间'
+        '订单变更时间',
+        '运输订单变更记录',
+        '销售订单变更记录'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -3524,7 +3547,13 @@ export default {
       //通过车序号的个数来计算车数
       let arr = []
       arr = data.map(e => {
-        if (e.capacityNo != '取消') {
+        console.log(e)
+        if (
+          e.capacityNo != '取消' &&
+          e.saleOrderStatus != '关闭' &&
+          e.saleOrderStatus != '反审批' &&
+          e.orderStatus != '已关闭'
+        ) {
           return e.saleOrderMaterialId
         }
       })