From e23b513c6bf82b2e699a714644f7f5d5d34e0b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 14 Jun 2024 16:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E4=BD=8D=E8=B0=83=E6=8B=A8=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E5=82=A8=E4=BD=8D=E8=B0=83=E6=8B=A8?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerStorageAllocationConfirm.vue      | 69 +++++++++++++++----
 .../lineSideWarehouseAllocationConfirm.vue    | 69 +++++++++++++++----
 2 files changed, 108 insertions(+), 30 deletions(-)

diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue
index 53edb6116..d3bb99539 100644
--- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue
+++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue
@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { getPageListWip, confirm, getDetailed } from "@/api/wms-api"
+import { getPageListWip, confirm, getDetailed,postCancel } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -93,6 +93,14 @@ export default {
           hide: () => { return this.hideButton([false]) },
           size: 'mini'
         },
+        {
+          type: 'danger',
+          icon: 'el-icon-circle-close',
+          label: '取消',
+          name: "cancel",
+          hide: () => { return this.hideButton([false]) },
+          size: 'mini'
+        },
         // {
         //   type: 'danger',
         //   icon: 'el-icon-delete-solid',
@@ -111,21 +119,52 @@ export default {
     //抽屉常用按钮
     drawerbutton (val) {
       if (val == 'handle') {
-        this.Loading.appMainLoading = true
-        let data = {
-          id: this.propsData.id
-        }
-        confirm(this.propsData.id, this.URL).then(res => {
-          this.$successMsg('已确认')
-          getDetailed(this.propsData.id, this.URL).then(res => {
-            this.propsData = res
+        this.$confirm('您确定要确认吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          let data = {
+            id: this.propsData.id
+          }
+          confirm(this.propsData.id, this.URL).then(res => {
+            this.$successMsg('已确认')
+            getDetailed(this.propsData.id, this.URL).then(res => {
+              this.propsData = res
+            })
+            this.paging()
+            this.Loading.appMainLoading = false
+          }).catch(err => {
+            console.log(err)
+            this.Loading.appMainLoading = false
           })
-          this.paging()
-          this.Loading.appMainLoading = false
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
+        }).catch(() => {
+
+        });
+      }
+      else if(val == 'cancel'){
+        this.$confirm('您确定要取消吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          let data = {
+            id: this.propsData.id
+          }
+          postCancel(this.propsData.id, this.URL).then(res => {
+            this.$successMsg('已取消')
+            this.displayDialog.detailsDialog = false
+            this.paging()
+            this.Loading.appMainLoading = false
+          }).catch(err => {
+            console.log(err)
+            this.Loading.appMainLoading = false
+          })
+        }).catch(() => {
+
+        });
       }
       //  else if(val == 'invalid'){
       //   let data = {
diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue
index a8c336c10..ba4ead73e 100644
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue
@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { getPageListWip, confirm, getDetailed } from "@/api/wms-api"
+import { getPageListWip, confirm, getDetailed,postCancel } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -93,6 +93,14 @@ export default {
           hide: () => { return this.hideButton([false]) },
           size: 'mini'
         },
+        {
+          type: 'danger',
+          icon: 'el-icon-circle-close',
+          label: '取消',
+          name: "cancel",
+          hide: () => { return this.hideButton([false]) },
+          size: 'mini'
+        },
         // {
         //   type: 'danger',
         //   icon: 'el-icon-delete-solid',
@@ -111,21 +119,52 @@ export default {
     //抽屉常用按钮
     drawerbutton (val) {
       if (val == 'handle') {
-        this.Loading.appMainLoading = true
-        let data = {
-          id: this.propsData.id
-        }
-        confirm(this.propsData.id, this.URL).then(res => {
-          this.$successMsg('已确认')
-          getDetailed(this.propsData.id, this.URL).then(res => {
-            this.propsData = res
+        this.$confirm('您确定要确认吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          let data = {
+            id: this.propsData.id
+          }
+          confirm(this.propsData.id, this.URL).then(res => {
+            this.$successMsg('已确认')
+            getDetailed(this.propsData.id, this.URL).then(res => {
+              this.propsData = res
+            })
+            this.paging()
+            this.Loading.appMainLoading = false
+          }).catch(err => {
+            console.log(err)
+            this.Loading.appMainLoading = false
           })
-          this.paging()
-          this.Loading.appMainLoading = false
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
+        }).catch(() => {
+
+        });
+      }
+      else if(val == 'cancel'){
+        this.$confirm('您确定要取消吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          let data = {
+            id: this.propsData.id
+          }
+          postCancel(this.propsData.id, this.URL).then(res => {
+            this.$successMsg('已取消')
+            this.displayDialog.detailsDialog = false
+            this.paging()
+            this.Loading.appMainLoading = false
+          }).catch(err => {
+            console.log(err)
+            this.Loading.appMainLoading = false
+          })
+        }).catch(() => {
+
+        });
       }
       //  else if(val == 'invalid'){
       //   let data = {