Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -468,7 +468,7 @@ export default {
         json.manageDepartment = this.$store.getters.userInfo.userId
         json.president = this.roleForm.engineerUserId
       } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
-        json.engineerSumDone = this.roleForm.startUser
+        json.engineerSumDone = this.roleForm.directorUserId
       } else {
         json = {
           rh_pageData: this.rh_pageData,

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -286,8 +286,8 @@
                 <el-form-item prop="totalLeader" style="margin-bottom: 0">
                   <h4>技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任">
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会主任" @click.native="choiceZRROne('directorUser', '选择人员技术委员会主任', roleForm.directorUserName)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -420,6 +420,8 @@ export default {
         feeUserId: '',
         engineerUser: '',
         engineerUserId: '',
+        directorUserId: '',
+        directorUserName: '',
       },
       roleFormRules: {
         dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
@@ -676,9 +678,12 @@ export default {
       if (this.type === 'leaderUser') {
         this.roleForm.leaderUser = data[0].name
         this.roleForm.leaderUserId = data[0].id
-      } else {
+      } else if(this.type ==='engineerUser') {
         this.roleForm.engineerUser = data[0].name
         this.roleForm.engineerUserId = data[0].id
+      } else {
+        this.roleForm.directorUserName = data[0].name
+        this.roleForm.directorUserId = data[0].id
       }
       this.roleShowflagOne = false
     },

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -410,7 +410,7 @@ export default {
         json.manageDepartment = this.$store.getters.userInfo.userId
         json.president = this.roleForm.engineerUserId
       } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
-        json.engineerSumDone = this.roleForm.startUser
+        json.engineerSumDone = this.roleForm.directorUserId
       } else {
         json = {
           ch_pageData: this.ch_pageData,