From 9547f5a992c1c296952b763f25f5cd7183f328d7 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 22 Dec 2021 10:14:05 +0800
Subject: [PATCH 1/7] commit

---
 src/components/phoneRole/index.vue            | 43 +++++++++++++------
 .../pages/creatProcess/bzjd/step1-1.vue       |  4 +-
 .../pages/creatProcess/bzjd/step1.vue         |  4 +-
 .../pages/creatProcess/bzjd/step3.vue         |  4 +-
 .../pages/creatProcess/bzjd/step4.vue         |  1 +
 .../pages/creatProcess/bzjd/step5.vue         |  1 +
 .../pages/creatProcess/bzjd/step6.vue         |  1 +
 .../processCenter/pages/phone/bzdy/step2.vue  | 24 +++--------
 .../processCenter/pages/phone/bzdy/step4.vue  |  2 +-
 .../processCenter/pages/phone/bzdy/step6.vue  |  2 +-
 .../processCenter/pages/phone/bzdy/step7.vue  |  2 +-
 .../processCenter/pages/phone/bzdy/step8.vue  |  2 +-
 .../processCenter/pages/phone/bzdy/step9.vue  |  2 +-
 .../pages/phone/bzzqyj/step6.vue              |  2 +-
 .../pages/phone/bzzqyj/step7.vue              |  2 +-
 .../pages/phone/bzzqyj/step8.vue              |  2 +-
 .../pages/phone/bzzqyj/step9.vue              |  2 +-
 .../pages/phone/wfhxzg/step2.vue              | 10 ++---
 .../pages/phone/wfhxzg/step3.vue              |  2 +-
 .../pages/phone/wfhxzg/step5.vue              |  2 +-
 20 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue
index 132ce3b5b..8201035ea 100644
--- a/src/components/phoneRole/index.vue
+++ b/src/components/phoneRole/index.vue
@@ -3,6 +3,7 @@
     <van-action-sheet
       v-model="isShowPhone2"
       :title="roleTitle"
+      v-if="isShowPhone2"
     >
       <el-form
         ref="phoneForm"
@@ -32,7 +33,7 @@
           :immediate-check="false"
           :offset="300"
         >
-          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1">
+          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1" @change="itemChange">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -42,12 +43,12 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="item" ref="checkbox"/>
+                  <van-checkbox :name="item.usId" ref="checkbox"/>
                 </template>
               </van-cell>
             </van-cell-group>
           </van-checkbox-group>
-          <van-checkbox-group v-if="checkMore" v-model="result">
+          <van-checkbox-group v-if="checkMore" v-model="result" @change="itemChange">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -57,7 +58,7 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="item" ref="checkbox"/>
+                  <van-checkbox :name="item.usId" ref="checkbox"/>
                 </template>
               </van-cell>
             </van-cell-group>
