From 4900de76297494925e7d0207c82f4354e9f946f4 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 21 Nov 2022 10:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessFooter.vue           | 16 ++++++++++++++++
 .../pages/creatProcess/qbrk/step1-2.vue          |  9 ++++++---
 .../enterpriseStandardPlan/index.vue             |  2 ++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 6dc105371..1c2d9b5e7 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -97,6 +97,15 @@
                 v-if="showOver3"
         >驳回</el-button>
       </el-popover>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-check"
+        @click="handleReceive"
+        :loading="submitLoading"
+        v-if="showReceive"
+      >接收任务</el-button>
       <el-button
               type="danger"
               size="small"
@@ -215,6 +224,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showReceive: {
+      type: Boolean,
+      default: false
+    },
     visible: {
       type: Boolean,
       default: false
@@ -383,6 +396,9 @@ export default {
     handleSubmit() {
       this.$emit('submit')
     },
+    handleReceive() {
+      this.$emit('receive')
+    },
     handleAccept() {
       this.$emit('accept')
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 9c168226c..657758b46 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -695,11 +695,11 @@
     v-show="verifySarStandard && !disabledXX"
     show-save
     show-submit
-    show-confirm
+    show-receive
     :submitLoading="isSubmit"
     :saveLoading="saveLoading"
     @save="handleSave"
-    @accept="handleAccept"
+    @receive="handleReceive"
     @submit="handleSubmit"
   >
   </ProcessFooter>
@@ -1421,6 +1421,7 @@ export default {
       zrIndex: '',
       zrIdList: [],
       type: '',
+      taskType:'',
       defaultUserProps: {
         children: 'children',
         label: 'name'
@@ -3059,7 +3060,7 @@ export default {
       return arr;
     },
     // 接受按钮
-    handleAccept(){
+    handleReceive(){
       this.isSubmit = true
       execTask({
         todoId: this.todoId // 当前节点ID
@@ -3097,6 +3098,7 @@ export default {
               json.zrUserId = this.form.zrUserId
               json.jlUserId = this.form.jlUserId
               json.commentText = this.commentText
+              json.type = this.taskType
               json.applyUpdUserId = this.form.applyUpdUserId
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
@@ -3214,6 +3216,7 @@ export default {
               const processForm = JSON.parse(res.mesg)
               this.todoId = res.id
               this.form.reviseStatus = processForm.reviseStatus
+              this.taskType = processForm.type
             }
           }).catch(e => {
           })
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 441d4f9ab..8c58a940b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1220,7 +1220,9 @@
                             tips = '添加'
                         }
                         let arr = JSON.parse(JSON.stringify(this.addForm))
+                        this.addForm.unitName = arr.unitName
                         arr.area = arr.area.join(',')
+                        this.addForm = {...this.addForm}
                         this.$http.post(url, this.addForm, {
                             _this: this
                         }, res => {