From ba26d943cf226af1caf2dcdc5587daa1e10033a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 22 Dec 2021 14:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/jrbzhxh/step2.vue      |  6 ++++--
 .../pages/creatProcess/jrbzhxh/step3.vue      | 20 +++++++++++++++++--
 .../pages/creatProcess/jrbzhxh/step4.vue      |  2 ++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index b8ee77f6d..0836ca2e6 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -568,14 +568,16 @@ export default {
     handleSubmit() {
       this.isSubmit = true
       this.wbbzform.dlFlag = '1'
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       this.wbbzform.fileName = this.fileInfoList
       this.wbbzform.passUser = this.$store.getters.userInfo.userId
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       console.log(json);
-      return
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index 6ae0622af..3bece617f 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,6 +147,7 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
@@ -479,9 +481,23 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.wbbzform.comityOptionsOne.forEach(item =>{
+         if(this.wbbzform.associationName === item.id){
+           this.wbbzform.associationName = item.name
+         }
+        })
+        this.wbbzform.comityOptionsTwo.forEach(item =>{
+          if(this.wbbzform.committee === item.id){
+            this.wbbzform.committee = item.name
+          }
+        })
+        this.wbbzform.comityOptionsOneThree.forEach(item =>{
+          if(this.wbbzform.workingGroup === item.id){
+            this.wbbzform.workingGroup = item.name
+          }
+        })
         this.associationData = item.associationData
         this.participantsData = item.participantsData
         item.fileName.forEach(itemId => {
@@ -547,7 +563,7 @@ export default {
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index e9cae7ad3..84d984608 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,6 +147,7 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>