@@ -125,21 +126,18 @@ export default {
     },
     isShowPhone2(val) {
       this.$emit('update:isShowPhone', val)
-    },
-    resultList (val) {
-      this.result = val
-    },
-    result() {
-      this.$emit('resultList', this.result)
     }
   },
   mounted() {
     this.getPhoneData()
   },
   methods: {
+    itemChange (data) {
+    },
     /** 查询 */
     queryPhone() {
       this.getPhoneData()
+      this.finished = false
     },
     /** 获取人员数据 */
     async getPhoneData() {
@@ -170,22 +168,41 @@ export default {
 
     },
     roleSumit() {
-      this.$emit('checkedRole', this.result)
-      this.isShowPhone2 = false
+      let ids = ''
+      this.result.map(item => {
+        if (ids.length > 0) {
+          ids += ','
+          ids += item
+        } else {
+          ids = item
+        }
+      })
+      this.$http.get('SarInstitution/institution/getNextById', {
+        ids: ids
+      }, {
+        _this: this
+      }, res => {
+        this.$emit('checkedRole', res)
+        this.isShowPhone2 = false
+        this.phoneForm.name = ''
+        this.getPhoneData()
+      })
     },
     roleClear() {
       this.result = []
       this.isShowPhone2 = false
+      this.phoneForm.name = ''
+      this.getPhoneData()
     },
 
     // 下滑加载数据
     onLoad() {
+      this.phoneForm.page++
       phoneUser(this.phoneForm).then(res => {
         this.roleList = this.roleList.concat(res.data)
         this.total = this.roleList[0].total
         this.loading = false
         if (this.roleList.length < this.total) {
-          this.phoneForm.page ++
           this.loading = false
         } else {
           this.finished = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index e32405d1f..f81695660 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -179,7 +179,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -474,7 +474,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
+                    <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 9c2a0a4c9..13148a675 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -183,7 +183,7 @@
                 align="center">
           <template slot-scope="scope">
             <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-            <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+            <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -483,7 +483,7 @@
             size="800px">
       <div class="demo-drawer-content">
         <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-          <el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
+          <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
           <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
             <el-input
                     v-model="plForm.technicalRequir"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 6670afe1d..d42be1f97 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -188,7 +188,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -357,7 +357,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
+                    <el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
 <!--                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">-->
 <!--                        <el-input-->
 <!--                                v-model="editForm.technicalRequir"-->
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index ff0d941b1..09a920150 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -177,6 +177,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 9a265f4a4..5e2507b2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -176,6 +176,7 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
+                        v-if="form.itemsNum1"
                         width="140"
                         align="center">
                     <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 498665898..07d3ff5ca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -177,6 +177,7 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
+                        v-if="form.itemsNum1"
                         width="140"
                         align="center">
                     <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue
index e1f73b54f..c64fe1229 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue
@@ -122,23 +122,13 @@
                 :is-show-phone.sync="drawerModal"
                 @checkedRole="checkedRole"
         />
-<!--        <Role-tree-->
-<!--                is-title="转办处理人"-->
-<!--                :is-visible.sync="drawerModal"-->
-<!--                @checkedRole="checkedRole"-->
-<!--        ></Role-tree>-->
-        <Role-tree
-                is-title="选择责任部门对接人"
-                :is-visible.sync="modalshowflag2"
+        <phone-role
+                check-more
+                role-title="选择责任部门对接人"
+                :result-list="nodeList2"
+                :is-show-phone.sync="modalshowflag2"
                 @checkedRole="checkedRole2"
-                :nodeList="nodeList2"
-        ></Role-tree>
-<!--        <phone-role-->
-<!--                role-title="选择责任部门对接人"-->
-<!--                :result-list="nodeList2"-->
-<!--                :is-show-phone.sync="modalshowflag2"-->
-<!--                @checkedRole="checkedRole2"-->
-<!--        />-->
+        />
     </div>
 </template>
 
@@ -233,7 +223,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue
index 5756ea288..4578f7c14 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue
@@ -284,7 +284,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue
index 634f68966..f708e49ad 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue
@@ -261,7 +261,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue
index 854f57103..d3a932938 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue
@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue
index f2b4a15ff..e4605abea 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue
@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index 90bb82fc5..e6f65fb8b 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -186,7 +186,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
index 3ca0d37cb..7b73f4751 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
index 5d323c182..8ab262b7a 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
index 29118174e..3ce20bc0c 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
index 7c43985aa..c2439794d 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
@@ -334,7 +334,7 @@
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].usId, // 被委托人
+                    assignee: data[0].id, // 被委托人
                     pId: this.$route.query.prcId, // 流程实例
                 }).then(res => {
                     if (res.success) {
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
index 983dc078d..ca5bcb4f5 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
@@ -311,7 +311,7 @@ export default {
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
-          assignee: data[0].usId, // 被委托人
+          assignee: data[0].id, // 被委托人
           userId: this.userId, // 委托人
           pId: this.pId // 流程实例
         }).then(res =>{
@@ -329,12 +329,12 @@ export default {
         this.roleRow = data[0]
         // 选取负责人时的操作
         if (this.multipleSelection.length === 0) {
-          this.rowDutyPeople.dutyPeopleInfo = this.roleRow.userName
-          this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.usId
+          this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
+          this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
         }else {
           this.multipleSelection.forEach(item => {
-            item.dutyPeopleInfo = this.roleRow.userName
-            item.dutyPeopleInfoId = this.roleRow.usId
+            item.dutyPeopleInfo = this.roleRow.name
+            item.dutyPeopleInfoId = this.roleRow.id
           })
           this.$refs.multipleTable.clearSelection()
         }
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
index cb3717d5d..4444a262a 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
@@ -356,7 +356,7 @@ export default {
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
-          assignee: this.phoneRoleList[0].usId, // 被委托人
+          assignee: this.phoneRoleList[0].id, // 被委托人
           userId: this.userId, // 委托人
           pId: this.pId // 流程实例
         }).then(res =>{
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
index 51ae3d310..38b4ffbb7 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
@@ -250,7 +250,7 @@ export default {
       this.phoneRoleList = data
       changeAssigneeNew({
         taskId: this.taskIds, // 任务id
-        assignee: data[0].usId, // 被委托人
+        assignee: data[0].id, // 被委托人
         userId: this.userId, // 委托人
         pId: this.pId // 流程实例
       }).then(res =>{

From 63731e9fde67510a69020b4078b5c2aae6001548 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 10:35:10 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/jrbzhxh/step2.vue      |  2 +-
 .../pages/creatProcess/jrbzhxh/step3.vue      | 50 ++++++++++---------
 .../pages/creatProcess/jrbzhxh/step4.vue      | 50 ++++++++++---------
 .../pages/creatProcess/wbsm/step1-5.vue       |  2 +-
 .../pages/creatProcess/wbsm/step2.vue         |  2 +-
 .../pages/creatProcess/wbsm/step3.vue         |  2 +-
 .../pages/creatProcess/wbsm/step4.vue         |  2 +-
 .../pages/creatProcess/wbsm/step5.vue         |  2 +-
 8 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index edfd581ec..3d030eea3 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -245,7 +245,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index e3712db8f..d80b7cf57 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -198,7 +198,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -566,28 +566,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
-      this.wbbzform.signFlag = '0',
-      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)
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false
-      }, e => {
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true
+        this.wbbzform.signFlag = '0',
+          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)
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index 0f9969045..d999dc6d1 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -198,7 +198,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -566,28 +566,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
-      this.wbbzform.bzFlag = '2',
-      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)
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false
-      }, e => {
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true
+        this.wbbzform.bzFlag = '2',
+          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)
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
index 0a73bf5d8..9cce7ecc6 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
index 447112c5d..dba26f53d 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
index da595c196..64cf82b95 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
index 5b4629154..78aeb55f5 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
index 24aca3580..6e45b3102 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

From ad001cbf72cba9670ec3868076eac58c01490e1e Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Wed, 22 Dec 2021 10:59:49 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/newProcess/index.vue  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 2a698bdbd..d5429058e 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -80,7 +80,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
             <div class="card-box" @click="handleCreateProcess('12')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -125,7 +125,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
+          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
             <div class="card-box" @click="handleCreateProcess('13')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -140,7 +140,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -155,7 +155,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
             <div class="card-box" @click="handleCreateProcess('laws1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -205,7 +205,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
             <div class="card-box" @click="handleCreateProcess('24')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -235,7 +235,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
             <div class="card-box" @click="handleCreateProcess('25')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -256,7 +256,7 @@
       <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
+          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
             <div class="card-box" @click="handleCreateProcess('17')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -271,7 +271,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
+          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
             <div class="card-box" @click="handleCreateProcess('18')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -286,7 +286,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
             <div class="card-box" @click="handleCreateProcess('20')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -301,7 +301,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
             <div class="card-box" @click="handleCreateProcess('21')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -316,7 +316,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
             <div class="card-box" @click="handleCreateProcess('16')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -331,14 +331,14 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('15')">
+          <el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>
@@ -346,7 +346,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
             <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">

From f82d871b5f73b0bea6486ec277750f651c2f79ab Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 22 Dec 2021 11:16:04 +0800
Subject: [PATCH 4/7] commit

---
 src/components/phoneRole/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue
index 8201035ea..1716fd155 100644
--- a/src/components/phoneRole/index.vue
+++ b/src/components/phoneRole/index.vue
@@ -33,7 +33,7 @@
           :immediate-check="false"
           :offset="300"
         >
-          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1" @change="itemChange">
+          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -48,7 +48,7 @@
               </van-cell>
             </van-cell-group>
           </van-checkbox-group>
-          <van-checkbox-group v-if="checkMore" v-model="result" @change="itemChange">
+          <van-checkbox-group v-if="checkMore" v-model="result">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -132,8 +132,6 @@ export default {
     this.getPhoneData()
   },
   methods: {
-    itemChange (data) {
-    },
     /** 查询 */
     queryPhone() {
       this.getPhoneData()

From 3958fba01459c31a590b9922580593d62984c181 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 13:42:14 +0800
Subject: [PATCH 5/7] commit

---
 src/pages/localTool/standAutoSplit/index.vue   |  2 +-
 .../pages/creatProcess/jrbzhxh/step2.vue       | 18 ++++++++++--------
 .../pages/creatProcess/jrbzhxh/step3.vue       |  4 ++--
 .../pages/creatProcess/jrbzhxh/step4.vue       |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 86d86d981..c8beafe7d 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -963,7 +963,7 @@ export default {
         _this: this
       }, res => {
         this.addSpiltStandList = res.data.list
-        this.addFileStandtotal = res.data.list.length
+        this.addFileStandtotal = res.data.count
         this.loadData = false
       }, e => {
         this.loadData = false
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index 3d030eea3..b8ee77f6d 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -155,21 +155,21 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="300"
             align="center">
             <template slot-scope="scope">
-                 <el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
+                 <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
             </template>
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="300"
             align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
+              <el-input v-model="scope.row.passwords" placeholder="请输入密码"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -382,8 +382,8 @@ export default {
           institutionName: '', //所在部门
           email: '', //联系方式
           tenure:'', //任期
-          account:'', //账户
-          password:'', //密码
+          accounts:'', //账户
+          passwords:'', //密码
         }],
         associationData: [{
           contactPerson: '', //协议联络人
@@ -567,13 +567,15 @@ export default {
     //流程提交
     handleSubmit() {
       this.isSubmit = true
-      this.wbbzform.dlFlag = '1',
+      this.wbbzform.dlFlag = '1'
       this.wbbzform.fileName = this.fileInfoList
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      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)
+      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 d80b7cf57..6ae0622af 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -150,13 +150,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index d999dc6d1..e9cae7ad3 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -150,13 +150,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">

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 6/7] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=9B=9E?=
 =?UTF-8?q?=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>

From b068956d45112cf28e8a15142c101f94163eb85e Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 22 Dec 2021 14:52:31 +0800
Subject: [PATCH 7/7] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 7a87e5797..1c6c4db0c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -535,8 +535,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 13148a675..fbd5f6cad 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -544,8 +544,8 @@
             size="1100px">
       <div>相似度:{{ similarityDegree }}</div>
       <div style="height: 600px;overflow: auto;display: flex;">
-        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
       </div>
     </el-dialog>
   </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index d42be1f97..87b561ae8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -432,8 +432,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 09a920150..f0aed891c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -286,8 +286,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 5e2507b2b..4cbdb9d7b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -291,8 +291,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 07d3ff5ca..e91c9d966 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -290,8 +290,8 @@
                 size="1100px">
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>