opt:优化子卷装箱校验逻辑

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -4,7 +4,7 @@
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
-    width="1000px"
+    width="1100px"
     @close="close"
     @open="open"
   >
@@ -38,9 +38,9 @@
       @select-all="onSelectAll"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="box_no" label="木箱号" />
-      <el-table-column prop="material_code" label="木箱规格" />
-      <el-table-column prop="material_name" label="物料名称" />
+      <!--      <el-table-column prop="box_no" label="木箱号" :min-width="flexWidth('box_no',crud.data,'木箱号')" />-->
+      <el-table-column prop="material_code" label="木箱规格" :min-width="flexWidth('material_code',crud.data,'木箱规格')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
       <el-table-column prop="box_length" label="木箱长度" />
       <el-table-column prop="box_width" label="木箱宽度" />
       <el-table-column prop="box_high" label="木箱高度" />
@@ -54,7 +54,7 @@
     </span>
     <el-dialog
       :visible.sync="dialogVisible1"
-      width="28%"
+      width="35%"
       append-to-body
       @close="dialogVisible1 = false"
     >
@@ -67,13 +67,13 @@
         请仔细核对子卷与木箱规格是否匹配，
         <br>
         <br>
-        <span class="red-text">木箱规格为：{{ this.boxLength }}</span>，
+        <span class="red-text">木箱规格为：{{ this.materialName }}</span>，
         <br>
         <br>
         <span class="red-text">子卷规格为：{{ this.paperTubeDescription }}</span>，
         <br>
         <br>
-        点击确定后将立即生成木箱出库任务，无法更改！
+        点击确定后将立即生成空木箱出库任务，无法更改！
       </span>
       <br>
       <br>
@@ -121,7 +121,7 @@ export default {
   },
   data() {
     return {
-      boxLength: '',
+      materialName: '',
       classes: [],
       dialogVisible: false,
       dialogVisible1: false,
@@ -211,14 +211,15 @@ export default {
     submit() {
       debugger
       this.rows = this.$refs.table.selection
-      this.boxLength = this.rows[0].material_code
       if (this.rows.length <= 0) {
-        this.$message('请先选择木箱信息')
+        this.crud.notify('请选择木箱信息！', CRUD.NOTIFICATION_TYPE.WARNING)
         return
       }
+      this.materialName = this.rows[0].material_name
       this.dialogVisible1 = true
     },
     confirmSubmit() {
+      debugger
       this.dialogVisible1 = false
       this.$emit('update:dialogShow', false)
       this.$emit('tableChanged', this.checkrow)