【nev-pc】成品发运申请-删除功能开发

fe/PC/src/api/wms-api.js

@@ -800,6 +800,15 @@ export function postImportNoteBlob(data, url,isSpecial) {
   })
 }
 
+// 成品发运申请-删除
+export function deliverRequestDelete(id) {
+  return request({
+    url: baseURL + 'wms/store/deliver-request/delete-by-id',
+    method: 'post',
+    params:{id:id}
+  })
+}
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({

fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue

@@ -79,7 +79,8 @@ import {
   processRequest,
   getDetailed, 
   getPageListWip,
-  deliverRequestHandleList
+  deliverRequestHandleList,
+  deliverRequestDelete
 } from "@/api/wms-api";
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
@@ -111,15 +112,9 @@ export default {
       }
     },
     // 按钮显示
-    hideButton: function () {
+    hideDelButton: function () {
-      return function (val) {
+      return function () {
-        let data = true
+        return this.propsData.deliverRequestType != 1
-        val.forEach(key => {
-          if (this.propsData.requestStatus == key) {
-            data = false
-          }
-        })
-        return data
       }
     },
   },
@@ -170,6 +165,13 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
+        {
+          type: "danger",
+          label: "删除",
+          name: "delete",
+          size: "mini",
+          hide: () => { return this.hideDelButton() },
+        },
         // ...requestData(this)
       ],
       showFilterSta_normal:false,//查看普通发货
@@ -284,28 +286,48 @@ export default {
     },
     drawerbuttonHandle(val){
       // 审批
-      if (val == 'agreeRequest') {
+      // if (val == 'agreeRequest') {
-        this.Loading.appMainLoading = true
+      //   this.Loading.appMainLoading = true
-        processRequest(this.propsData.id, this.URL + '/agree/').then(res => {
+      //   processRequest(this.propsData.id, this.URL + '/agree/').then(res => {
-          getDetailed(this.propsData.id, this.URL).then(res => {
+      //     getDetailed(this.propsData.id, this.URL).then(res => {
-            this.propsData = res
+      //       this.propsData = res
-          })
+      //     })
-          this.paging()
+      //     this.paging()
-          this.$confirm('审批成功，是否需要打印发货单', '提示', {
+      //     this.$confirm('审批成功，是否需要打印发货单', '提示', {
-            confirmButtonText: '确定',
+      //       confirmButtonText: '确定',
-            cancelButtonText: '取消',
+      //       cancelButtonText: '取消',
-            type: 'warning'
+      //       type: 'warning'
-          }).then(() => {
+      //     }).then(() => {
-            // 打印发货单
+      //       // 打印发货单
-            this.printHandle()
+      //       this.printHandle()
-          }).catch(() => {
+      //     }).catch(() => {
 
-          });
+      //     });
-          this.Loading.appMainLoading = false
+      //     this.Loading.appMainLoading = false
-        }).catch(err => {
+      //   }).catch(err => {
-          this.Loading.appMainLoading = false
+      //     this.Loading.appMainLoading = false
-        })
+      //   })
-      }else{
+      // }
+      if(val == 'delete'){
+        this.$confirm('您确定删除吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true;
+          deliverRequestDelete(this.propsData.id)
+            .then(res=>{
+              this.$successMsg("删除成功！")
+              this.paging()
+              this.displayDialog.detailsDialog = false
+            }).catch(() => {
+              this.Loading.appMainLoading = true;
+            });
+        }).catch(() => {
+
+        });
+      }
+      else{
         this.drawerbutton(val)
       }
     },

fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue

@@ -109,6 +109,7 @@ export default {
         this.tableDataDetails.details.forEach(item => {
           _ids.push(item.handledPackingCode)
         });
+        this.Loading.appMainLoading = true;
         getInventoryLabelByCodes(_ids).then(async res => {
           let _printData = JSON.parse(JSON.stringify(this.tableDataDetails))
           if(res && res.length > 0){