修改前端

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 // let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'appoint']
+// let devModules = ['index', 'statisticalReport', 'sale']
 let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

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

@@ -680,6 +680,13 @@
                   </el-button>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop="statementRemark"
+                label="账单备注"
+                width="120px"
+                show-overflow-tooltip
+              >
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -1200,6 +1207,13 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="statementRemark"
+          label="账单备注"
+          width="120px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
       </el-table>
       <el-form style="margin-left:20%">
         <el-form-item label="收货客户">
@@ -1378,7 +1392,7 @@ export default {
       pos: 0,
       //需要合并列的名称
       mergeList: [
-        '选择',
+        // '选择',
         '序号',
         '整车操作',
         '销售订单状态',
@@ -1411,7 +1425,7 @@ export default {
       ],
       //需要合并列的名称(已结算)
       mergeList1: [
-        '选择',
+        // '选择',
         '序号',
         '整车操作',
         '销售订单状态',
@@ -1865,8 +1879,12 @@ export default {
       let orderList = data.map(e => {
         return e.orderId
       })
+      let detailsOrderList = data.map(e => {
+        return e.detailsId
+      })
       let map = {
         orderList: orderList,
+        detailsOrderList: detailsOrderList,
         updateStatus: 1
       }
       this.$confirm('是否将勾选住的单据取消确认', '提示', {
@@ -1934,8 +1952,12 @@ export default {
         this.amsPriceList.push(mapvalue)
         return e.orderId
       })
+      let detailsOrderList = data.map(e => {
+        return e.detailsId
+      })
       let map = {
         orderList: this.makeSurePriceOrderList,
+        detailsOrderList: detailsOrderList,
         amsPriceList: this.amsPriceList
       }
       // let flag = 0