From 1337208e4ceac3d493c3f4982cbdcd48898e60b1 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Thu, 11 May 2023 17:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E7=A8=8B=20=E9=9D=9E=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E6=93=8D=E4=BD=9C=20=E5=88=A0=E9=99=A4=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step5.vue    | 57 ++++++++++++++-----
 .../enterpriseStandardPlan/index.vue          |  3 +
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 68d026f42..e639c09e6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -524,21 +524,48 @@ export default {
       }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
-            this.$http.post('lawss/activiti/completeTask', {
-              taskIds: this.$route.query.taskIds,
-              userId: this.$store.getters.userInfo.userId,
-              json: json,
-            }, {
-              _this: this
-            }, res => {
-              if (res.success) {
-                this.addLog(this.qbfsForm)
-                this.$message.success(res.message)
-                this.$router.push('/processCenter')
-              }
-              this.isSubmit = false
-            }, e => {
-            });
+      if(this.type !== '5'){
+        let params = {
+          json,
+          sort:this.qbfsForm.bussSort[0],
+          prcName:this.qbfsForm.esName
+
+        }
+          this.endPrcName(params).then((res)=>{
+            if(res){
+              this.completeTask()
+            }
+          })
+      }else{
+        this.completeTask()
+      }
+
+    },
+    completeTask(){
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.addLog(this.qbfsForm)
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    endPrcName(params){
+      return new Promise((resolve, reject)=>{
+        this.$http._getData('lawss/activiti/endPrcName',params,{}).then(res => {
+          resolve(res)
+        }).catch(e=>{
+          reject(e)
+        })
+      })
     },
     addLog(qbzxdFrom){
       let json = Object.assign(qbzxdFrom);
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 0dab7a900..8598c5ead 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1261,6 +1261,9 @@
                             if (res.ok) {
                                 if (res.message === '操作成功') {
                                     this.$message.success(tips + '成功')
+                                    if(this.DrawerType === 'add'){
+                                        this.addForm.esId = res.data
+                                    }
                                     this.getData()
                                   if(this.DrawerType === 'add'){
                                     this.addForm.addFlag = '1'