From f7a8ffd4398929624548657134b84b80132bbff2 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 22 Apr 2022 16:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052637=20=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E9=83=A8=E9=A9=B3=E5=9B=9E=E5=90=8E=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbfz/step1.vue         | 105 +++++++++++-------
 .../tabComponents/processCenter/index.vue     |  11 +-
 2 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index 58997d3e0..c5dc2f3ab 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -500,8 +500,9 @@ export default {
      */
     getFormFieldList(item) {
       this.$nextTick(() => {
-        this.standardSearch = item.standardSearch
-        this.roleForm = item.roleForm
+        this.standardSearch = JSON.parse(JSON.stringify(item))
+        // this.standardSearch = item.standardSearch
+        this.roleForm = JSON.parse(JSON.stringify(item))
       });
     },
     //tab发生变化
@@ -621,45 +622,69 @@ export default {
           if (valid) {
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
-                this.isSubmit = true
-                this.standardSearch.commentText = this.commentText
-                var json = Object.assign(this.standardSearch, this.roleForm)
-                this.$http.post('lawss/activiti/startProcessRollBack', {
-                  createUser: this.$store.getters.userInfo.userId,
-                  createUserName: this.$store.getters.userInfo.userName,
-                  type: '24',
-                  json: JSON.stringify({
-                    roleForm: this.roleForm,
-                    qbfsForm: this.standardSearch,
-                    commentText: this.commentText
-                  })
-                }, {
-                  _this: this
-                }, 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)
-                        if (this.bpnId !== '') {
-                          let taskId = {
-                            id: this.bpnId
-                          }
-                          taskDel(taskId).then(res=>{
-                            return res
-                          })
-                        }
-                        this.isSubmit = false
-                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                      }
+                if (this.$route.query.type === 2) {
+                  this.isSubmit = true
+                  this.standardSearch.commentText = this.commentText
+                  var json = Object.assign(this.standardSearch, this.roleForm)
+                  this.$http.post('lawss/activiti/completeTaskNew', {
+                    taskIds: this.$route.query.taskIds,
+                    userId : this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json),
+                    specialJson: JSON.stringify({
+                      roleForm: this.roleForm,
+                      qbfsForm: this.standardSearch,
+                      commentText: this.commentText
                     })
-                  }
-                })
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message)
+                      this.isSubmit = false
+                      this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    }
+                  })
+                } else {
+                  this.isSubmit = true
+                  this.standardSearch.commentText = this.commentText
+                  var json = Object.assign(this.standardSearch, this.roleForm)
+                  this.$http.post('lawss/activiti/startProcessRollBack', {
+                    createUser: this.$store.getters.userInfo.userId,
+                    createUserName: this.$store.getters.userInfo.userName,
+                    type: '24',
+                    json: JSON.stringify({
+                      roleForm: this.roleForm,
+                      qbfsForm: this.standardSearch,
+                      commentText: this.commentText
+                    })
+                  }, {
+                    _this: this
+                  }, 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)
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
+                          this.isSubmit = false
+                          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        }
+                      })
+                    }
+                  })
+                }
               }else {
                 this.$message.warning('请检查人员信息表单是否填写完整')
               }
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f935713ac..daa94b6d6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -2075,7 +2075,7 @@ export default {
           if (row.taskInfo === '标准法规部部长审核') {
             this.$router.push({
               name: 'qbfzStep2',
-              query:{
+              query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
@@ -2083,6 +2083,15 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '重新起草') {
+            this.$router.push({
+              name: 'qbfzStep1',
+              query:{
+                type: 2,
+                taskIds: row.taskIds,
+                prcId: row.prcId
+              }
+            })
           } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbfzStep3',