修改

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -323,9 +323,20 @@ export default {
       this.form.detail_count = this.form.tableData.length
     },
     deleteRow(index, rows) {
-      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-      rows.splice(index, 1)
-      this.form.detail_count = this.form.tableData.length
+      debugger
+      const package_box_sn = rows[index].package_box_sn
+      let len = rows.length
+      while (len--) {
+        const obj = rows[len]
+        if (package_box_sn === obj.package_box_sn) {
+          const index = rows.indexOf(obj)
+          if (index > -1) { // 移除找到的指定元素
+            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
+            rows.splice(index, 1)
+            this.form.detail_count = this.form.tableData.length
+          }
+        }
+      }
     },
     tableChanged(rows) {
       debugger
@@ -341,7 +352,6 @@ export default {
           item.quality_scode = '01'
           item.ivt_level = '01'
           item.is_active = '1'
-          item.plan_qty = item.need_qty
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           this.form.tableData.splice(-1, 0, item)
         }

lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue

@@ -63,7 +63,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column show-overflow-tooltip width="200" prop="sale_order_name" label="订单号" />
         <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
-        <el-table-column prop="customer_name" label="客户名称" />
+        <el-table-column width="200" prop="customer_description" label="客户名称" />
         <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
         <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
         <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
@@ -90,6 +90,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
+import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 
 const start = new Date()
 export default {
@@ -162,8 +163,11 @@ export default {
       debugger
       this.$emit('update:dialogShow', false)
       this.rows = this.$refs.multipleTable.selection
+      crudRawAssist.queryBoxMater(this.rows).then(res => {
+        this.rows = res
+        this.$emit('tableChanged', this.rows)
+      })
       // this.form = this.$options.data().form
-      this.$emit('tableChanged', this.rows)
     }
   }
 }

lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue

@@ -136,14 +136,12 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column prop="pcsn" label="批次号" align="center" />
-        <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
-        <el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
-        <el-table-column prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="box_no" label="载具号" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="start_point_code" label="起始位置" align="center" />
         <el-table-column prop="next_point_code" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
-        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
       </el-table>
     </el-card>
   </el-dialog>

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -182,7 +182,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据编码">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>

lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js

@@ -192,6 +192,22 @@ export function backConfirm(data) {
   })
 }
 
+export function delDis(data) {
+  return request({
+    url: '/api/in/rawAssist/delDis',
+    method: 'post',
+    data
+  })
+}
+
+export function queryBoxMater(data) {
+  return request({
+    url: '/api/in/rawAssist/queryBoxMater',
+    method: 'post',
+    data
+  })
+}
+
 export default { add, edit, del, getType, getBillDtl, insertDtl, getIODtl, commit, checkVehicle,
-  confirmvehicle, deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint,
+  confirmvehicle, deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint, delDis, queryBoxMater,
   queryTask, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm }