From e046cca017653411a61cf3d3ad90fe8ad6072da2 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E7=A0=94=E7=A9=B6=E6=80=BB=E9=99=A2=E4=B8=BB?=
 =?UTF-8?q?=E7=AE=A1=E5=89=AF=E9=99=A2=E9=95=BF=20=E5=8D=95=E9=80=89=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step1-2.vue       | 33 ++++++++++++++++++-
 .../pages/creatProcess/qbrk/step1.vue         | 33 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 9bf111c7a..50f4c6d95 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -832,7 +832,7 @@
                         :disabled="disabledXX"
                         readonly="readonly"
                         placeholder="选择研究总院主管副院长"
-                        @click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
+                        @click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
                       />
                     </div>
                   </el-form-item>
@@ -1083,6 +1083,15 @@
       :nodeList="nodeList"
       @checkedRole="checkedRole"
     />
+
+    <!--选择研究总院主管副院长-->
+    <Role-tree
+      v-if="!disabledXX"
+      :is-title="drawerTitle"
+      :is-visible.sync="modalShowFlagZHR"
+      :nodeList="nodeList"
+      @checkedRole="checkedRoleZHR"
+    />
     <!-- 选择标准的弹框 -->
     <el-drawer
       v-if="!disabledXX"
@@ -1758,6 +1767,7 @@ export default {
       modalShowFlag: false, // drawer开关
       showreceive: false,
       modalShowRoleFlag: false, // drawer开关
+      modalShowFlagZHR: false, // drawer开关
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
@@ -2294,6 +2304,20 @@ export default {
       const res = new Map();
       return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
     },
+    checkedRoleZHR (data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.roleForm.zhrUserId = idList
+      this.roleForm.zhrUserName = nameList
+    },
     checkedRole (data) {
       if (this.type === 0) {
         this.roleForm.deptUserId = data[0].id
@@ -2759,6 +2783,13 @@ export default {
       this.drawerTitle = title
       this.modalShowFlag = true
     },
+    choiceZHR (type, title, id) {
+      this.nodeList = []
+      this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowFlagZHR = true
+    },
     choiceZRRS (row, type, index) {
       this.type = type
       if (type === 1) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 5347f57d6..f458b2769 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -995,7 +995,7 @@
                         :disabled="disabledXX"
                         readonly="readonly"
                         placeholder="选择研究总院主管副院长"
-                        @click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
+                        @click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
                       />
                     </div>
                   </el-form-item>
@@ -1247,6 +1247,15 @@
       :nodeList="nodeList"
       @checkedRole="checkedRole"
     />
+
+    <!--选择研究总院主管副院长-->
+    <Role-tree
+      v-if="!disabledXX"
+      :is-title="drawerTitle"
+      :is-visible.sync="modalShowFlagZHR"
+      :nodeList="nodeList"
+      @checkedRole="checkedRoleZHR"
+    />
     <!--        <el-drawer v-if="!disabledXX" -->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -2000,6 +2009,7 @@ export default {
       key3: 4,
       treeData: [], // 人员数据
       modalShowFlag: false, // drawer开关
+      modalShowFlagZHR: false, // drawer开关
       modalShowRoleFlag: false, // drawer开关
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
@@ -2560,6 +2570,20 @@ export default {
       const res = new Map();
       return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
     },
+    checkedRoleZHR (data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.roleForm.zhrUserId = idList
+      this.roleForm.zhrUserName = nameList
+    },
     checkedRole (data) {
       if (this.type === 0) {
         this.roleForm.deptUserId = data[0].id
@@ -3124,6 +3148,13 @@ export default {
       this.drawerTitle = title
       this.modalShowFlag = true
     },
+    choiceZHR (type, title, id) {
+      this.nodeList = []
+      this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowFlagZHR = true
+    },
     choiceZRRS (row, type, index) {
       this.type = type
       if (type === 1) {