From 6a7f520a8cf202165e26b80eb9fd4ac8aa77e4a5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 18 Nov 2022 17:26:54 +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/creatProcess/qbrk/step1-2.vue       |  2 +-
 .../pages/creatProcess/qbzxdlx/step2.vue      |  4 ++--
 .../enterpriseStandardPlan/index.vue          | 24 +++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 60d90b52a..b935476ea 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -3086,7 +3086,7 @@ export default {
               json.prcCreateUserName = this.form.prcCreateUserName
               json.standCode = this.tableData.standardData[0].standCode
               this.$http.post('lawss/activiti/completeTask', {
-                taskIds: res.data,
+                taskIds: this.$route.query.taskIds,
                 userId : this.$store.getters.userInfo.userId,
                 json: JSON.stringify(json)
               }, {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index 41ac95f8c..bc81813ad 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -125,7 +125,7 @@
               placeholder="请选择立项完成时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="tsJsonName" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               style="display: none;"
               v-model="qbfsForm.tsJson">
@@ -757,7 +757,7 @@ export default {
         endTime: [
           { required: true, message: "请选择立项完成时间", trigger: "change" }
         ],
-        tsJson: [
+        tsJsonName: [
           { required: true, message: "请选择体系结构", trigger: "change" }
         ],
         area: [
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 950d2b3c9..969a4e66f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1230,6 +1230,30 @@
                                     this.addDrawer = false
                                     this.$message.success(tips + '成功')
                                     this.getData()
+                                  this.addForm.addFlag = '1'
+                                  var json = Object.assign(this.addForm)
+                                      this.$http.post('lawss/activiti/startProcessRollBack', {
+                                        createUser: this.$store.getters.userInfo.userId,
+                                        createUserName: this.$store.getters.userInfo.userName,
+                                        type: '25',
+                                        json: JSON.stringify({
+                                          addForm: this.addForm
+                                        })
+                                      }, {}, res => {
+                                        if (res.ok) {
+                                          this.$http.post('lawss/activiti/completeTask', {
+                                            taskIds: res.data,
+                                            userId : this.$store.getters.userInfo.userId,
+                                            json: JSON.stringify(json)
+                                          }, {
+                                            _this: this
+                                          }, res => {
+                                            if (res.success) {
+                                              // this.$message.success(res.message)
+                                            }
+                                          })
+                                        }
+                                      })
                                 } else {
                                     this.addDrawer = false
                                     this.$message.warning(res.data)