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

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

@@ -462,6 +462,8 @@ export default {
         comityOptionsOne: [],
         comityOptionsTwo: [],
         comityOptionsTree: [],
+        comityOpRole: '',
+        comityOpRoleId: '',
       },
       comityRoleOptions: [
         {value: '0', label: '委员'},

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

@@ -113,8 +113,9 @@
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
               <el-input
-                :disabled="true"
-                style="width: 30%"
+                placeholder="请选择入会成员"
+                style="width: 50%"
+                @click.native="choiceRole"
                 v-model="rh_pageData.comityOpRole"
               />
             </el-form-item>
@@ -212,6 +213,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+
+    <Role-tree
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -257,7 +265,7 @@ export default {
         workPath: '',
         comityTel: [],
         comityOpRole: '',
-        comityInRoleId: '',
+        comityOpRoleId: '',
       },
       roleForm: {},
       commentText: '',
@@ -317,7 +325,6 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
-        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
         // this.rh_pageData.comityFileNum = this.fileTextList
@@ -371,6 +378,28 @@ export default {
         window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
       }
     },
+
+    /** 选择入会人员 */
+    choiceRole(id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      })
+      this.rh_pageData.comityOpRole = nameList
+      this.rh_pageData.comityOpRoleId = idList
+      this.roleShowflag = false
+    },
     // 退回按钮
     handleSubmitNo() {
       if (this.commentText === '') {