From 8b59ef4f952c564495f1b1eff69be82da8ca4ab4 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, 21 Apr 2023 19:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=B7=BB=E5=8A=A0=E5=AE=8C=E6=88=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manualMaterialRequest/IssueRequest.vue    | 62 ++++++++++++++++---
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
index 08e1a7a6e..20f1826d6 100644
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
@@ -60,7 +60,7 @@
   </div>
 </template>
 <script>
-import { materialRequestByType } from "@/api/wms-api"
+import { materialRequestByType,processRequest } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -97,7 +97,31 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
-      ...requestData(this),
+        ...requestData(this),
+        {
+          type: 'primary',
+          icon: 'el-icon-circle-check',
+          label: '完成',
+          hide: () => { return this.completeRequestInit([2,6])},
+          name: "completeRequest",
+          size: 'mini'
+        },
+        // {
+        //   type: 'primary',
+        //   icon: 'el-icon-circle-check',
+        //   label: '执行',
+        //   name: "IssueRequest-zx",
+        //   hide: () => { return this.againHandleRequestInit([9])},
+        //   size: 'mini'
+        // },
+        // ...requestData(this,false,
+        // false,
+        // {
+        //   againHandleRequest:() => {return this.againHandleRequestInit([9])},
+        //   // abortRequest:() => {return this.abortRequestRequestInit([2,6])},
+        // },
+        // ['againHandleRequest']
+        // ),
         //使用  initHide 函数处理是否隐藏  
         // ...requestData(this,false,{
         //   againHandleRequest:() => {return this.againHandleRequestInit([9])}
@@ -134,7 +158,17 @@ export default {
           this.Loading.tableLoading = false
         })
     },
-    // 重新定义【执行按钮】显示判断
+    // 重新定义【中止按钮】显示判断 除了2(待审批) 和 6（完成状态）都显示（abortRequestRequestInit）
+    completeRequestInit(val){
+      let data = false
+      val.forEach(key => {
+        if (this.propsData.requestStatus == key) {
+          data = true
+        }
+      })
+      return data
+    },
+    // 重新定义【执行按钮】显示判断 ==9时候显示
     againHandleRequestInit(val){
       let data = true
       val.forEach(key => {
@@ -146,11 +180,23 @@ export default {
     },
     //抽屉常用按钮
     // drawerbutton (val) {
-    //   // 完成
-    //   // if(val == 'IssueRequest-over'){
-    //   // } else {
-    //   //   drawerMixins.methods.drawerbutton(val, this)
-    //   // }
+    //   // 执行（todo:后期本页特殊）
+    //   if(val == 'IssueRequest-zx'){
+    //     this.Loading.appMainLoading = true
+    //     processRequest(this.propsData.id, this.URL + '/handle/').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
+    //     })
+    //   } else {
+    //     drawerMixins.methods.drawerbutton(val, this)
+    //   }
     // },
   }
 };