From ee7808d9ee54309b4d939f5be09b68e35565e450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 20 Apr 2023 17:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/mixins/drawerMixins.js              | 29 ++++++++++++++-----
 fe/PC/src/utils/processButtonData.js          |  2 +-
 .../manualMaterialRequest/IssueRequest.vue    | 16 +++++-----
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/fe/PC/src/mixins/drawerMixins.js b/fe/PC/src/mixins/drawerMixins.js
index fedd69bed..490e906d8 100644
--- a/fe/PC/src/mixins/drawerMixins.js
+++ b/fe/PC/src/mixins/drawerMixins.js
@@ -54,6 +54,7 @@ export const drawerMixins = {
         this.displayDialog.editDialog = true
       }
       // 申请业务 流程按钮实现
+      // 【提交】操作
       if (val == 'submitRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/submit/').then(res => {
@@ -67,7 +68,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'agreeRequest') {
+      } 
+      // 【审批】操作
+      else if (val == 'agreeRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/agree/').then(res => {
           that.$successMsg('已同意')
@@ -80,7 +83,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'handleRequest') {
+      } 
+      // 【处理】操作
+      else if (val == 'handleRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/handle/').then(res => {
           that.$successMsg('处理完成')
@@ -93,7 +98,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      }  else if (val == 'againHandleRequest') { // 针对部分完成情况下，再次执行任务操作
+      } 
+      // 【执行】操作
+      else if (val == 'againHandleRequest') { // 针对部分完成情况下，再次执行任务操作
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/handle/').then(res => {
           that.$successMsg('执行成功')
@@ -106,7 +113,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'abortRequest') {
+      } 
+      // 【中止】操作
+      else if (val == 'abortRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/abort/').then(res => {
           that.$successMsg('已中止')
@@ -119,7 +128,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'completeRequest') {
+      } 
+      // 【执行完成】操作
+      else if (val == 'completeRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/complete/').then(res => {
           that.$successMsg('执行完成')
@@ -132,7 +143,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'cancelRequest') {
+      } 
+      // 【取消】操作
+      else if (val == 'cancelRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/cancel/').then(res => {
           that.$successMsg('已取消')
@@ -145,7 +158,9 @@ export const drawerMixins = {
           console.log(err)
           that.Loading.appMainLoading = false
         })
-      } else if (val == 'refuseRequest') {
+      } 
+      // 【驳回】操作
+      else if (val == 'refuseRequest') {
         that.Loading.appMainLoading = true
         processRequest(that.propsData.id, that.URL + '/refuse/').then(res => {
           that.$successMsg('已驳回')
diff --git a/fe/PC/src/utils/processButtonData.js b/fe/PC/src/utils/processButtonData.js
index c21ca0723..a50c346db 100644
--- a/fe/PC/src/utils/processButtonData.js
+++ b/fe/PC/src/utils/processButtonData.js
@@ -90,7 +90,7 @@
       // {
       //   type: 'primary',
       //   icon: 'el-icon-circle-check',
-      //   label: '执行',
+      //   label: '执行完成',
       //   name: "completeRequest",
       //   hide: () => { return hideButtonRequest(that, [5]) },
       //   size: 'mini'
diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
index 1a51eb746..214fed896 100644
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue
@@ -127,13 +127,13 @@ export default {
         // }),
         //使用  noShow 隐藏按钮
         // ...requestData(this,false,false,['againHandleRequest']),
-        // {
-        //   type: 'primary',
-        //   icon: 'el-icon-circle-check',
-        //   label: '完成',
-        //   name: "IssueRequest-over",
-        //   size: 'mini'
-        // },
+        {
+          type: 'primary',
+          icon: 'el-icon-circle-check',
+          label: '完成',
+          name: "completeRequest",
+          size: 'mini'
+        },
       ],
     };
   },
@@ -166,7 +166,7 @@ export default {
         }
       })
       return data
-    }
+    },
     //抽屉常用按钮
     // drawerbutton (val) {
     //   // 完成