From ea8b70ec38ac744aa17bb8464b2ed2347ad7e6a6 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 26 Jun 2024 14:17:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=AD=90=E5=8D=B7=E8=A7=84=E6=A0=BC=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue   | 12 +++++++-----
 lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue |  8 ++++----
 lms/nladmin-ui/src/views/wms/pdm/sub/index.vue       | 10 ++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
index c85add6e7..b36fd8bbc 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
@@ -107,7 +107,7 @@
         <el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
       </el-table>
     </el-card>
-    <MaterDiv ref="child" :dialog-show.sync="structShow" :paper_tube_description="paper_tube_description" :sect-prop="sectProp" @tableChanged="tableChanged" />
+    <MaterDiv ref="child" :dialog-show.sync="structShow" :paper-tube-description="paperTubeDescription" :sect-prop="sectProp" @tableChanged="tableChanged" />
   </el-dialog>
 </template>
 
@@ -166,7 +166,7 @@ export default {
       stor_id: '',
       sect_id: '',
       sectProp: null,
-      paper_tube_description: '',
+      paperTubeDescription: '',
       bucketProp: {},
       structShow: false,
       bucketObj: null,
@@ -337,9 +337,9 @@ export default {
       debugger
       this.form.tableMater = this.currentSelection
       this.form.checked = row.material_code
-      this.form.sale_order_name = this.sale_order_name
+      this.form.sale_order_name = this.saleOrderName
       await crudPackagerelation.updateEntityList(this.form)
-      const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.sale_order_name })
+      const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.saleOrderName })
       this.openParam = res.content
       this.clearSelection()
       this.form.tableMater = []
@@ -349,7 +349,9 @@ export default {
     divStruct() {
       debugger
       if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) {
-        this.paper_tube_description = this.currentSelection[0].paper_tube_description
+        debugger
+        const paper_description = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '')
+        this.paperTubeDescription = paper_description[0].paper_tube_description
         this.structShow = true
         this.$refs.child.getMsg(false)
       } else {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
index de651c9a1..c406f6ecb 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -67,10 +67,10 @@
         请仔细核对子卷与木箱规格是否匹配，
         <br>
         <br>
-        <span class="red-text">木箱长度为：{{ this.box_length }}</span>，
+        <span class="red-text">木箱长度为：{{ this.boxLength }}</span>，
         <br>
         <br>
-        <span class="red-text">子卷规格为：{{ this.paper_tube_description }}</span>，
+        <span class="red-text">子卷规格为：{{ this.paperTubeDescription }}</span>，
         <br>
         <br>
         点击确定后将立即生成木箱出库任务，无法更改！
@@ -121,7 +121,7 @@ export default {
   },
   data() {
     return {
-      box_length: '',
+      boxLength: '',
       classes: [],
       dialogVisible: false,
       dialogVisible1: false,
@@ -211,7 +211,7 @@ export default {
     submit() {
       debugger
       this.rows = this.$refs.table.selection
-      this.box_length = this.rows[0].box_length
+      this.boxLength = this.rows[0].box_length
       if (this.rows.length <= 0) {
         this.$message('请先选择木箱信息')
         return
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue
index bd5e38549..4f8db0261 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue
@@ -127,7 +127,7 @@
     <DivDialog
       :dialog-show.sync="divShow"
       :open-param="openParam"
-      :sale_order_name="this.sale_order_name"
+      :sale-order-name="this.saleOrderName"
       @childEvent="handleChildEvent"
       @AddChanged="querytable"
     />
@@ -198,7 +198,7 @@ export default {
       activeName: 'first',
       divShow: false,
       openParam: [],
-      sale_order_name: null,
+      saleOrderName: null,
       bussConfig: null,
       currentRow: null,
       dis_flag: true,
@@ -224,15 +224,13 @@ export default {
       this.crud.toQuery()
     },
     async divOpen() {
-      debugger
-      this.sale_order_name = this.currentRow.sale_order_name
+      this.saleOrderName = this.currentRow.sale_order_name
       const res = await crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name })
       this.openParam = res.content
       // this.divShow = true
     },
     divOpen1() {
-      debugger
-      this.sale_order_name = this.currentRow.sale_order_name
+      this.saleOrderName = this.currentRow.sale_order_name
       crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }).then(res => {
         this.openParam = res.content
         this.divShow = true