【nev-pc】线边仓储位调拨确认和客户储位调拨确认：添加取消功能

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
+        this.$confirm('您确定要确认吗, 是否继续?', '提示', {
-        let data = {
+          confirmButtonText: '确定',
-          id: this.propsData.id
+          cancelButtonText: '取消',
-        }
+          type: 'warning'
-        confirm(this.propsData.id, this.URL).then(res => {
+        }).then(() => {
-          this.$successMsg('已确认')
+          this.Loading.appMainLoading = true
-          getDetailed(this.propsData.id, this.URL).then(res => {
+          let data = {
-            this.propsData = res
+            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()
+        }).catch(() => {
-          this.Loading.appMainLoading = false
+
-        }).catch(err => {
+        });
-          console.log(err)
+      }
-          this.Loading.appMainLoading = false
+      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 = {

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
+        this.$confirm('您确定要确认吗, 是否继续?', '提示', {
-        let data = {
+          confirmButtonText: '确定',
-          id: this.propsData.id
+          cancelButtonText: '取消',
-        }
+          type: 'warning'
-        confirm(this.propsData.id, this.URL).then(res => {
+        }).then(() => {
-          this.$successMsg('已确认')
+          this.Loading.appMainLoading = true
-          getDetailed(this.propsData.id, this.URL).then(res => {
+          let data = {
-            this.propsData = res
+            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()
+        }).catch(() => {
-          this.Loading.appMainLoading = false
+
-        }).catch(err => {
+        });
-          console.log(err)
+      }
-          this.Loading.appMainLoading = false
+      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 = {