rev：软废碳平衡修正维护，袋标签打印，分配货位重复，球磨工艺酒精计算，入库删除

mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue

@@ -6,6 +6,7 @@
     width="450px"
     :before-close="handleClose"
     destroy-on-close
+    :close-on-click-modal="false"
     @close="close"
   >
     <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
@@ -33,7 +34,7 @@
       </el-form-item>
 
       <el-form-item label="粉料批号:" prop="pcsn">
-        <el-input v-model="form1.pcsn" disabled style="width: 250px;" />
+        <el-input v-model="form1.pcsn" readonly style="width: 250px;" />
       </el-form-item>
 
       <el-form-item label="重量:" prop="storage_qty">
@@ -41,11 +42,11 @@
       </el-form-item>
 
       <el-form-item label="还回人员编码:" prop="return_code">
-        <el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @blur="blurPerson(form1.return_code)" />
+        <el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @keyup.enter.native="blurPerson(form1.return_code)" />
       </el-form-item>
 
       <el-form-item label="还回人员名称:" prop="return_person">
-        <el-input v-model="form1.return_person" disabled style="width: 250px;" />
+        <el-input v-model="form1.return_person" readonly style="width: 250px;" />
       </el-form-item>
 
       <el-form-item label="软废类型:" prop="waste_type">
@@ -136,6 +137,14 @@ export default {
       // 根据单据号查询调用接口获取压制订单内信息
       crudBagrecord.blurQueryMater({ 'bill_code': val }).then(res => {
         this.materialList = res.data
+
+        if (this.materialList.length === 0) {
+          this.form1.material_code = null
+          this.form1.pcsn = null
+        } else {
+          this.form1.material_code = this.materialList[0].item_code
+          this.form1.pcsn = this.materialList[0].batch_seq
+        }
       })
     },
     changePcsn(val) {

mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue

@@ -354,8 +354,7 @@ export default {
         del: false,
         download: false,
         reset: true
-      },
-      query: { tech_type: '02' }
+      }
     })
   },
   data() {
@@ -392,6 +391,7 @@ export default {
       this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
     },
     confirm(row) {
+      row.tech_type = this.query.tech_type
       this.confirm_flg = true
       crudWastecchange.confirm(row).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)