From 0e0853569be92bf60ec8d57eb870bf719ca77060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 31 Jul 2024 15:12:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index c53791e5f..0e68de892 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1755,6 +1755,7 @@ export default { // 调用递归函数提取 level 与 agencyId 组合成的字符串 this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); // 将 Set 对象转换为数组 + const manageScopeArray = Array.from(result); const url = "/gov/org/staff/editstaff"; let params = { @@ -2137,11 +2138,10 @@ export default { // 修改人员 async xiuPeo (row) { console.log("修改人员"); + console.log(row); this.modifyPeo = true; this.peoForm.orgType = "agency"; - this.userStaffId = row.staffId; - const url = "/gov/org/staff/editstaffinit"; let params = { staffId: row.staffId, @@ -2152,9 +2152,9 @@ export default { this.peoForm.name = data.name; this.peoForm.mobile = data.mobile; this.peoForm.post = data.workType; - // this.peoForm.gender = data.gender === 1 ? '男' : '女' this.peoForm.gender = data.gender; this.peoForm.idCard = data.idCard; + this.peoForm.agencyName=data.agencyName; // 已有的权限（角色） let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2164,24 +2164,25 @@ export default { }); this.peoForm.newRoles = existedRoleArr; var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); + console.log(paths,"shskdjfhkjsaf"); this.peoForm.manageScopes = paths; } else { this.$message.error(msg); } }, findParentPath(data,agencyIds) { + console.log(data,agencyIds,"dskck"); let paths = []; - function findPathRecursive(agencyId, node, path) { - if (node.agencyId === agencyId) { + console.log(agencyId, node, path); + if (node.id === agencyId) { path.push(agencyId); paths.push(path.slice()); // Make a copy of the path array before pushing return true; } - - if (node.subAgencyList) { - for (let i = 0; i < node.subAgencyList.length; i++) { - if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) { + if (node.manageScopes) { + for (let i = 0; i < node.manageScopes.length; i++) { + if (findPathRecursive(agencyId, node.manageScopes[i], path.concat(node.id))) { return true; } } @@ -2193,7 +2194,7 @@ export default { agencyIds.forEach(agencyId => { findPathRecursive(agencyId, data, []); }); - + console.log(paths,"paths"); return paths; }, // 修改社区人员 From 2777aa62aa61177737586189c9f22e37fe08d815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 2 Aug 2024 09:47:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=84=E7=BB=87=E8=BF=9B=E8=A1=8C=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 86 +++++++++---------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 0e68de892..586fdd937 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1346,14 +1346,13 @@ export default { orgOptionProps :{ multiple: true, emitPath: true, - value: 'id', - label: 'label', - children: 'children', - checkStrictly: true, - lazy: true, - lazyLoad: (node, resolve) => { - this.loadOptions(node, resolve) - }, + value: 'agencyId', + label: 'agencyName', + children: 'subAgencyList', + checkStrictly: true + // lazyLoad: (node, resolve) => { + // this.loadOptions(node, resolve) + // }, }, dialogVisiblePeoAgency:false,//通过组织添加 @@ -1421,40 +1420,42 @@ export default { methods: { getOrgTreeList () { this.$http - .get('/actual/base/communityBuilding/tree/initTree', {}) + .post('/gov/org/customeragency/agencygridtree', {}) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } else { + console.log('获取组织树成功', res.data) this.orgOptions = [] this.orgOptions.push(res.data) + console.log(this.orgOptions,"sdkfhkjdfs"); } }) .catch(() => { return this.$message.error('网络错误') }) }, - async loadOptions(node, resolve) { - let data1 =node.data; - if (data1.level == 'district') { - resolve(this.orgOptions); - - } else { - if(data1.level !== "building"){ - const url = "/actual/base/communityBuilding/tree/nextTreeNode"; - let params = { - level:data1.level, - id:data1.id - }; - const { data, code, msg } =await requestGet(url, params); - data1.children=data - resolve(data); - }else{ - return resolve() - } - - } - }, + // async loadOptions(node, resolve) { + // let data1 =node.data; + // if (data1.level == 'district') { + // resolve(this.orgOptions); + + // } else { + // if(data1.level !== "building"){ + // const url = "/actual/base/communityBuilding/tree/nextTreeNode"; + // let params = { + // level:data1.level, + // id:data1.id + // }; + // const { data, code, msg } =await requestGet(url, params); + // data1.children=data + // resolve(data); + // }else{ + // return resolve() + // } + + // } + // }, // 点击后获取id handleChangeTransferCascader (e) { function findItem (valueArr, coll) { @@ -1790,14 +1791,12 @@ export default { // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串 extractLevelAndAgencyId(obj, agencyIds, result) { - if (obj && typeof obj === 'object') { - console.log(obj,"1111"); - if (obj.level && obj.id && agencyIds.includes(obj.id)) { - result.add(`${obj.level}:${obj.id}`); + if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) { + result.add(`${obj.level}:${obj.agencyId}`); } - if (Array.isArray(obj.children)) { - obj.children.forEach(subObj => { + if (Array.isArray(obj.subAgencyList)) { + obj.subAgencyList.forEach(subObj => { this.extractLevelAndAgencyId(subObj, agencyIds, result); }); } @@ -2149,6 +2148,8 @@ export default { }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { + console.log("修改人员", data); + this.peoForm.name = data.name; this.peoForm.mobile = data.mobile; this.peoForm.post = data.workType; @@ -2164,7 +2165,6 @@ export default { }); this.peoForm.newRoles = existedRoleArr; var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); - console.log(paths,"shskdjfhkjsaf"); this.peoForm.manageScopes = paths; } else { this.$message.error(msg); @@ -2173,16 +2173,15 @@ export default { findParentPath(data,agencyIds) { console.log(data,agencyIds,"dskck"); let paths = []; - function findPathRecursive(agencyId, node, path) { - console.log(agencyId, node, path); - if (node.id === agencyId) { + function findPathRecursive(agencyId, node, path) {; + if (node.agencyId === agencyId) { path.push(agencyId); paths.push(path.slice()); // Make a copy of the path array before pushing return true; } - if (node.manageScopes) { - for (let i = 0; i < node.manageScopes.length; i++) { - if (findPathRecursive(agencyId, node.manageScopes[i], path.concat(node.id))) { + if (node.subAgencyList) { + for (let i = 0; i < node.subAgencyList.length; i++) { + if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) { return true; } } @@ -2190,7 +2189,6 @@ export default { return false; } - agencyIds.forEach(agencyId => { findPathRecursive(agencyId, data, []); }); From f5124546cb69e415140d27068a22aa64740fd963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 7 Aug 2024 16:09:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=98=E4=B8=BAlevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/eventOld/cpts/process-form-designate.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue index be3cd8530..3d5265f0f 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue @@ -205,11 +205,11 @@ export default { handleChangeAgency(val) { let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data if (obj) { - this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency' + this.formData.level = obj.level === 'grid' ? 'grid' : 'agency' this.formData.deptId = obj.agencyId this.formData.deptName = obj.agencyName } else { - this.form.orgType = '' + this.form.level = '' this.form.orgId = '' } },