From feeddcb8246d5a2fb1f2a58352c0aa3c629be10e Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sat, 17 Dec 2022 15:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/st/outbill/AddDialog.vue    |  6 +++---
 .../src/views/wms/st/outbill/DivDialog.vue    | 19 +++++++++----------
 .../src/views/wms/st/outbill/MoneyDialog.vue  |  4 ++--
 .../src/views/wms/st/outbill/index.vue        |  7 +++----
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index 095910325..5318dd03f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -170,14 +170,14 @@
         </template>
       </el-table-column>
       <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column prop="box_no" label="箱号" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center">
+      <el-table-column prop="box_no" label="箱号" align="center" min-width="250px" show-overflow-tooltip />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" width="150px" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" />
+      <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" width="140px" align="center" />
       <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
         <template scope="scope">
           <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
index d047d02e0..bf01fa319 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -309,21 +309,20 @@ export default {
       }
     }
   },
-  created() {
-    checkoutbill.getInvTypes().then(res => {
-      this.invtypelist = res
-    })
-    const area_type = '1585167595403874304'
-
-    crudPoint.getPoint({ 'area_type': area_type }).then(res => {
-      this.pointlist = res
-    })
-  },
   methods: {
     open() {
       crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
+
+      const area_type = '1585167595403874304'
+      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
+        this.pointlist = res
+      })
+
+      checkoutbill.getInvTypes().then(res => {
+        this.invtypelist = res
+      })
     },
     close() {
       this.$refs['form2'].resetFields()
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
index 8f18f654f..482e223c6 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
@@ -144,7 +144,7 @@ export default {
       type: Boolean,
       default: false
     },
-    openParam: {
+    openParamMoney: {
       type: Object
     }
   },
@@ -152,7 +152,7 @@ export default {
     dialogShow: {
       handler(newValue, oldValue) {
         this.dialogVisible = newValue
-        this.formMst = this.openParam
+        this.formMst = this.openParamMoney
       }
     }
   },
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 1b929927b..2a75efb29 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -246,7 +246,7 @@
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
     <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
     <TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable" />
-    <MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param="openParam" />
+    <MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney"/>
   </div>
 </template>
 
@@ -262,8 +262,6 @@ import MoneyDialog from '@/views/wms/st/outbill/MoneyDialog'
 import DivDialog from '@/views/wms/st/outbill/DivDialog'
 import TaskDialog from '@/views/wms/st/outbill/TaskDialog'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
-import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
-import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
@@ -299,6 +297,7 @@ export default {
       work_flag: true,
       confirm_flag: true,
       openParam: [],
+      openParamMoney: null,
       mstrow: {},
       viewShow: false,
       currentRow: null,
@@ -413,7 +412,7 @@ export default {
       this.handleCurrentChange(null)
     },
     openMoney(row) {
-      this.openParam = row
+      this.openParamMoney = row
       this.openMoneyDialog = true
     },
     printExcel(jo) {