Merge branch 'develop' into FOTON

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -676,7 +676,7 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                                  <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择责任人', form.wssmr)">
+                                  <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
                                   </el-input>
 <!--                                    <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
 <!--                                      <el-option-->
@@ -1034,7 +1034,7 @@
             </div>
         </el-dialog>
         <Role-tree
-                is-title="选择责任部门对接人"
+                :is-title="drawerTitle"
                 :is-visible.sync="modalShowRoleFlag"
                 @checkedRole="checkedRole2"
                 :nodeList="nodeList2"
@@ -1709,6 +1709,7 @@
             //     this.modalshowflag2 = true
             // },
             checkedRole2 (data) {
+              console.log('1712',this.drawerTitle)
                 let idList = ''
                 let nameList = ''
                 data.forEach( item => {
@@ -1719,10 +1720,13 @@
                     idList += item.id
                     nameList += item.name
                 })
+              if (this.drawerTitle === '选择责任人'){
                 this.roleForm.zrUserId=idList;
                 this.roleForm.zrUserName=nameList;
-
+              }
+              if (this.drawerTitle === '选择我司署名人'){
                 this.form.wssmr = nameList
+              }
             },
             checkedRole (data) {
               if (this.userType === 'jlUserId') {
@@ -2074,6 +2078,7 @@
             },
 
             choiceZRRS (type, title, id) {
+              console.log('2077',title)
                 this.nodeList = []
                 this.nodeList.push(id)
                 this.userType = type