From 4230be34aa5c33dbc8d6fb841c0d201a9de05b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 28 Jan 2022 16:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step1.vue         | 225 ++++++++++++------
 .../pages/creatProcess/bzpg/step2.vue         |   2 +-
 .../pages/creatProcess/bzpg/step3.vue         |   2 +-
 .../pages/creatProcess/bzpg/step4.vue         |   2 +-
 .../pages/creatProcess/bzpg/step5.vue         |   2 +-
 .../pages/creatProcess/bzpg/step6.vue         |   2 +-
 .../pages/creatProcess/bzpg/step7.vue         |   2 +-
 .../pages/creatProcess/bzpg/step8-1.vue       |   2 +-
 .../pages/creatProcess/bzpg/step8.vue         |   2 +-
 .../tabComponents/processCenter/index.vue     |  11 +
 10 files changed, 172 insertions(+), 80 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index e6ec3219a..60e702bfb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -3,7 +3,7 @@
   <div class="xmpg-step1">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -194,7 +194,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
@@ -218,7 +218,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                   <h4>标准法规部领导</h4>
@@ -495,7 +495,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
 
 export default {
   name: "bzpgStep1",
@@ -506,6 +506,7 @@ export default {
   },
   data() {
     return {
+      submitFlag: '',
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框
       categoryName: [], //项目细分类下拉框
@@ -642,6 +643,40 @@ export default {
     };
   },
   methods: {
+    getHistoryData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.listForm.dataList = item.dataList
+        this.dataList = item.dataList
+        this.roleForm.dockUser = item.dockUser
+        this.roleForm.dockUserName = item.dockUserName
+        this.roleForm.ministerUser = item.ministerUser
+        this.roleForm.ministerUserName = item.ministerUserName
+        this.submitFlag = '修改节点'
+        this.dataList.distributePerson = item.dataList[0].distributePerson
+      })
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag;
@@ -808,75 +843,118 @@ export default {
         this.saveLoading = false;
       });
     },
-    //提交事件
-    handleSubmit() {
-     if(!this.dataList.length){
-       this.$message.warning('请添加项目群信息')
-     }else{
-       this.dataList.forEach(item => {
-         if(!item.distributePerson || !item.projectGroupPeople){
-           this.$message.warning('请填写完整的人员信息')
-         }else {
-           this.isSubmit = true;
-           this.listForm.dataList = this.dataList;
-           this.listForm.commentText = this.commentText;
-           let json = Object.assign(this.listForm, this.roleForm);
-           console.log(json);
-           this.$refs["listForm"].validate((valid) => {
-             if (valid) {
-               this.$refs["roleForm"].validate((valid) => {
-                 if (valid) {
-                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                     createUser: this.$store.getters.userInfo.userId,
-                     createUserName: this.$store.getters.userInfo.userName,
-                     type: "5",
-                     json: JSON.stringify({
-                       taskInfo: "选择已拆分标准",
-                       form: this.listForm,
-                       roleForm: this.roleForm,
-                       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.$router.push("/processCenter");
-                         }
-                         this.isSubmit = false;
-                       });
-                     }
-                   });
-                 } else {
-                   this.isSubmit = false;
-                   return this.$message.warning("请完善人员信息");
-                 }
-               });
-             } else {
-               this.isSubmit = false;
-               return this.$message.warning("请完善基础信息");
-             }
-           });
-         }
-       })
-     }
 
+    //提交事件
+    handleSubmit(){
+      let peopleFlag = true
+      if(!this.dataList.length){
+        this.$message.warning('请添加项目群信息')
+      }else{
+        this.dataList.forEach(item => {
+          if(!item.distributePerson || !item.projectGroupPeople){
+            peopleFlag = false
+            return
+          }
+        })
+        if(peopleFlag){
+          this.isSubmit = true;
+          this.listForm.dataList = this.dataList;
+          this.listForm.commentText = this.commentText;
+          let json = Object.assign(this.listForm, this.roleForm);
+          if(!this.submitFlag){
+            this.$refs["listForm"].validate((valid) => {
+              if (valid) {
+                this.$refs["roleForm"].validate((valid) => {
+                  if (valid) {
+                    this.$http.post("lawss/activiti/startProcessRollBack", {
+                      createUser: this.$store.getters.userInfo.userId,
+                      createUserName: this.$store.getters.userInfo.userName,
+                      type: "5",
+                      json: JSON.stringify({
+                        taskInfo: "选择已拆分标准",
+                        form: this.listForm,
+                        roleForm: this.roleForm,
+                        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.$router.push("/processCenter");
+                          }
+                          this.isSubmit = false;
+                        });
+                      }
+                    });
+                  } else {
+                    this.isSubmit = false;
+                    return this.$message.warning("请完善人员信息");
+                  }
+                });
+              } else {
+                this.isSubmit = false;
+                return this.$message.warning("请完善基础信息");
+              }
+            });
+          }else{
+            this.$refs["listForm"].validate((valid) => {
+              if (valid) {
+                this.$refs["roleForm"].validate((valid) => {
+                  if (valid) {
+                    this.$http.post("lawss/activiti/completeTask", {
+                      taskIds: this.$route.query.taskIds,
+                      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.$router.push("/processCenter");
+                      }
+                      this.isSubmit = false;
+                    });
+                  } else {
+                    this.isSubmit = false;
+                    return this.$message.warning("请完善人员信息");
+                  }
+                });
+              } else {
+                this.isSubmit = false;
+                return this.$message.warning("请完善基础信息");
+              }
+            });
+          }
+        }else{
+          this.$message.warning('请完善人员信息')
+        }
+
+      }
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -1056,6 +1134,9 @@ export default {
     if (this.bpnId !== undefined) {
       this.getData()
     }
+    if(this.$route.query.taskIds){
+      this.getHistoryData()
+    }
     this.getStandData();
     /**
      * 获取项目群筛选项的值
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
index eb3a7428d..5846c6439 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
@@ -3,7 +3,7 @@
 <div class="bzpg-step2">
   <ProcessHeader toggle>
     <template slot="proName">标准合规评估流程</template>
-    <template slot="proNode">业务经理审批流程</template>
+    <template slot="proNode">审核</template>
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 96b83d483..d30dab66f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step3">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">分发人分发项目</template>
+      <template slot="proNode">项目分发</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index cadc01dd0..71426e24e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step4">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目经理分发标准</template>
+      <template slot="proNode">任务分发</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 188779b39..e5f70d4c0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step5">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">责任人评估</template>
+      <template slot="proNode">合规评估</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index 86e5cb9a8..779e3aed7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step6">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目经理审核</template>
+      <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
index 5badbc1cf..0b8a34174 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step7">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目负责人审核</template>
+      <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
index 3b4239e97..496336577 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step8">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">标准法规部部长审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
index aac3a90b9..e2f0f3c9b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -3,7 +3,7 @@
   <div class="bzpg-step8">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">标准法规部部长审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index e9569dfe9..44e1b82c8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -977,6 +977,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '整改节点'){
+            this.$router.push({
+              name: 'bzpgStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         //项目评估流程-项目