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

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

@@ -976,38 +976,51 @@
                 <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
             </div>
         </el-dialog>
-        <el-drawer
-                :title="drawerTitle"
-                :visible.sync="modalShowFlag"
-                :wrapperClosable="false"
-                size="800px">
-          <el-input
-              style="width:70%;padding: 10px"
-              placeholder="请输入姓名"
-              v-model="filterText">
-          </el-input>
-            <el-tree
-                    :filter-node-method="filterNode"
-                    v-if="modalShowFlag"
-                    node-key="id"
-                    style="height: 100%; overflow: auto;"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultUserProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    @check="drawerCheck"
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
-            </div>
-        </el-drawer>
+        <Role-tree
+                is-title="选择责任部门对接人"
+                :is-visible.sync="modalShowRoleFlag"
+                @checkedRole="checkedRole2"
+                :nodeList="nodeList2"
+        ></Role-tree>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalShowFlag"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
+<!--        <el-drawer-->
+<!--                :title="drawerTitle"-->
+<!--                :visible.sync="modalShowFlag"-->
+<!--                :wrapperClosable="false"-->
+<!--                size="800px">-->
+<!--          <el-input-->
+<!--              style="width:70%;padding: 10px"-->
+<!--              placeholder="请输入姓名"-->
+<!--              v-model="filterText">-->
+<!--          </el-input>-->
+<!--            <el-tree-->
+<!--                    :filter-node-method="filterNode"-->
+<!--                    v-if="modalShowFlag"-->
+<!--                    node-key="id"-->
+<!--                    style="height: 100%; overflow: auto;"-->
+<!--                    class="filter-tree"-->
+<!--                    :data="treeData"-->
+<!--                    :props="defaultUserProps"-->
+<!--                    :default-checked-keys="nodeList"-->
+<!--                    highlight-current-->
+<!--                    check-strictly-->
+<!--                    @check="drawerCheck"-->
+<!--                    default-expand-all-->
+<!--                    :expand-on-click-node="false"-->
+<!--                    show-checkbox-->
+<!--                    ref="tree">-->
+<!--            </el-tree>-->
+<!--            <div id="roleFormButton" class="demo-drawer-footer">-->
+<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
+<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
+<!--            </div>-->
+<!--        </el-drawer>-->
         <!-- 选择标准的弹框 -->
         <el-drawer
                 ref="standard"
@@ -1256,6 +1269,7 @@
                     label: 'model'
                 },
                 nodeList: [],
+                nodeList2: [],
                 type: '',
                 defaultUserProps: {
                     children: 'children',
@@ -1267,6 +1281,7 @@
                 key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
+                modalShowRoleFlag: false, // drawer开关
                 modalShowFlag1: false, // drawer开关
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
@@ -1491,6 +1506,33 @@
             },
         },
         methods: {
+            choiceZRRS () {
+                if (this.userType === 'zrUserId') {
+                    this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
+                    this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
+                }
+                this.modalshowflag2 = true
+            },
+            checkedRole2 (data) {
+                var idList = ''
+                var nameList = ''
+                data.forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.zrUserIds = idList
+                this.zrUserIds = nameList
+            },
+            checkedRole (data) {
+                if (this.userType === 'jlUserId') {
+                    this.roleForm.jlUserId = data.id
+                    this.roleForm.jlUserName = data.name
+                }
+            },
           // z责任人会签姓名搜索
           filterNode(value, data) {
             if (!value) return true;