From 10428e06d5adbc9d0175bd238ca3e6b9b1b816a2 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: Tue, 14 May 2024 13:19:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?level=E5=80=BC=E7=AD=89=E4=BA=8E"district",?= =?UTF-8?q?=20"street",=20"community"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resourceManagement/enterprise/addForm.vue | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index 413e1bc2a..015d05bc4 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -414,21 +414,32 @@ export default { this.formData.agencyId = val.length ? val[val.length - 1] : val[0]; }, getOrgTreeList() { - this.$http - .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) - } - }) - .catch(() => { - return this.$message.error('网络错误') - }) - }, + this.$http +                .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) +                        const filteredData = { +                            ...res.data, +                            subAgencyList: res.data.subAgencyList.filter(item => ["district", "street", "community"].includes(item.level)) +                        }; +                        this.orgOptions = [] +                        this.orgOptions.push(filteredData) +                        filteredData.subAgencyList.forEach(item => { +                            console.log(item.level); +                        }); +                        console.log('获取组织树成功111', this.orgOptions) +                    } + +                }) +                .catch(() => { +                    return this.$message.error('网络错误') +                }) +        }, addInput() { if (this.inputList.some(item => item.hazardDesc.trim() === '')) { } else { From 46b1c89e390e865dc63b0e9da89d5decde665615 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: Tue, 14 May 2024 13:45:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=BF=E5=88=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8E=E9=80=92=E5=BD=92=E5=A4=84=E7=90=86=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84,=E5=8F=AA=E6=8B=BFlevel?= =?UTF-8?q?=E4=B8=BAdistrict=20=20street=20=20community=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resourceManagement/enterprise/addForm.vue | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index d59f3ce44..9818f69bd 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -414,32 +414,40 @@ export default { this.formData.agencyId = val.length ? val[val.length - 1] : val[0]; }, getOrgTreeList() { - this.$http -                .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) -                        const filteredData = { -                            ...res.data, -                            subAgencyList: res.data.subAgencyList.filter(item => ["district", "street", "community"].includes(item.level)) -                        }; -                        this.orgOptions = [] -                        this.orgOptions.push(filteredData) -                        filteredData.subAgencyList.forEach(item => { -                            console.log(item.level); -                        }); -                        console.log('获取组织树成功111', this.orgOptions) -                    } + this.$http + .post('/gov/org/customeragency/agencygridtree', {}) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + console.log('获取组织树成功', res.data); -                }) -                .catch(() => { -                    return this.$message.error('网络错误') -                }) -        }, + // 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点 + this.orgOptions = this.filterOrgTree(res.data); + + console.log('获取组织树成功111', this.orgOptions); + } + }) + .catch(() => { + return this.$message.error('网络错误'); + }); +}, + +filterOrgTree(treeData) { + const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据 + + // 过滤当前节点的子节点 + if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) { + filteredTree.subAgencyList = filteredTree.subAgencyList.filter(node => { + return ["district", "street", "community"].includes(node.level); // 只保留 level 为 "district"、"street" 和 "community" 的节点 + }).map(node => { + // 对当前节点的子节点递归调用 filterOrgTree 方法 + return this.filterOrgTree(node); + }); + } + + return filteredTree; +}, addInput() { if (this.inputList.some(item => item.hazardDesc.trim() === '')) { } else { From 42fb0e9bae90f09202d4bd5849e37893738e4aa7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 14 May 2024 13:55:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E7=BB=99=E5=AE=83=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resourceManagement/enterprise/addForm.vue | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index 9818f69bd..7d2afeffd 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -414,40 +414,40 @@ export default { this.formData.agencyId = val.length ? val[val.length - 1] : val[0]; }, getOrgTreeList() { - this.$http - .post('/gov/org/customeragency/agencygridtree', {}) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - console.log('获取组织树成功', res.data); - - // 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点 - this.orgOptions = this.filterOrgTree(res.data); - - console.log('获取组织树成功111', this.orgOptions); - } - }) - .catch(() => { - return this.$message.error('网络错误'); - }); -}, - -filterOrgTree(treeData) { - const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据 - - // 过滤当前节点的子节点 - if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) { - filteredTree.subAgencyList = filteredTree.subAgencyList.filter(node => { - return ["district", "street", "community"].includes(node.level); // 只保留 level 为 "district"、"street" 和 "community" 的节点 - }).map(node => { - // 对当前节点的子节点递归调用 filterOrgTree 方法 - return this.filterOrgTree(node); - }); - } + this.$http + .post('/gov/org/customeragency/agencygridtree', {}) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + // 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点 + this.orgOptions = this.filterOrgTree(res.data); + console.log('获取组织树成功111', this.orgOptions); + } + }) + .catch(() => { + return this.$message.error('网络错误'); + }); + }, + filterOrgTree(treeData) { + const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据 + // 过滤当前节点的子节点 + if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) { + filteredTree.subAgencyList = filteredTree.subAgencyList.map(node => { + // 对当前节点的子节点递归调用 filterOrgTree 方法 + const filteredNode = this.filterOrgTree(node); + if (filteredNode.level === 'community') { + filteredNode.subAgencyList = null; + } + return filteredNode; + }).filter(node => { + // 只保留 level 为 "district"、"street" 和 "community" 的节点 + return ["district", "street", "community"].includes(node.level); + }); + } - return filteredTree; -}, + return filteredTree; + }, addInput() { if (this.inputList.some(item => item.hazardDesc.trim() === '')) { } else {