From 306b2716ab458cc4e67703747386531c688a822d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 12 Oct 2024 17:50:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E5=88=86=E7=AE=A1=E9=83=A8=E9=97=A8key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 81eb505f3..9a59f2ed1 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -2143,9 +2143,9 @@ export default { this.peoForm.gender = data.gender; this.peoForm.post = data.workType; this.peoForm.idCard = data.idCard; - this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[]; + this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[]; this.peoForm.orgLevels = data.orgLevels; - this.manageOrgIds = data.manageOrgIds; + this.manageOrgIds = data.manageOrgIdStr; // 已有的权限（角色） let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2180,9 +2180,9 @@ export default { this.peoForm.gender = data.gender; this.peoForm.idCard = data.idCard; this.peoForm.agencyName=data.agencyName; - this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[]; + this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[]; this.peoForm.orgLevels = data.orgLevels; - this.manageOrgIds = data.manageOrgIds; + this.manageOrgIds = data.manageOrgIdStr; // 已有的权限（角色） let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2245,9 +2245,9 @@ export default { this.peoForm.gender = data.gender; this.peoForm.post = data.workType; this.peoForm.idCard = data.idCard; - this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[]; + this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[]; this.peoForm.orgLevels = data.orgLevels; - this.manageOrgIds = data.manageOrgIds; + this.manageOrgIds = data.manageOrgIdStr; // 已有的权限（角色） let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { From d3053d9a85c59c6c1c1ab122b11d0e005bd1dc5a Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 14 Oct 2024 10:14:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E7=AE=A1=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=20=E6=97=B6=E9=97=B4=E5=8A=9E=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/organization/organization.vue | 13 +++++++++---- .../modules/shequzhili/eventHandling/index.vue | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 9a59f2ed1..e8854fceb 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -512,7 +512,7 @@
- @@ -1344,7 +1344,8 @@ export default { }, orgDeptOptionProps: { - multiple: false, + multiple: true, + emitPath:true, value: 'agencyId', label: 'agencyName', children: 'subAgencyList', @@ -2193,6 +2194,8 @@ export default { this.peoForm.newRoles = existedRoleArr; var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); this.peoForm.manageScopes = paths; + var paths1 = this.findParentPath(this.orgDeptOptions[0],this.peoForm.manageOrgIds); + this.peoForm.manageOrgIds = paths1; } else { this.$message.error(msg); } @@ -3019,9 +3022,11 @@ export default { handleChangeAgency(val) { this.$nextTick(() => { let obj = this.$refs["agencyIdArray"].getCheckedNodes() + let orgIdList = obj.map(item=>item.value) + let orgLevelList = obj.map(item=>item.data.level) if (obj) { - this.peoForm.orgLevels =obj[0].pathNodes.map(item=>item.data.level).join(',') - this.manageOrgIds =obj[0].pathNodes.map(item=>item.data.agencyId).join(',') + this.peoForm.orgLevels = orgLevelList.join(',') + this.manageOrgIds = orgIdList.join(',') } else { this.manageOrgIds = '' this.peoForm.orgLevels = '' diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue index 19d6486dc..5c9c6e987 100644 --- a/src/views/modules/shequzhili/eventHandling/index.vue +++ b/src/views/modules/shequzhili/eventHandling/index.vue @@ -646,7 +646,7 @@ export default { } }, async getTableData() { - const url = "/governance/icEvent/list"; + const url = "/governance/icEvent/manageList"; if (this.eventTypeCheck) { this.formData.secondIdList = this.eventTypeCheck }