From e883f2840ecb2b7c4682cfd983fb5d7ab5537442 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:59:06 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=8A=82=E7=82=B9=20=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E8=BE=93=E5=85=A5=E5=9B=9E=E6=89=A7=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 10867d424..47a565dc2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -362,7 +362,9 @@ name: "bzzqyjStep3", data() { return { - commentForm: {}, + commentForm: { + commentText3: '' + }, commentFormRules:{ commentText3:[{required: true, message: '回执说明不能为空',trigger: 'blur'}] }, 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 02/24] =?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)" /> @@ -1083,6 +1083,15 @@ :nodeList="nodeList" @checkedRole="checkedRole" /> + + + !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)" /> @@ -1247,6 +1247,15 @@ :nodeList="nodeList" @checkedRole="checkedRole" /> + + + @@ -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) { From f6b77a20a670c21658b1d85bbe7d38a2e195981e Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:10:43 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=20=E7=A0=94=E7=A9=B6=E6=80=BB?= =?UTF-8?q?=E9=99=A2=E4=B8=BB=E7=AE=A1=E5=89=AF=E9=99=A2=E9=95=BF=20?= =?UTF-8?q?=E5=8D=95=E9=80=89=20=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 | 1713 ++++++++-------- .../pages/creatProcess/qbrk/step1.vue | 1759 ++++++++--------- 2 files changed, 1705 insertions(+), 1767 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 50f4c6d95..6313ad720 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -12,11 +12,11 @@
@@ -27,49 +27,49 @@