From b3394dac77ca782c7c9192bcc750dad43a7203bb Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 25 Aug 2023 10:16:02 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/st/outbill/DivDialog.vue      | 17 ++++++++++++++++-
 .../src/views/wms/st/outbill/StructIvt.vue      | 11 ++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

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 bcae2a808..0c3adf64d 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -51,6 +51,7 @@
         <el-button
           slot="left"
           class="filter-item"
+          :loading="loadingAlldiv"
           type="primary"
           icon="el-icon-plus"
           size="mini"
@@ -61,7 +62,7 @@
         <el-button
           slot="left"
           class="filter-item"
-          :loading="loadingAutodiv"
+          :loading="loadingAlldiv"
           type="primary"
           icon="el-icon-check"
           size="mini"
@@ -75,6 +76,7 @@
           class="filter-item"
           type="primary"
           icon="el-icon-check"
+          :loading="loadingAlldiv"
           size="mini"
           :disabled="button2"
           @click="oneCancel()"
@@ -87,6 +89,7 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
+          :loading="loadingAlldiv"
           :disabled="button3"
           @click="openStructIvt"
         >
@@ -417,10 +420,14 @@ export default {
     openStructIvt() {
       this.currentRow.remark = ''
       this.currentRow.stor_id = this.storId
+      this.loadingAlldiv = true
       checkoutbill.getStructIvt(this.currentRow).then(res => {
         this.openParam = res
         this.structshow = true
         this.openRow = this.currentRow
+        this.loadingAlldiv = false
+      }).catch(() => {
+        this.loadingAlldiv = false
       })
     },
     sectQueryChange(val) {
@@ -527,14 +534,22 @@ export default {
       }
     },
     allCancel() {
+      this.loadingAlldiv = true
       checkoutbill.allCancel(this.mstrow).then(res => {
         this.queryTableDtl()
+        this.loadingAlldiv = false
+      }).catch(() => {
+        this.loadingAlldiv = false
       })
     },
     oneCancel() {
+      this.loadingAlldiv = true
       if (this.currentRow.iostorinvdtl_id !== null) {
         checkoutbill.allCancel(this.currentRow).then(res => {
           this.queryTableDtl()
+          this.loadingAlldiv = false
+        }).catch(() => {
+          this.loadingAlldiv = false
         })
       }
     },
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
index 5f12371a7..458a87810 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
@@ -15,7 +15,7 @@
           <!--左侧插槽-->
           <slot name="left" />
           <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
-          <el-button slot="left" type="primary" @click="submit">保存</el-button>
+          <el-button slot="left" v-loading.fullscreen.lock="fullscreenLoading" type="primary" @click="submit">保存</el-button>
         </span>
       </div>
     </span>
@@ -154,6 +154,7 @@ export default {
     return {
       dialogVisible: false,
       dialogVisible2: false,
+      fullscreenLoading: false,
       goal_unassign_qty: 0,
       queryrow: {},
       sects: [],
@@ -264,9 +265,13 @@ export default {
             rows.push(item)
           }
         })
+        this.fullscreenLoading = true
         checkoutbill.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
           this.$emit('update:dialogShow', false)
           this.$emit('StructIvtClosed')
+          this.fullscreenLoading = false
+        }).catch(() => {
+          this.fullscreenLoading = false
         })
       } else {
         this.$confirm('未分配重量不为0,是否继续提交？')
@@ -277,9 +282,13 @@ export default {
                 rows.push(item)
               }
             })
+            this.fullscreenLoading = true
             checkoutbill.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
               this.$emit('update:dialogShow', false)
               this.$emit('StructIvtClosed')
+              this.fullscreenLoading = false
+            }).catch(() => {
+              this.fullscreenLoading = false
             })
           })
           .catch(_ => {