From 79319b2396c6b6de0165c062037c0a4a8632cf33 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 09:58:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/details/yxwxfw.vue | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index 022941eff..8e2679e98 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -99,7 +99,6 @@ export default { item: {}, loading: false, loading1: false, - activities: [], zuziTypes: { community_org: "社区自组织", ic_user_volunteer: "志愿者", @@ -180,16 +179,7 @@ export default { this.$message.error(msg); } }); - this.$http - .post("/governance/icEvent/process", { icEventId: id }) - .then((res) => { - const { code, data, msg } = res.data; - if (code === 0) { - this.activities = data; - } else { - this.$message.error(msg); - } - }); + }, }, }; From 10450b62ff87de8b0f7cb0c79f735dae42f2093b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 16:24:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/details/yxwxfw.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index c56b5c4e5..d7654baae 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -30,7 +30,8 @@
所属组织： - {{ formData.agencyName || '--'}} + {{ formData.gridIdList[0].objectName }} + --
服务类型： From e734c9bd1245146b08c8cfc372cdbcaacc00d036 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 26 Apr 2024 10:51:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=B1=85?= =?UTF-8?q?=E6=B0=91Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JwTree/nodeWrap.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index fa14e716c..6b2ebd227 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -35,7 +35,7 @@
-
+
{{ item.organizationName }}
From a2b508a3f69e44b53fe8aee2fbf58c566b839abc Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 28 Apr 2024 10:09:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E6=A0=91=E9=87=8D=E5=A4=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiExpand/editExpand.vue | 6 +++++- src/views/modules/communityParty/members/update.vue | 10 ++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue index 644911953..7a0b2bfcb 100644 --- a/src/views/components/resiExpand/editExpand.vue +++ b/src/views/components/resiExpand/editExpand.vue @@ -274,6 +274,10 @@ export default { this.handleFormChange('parymemberInfoDto','partyOrgId','cascader1') }, async handleNextOrgTreeClick(node, resolve) { + if(node.children.length>0){ + resolve(null) + return + } await this.getTreeChildenList(node, resolve) }, async getTreeChildenList(node, resolve) { @@ -298,7 +302,7 @@ export default { }, async getOrgTree() { try { - const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot') + const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{depth: 8}) this.formList.forEach(c => { if (c.formId == "parymemberInfoDto") { for (let i of c.form[0].children) { diff --git a/src/views/modules/communityParty/members/update.vue b/src/views/modules/communityParty/members/update.vue index 4467a752c..637876a40 100644 --- a/src/views/modules/communityParty/members/update.vue +++ b/src/views/modules/communityParty/members/update.vue @@ -328,12 +328,10 @@ export default { */ async handleNextOrgTreeClick(node, resolve) { - // if (node.level === 1) { - // // loadPartyOrgTreeRoot接口已经返回了1，2级，所以点击1级的时候不需要加载了 - // resolve(null) - // return - // } - + if(node.children.length>0){ + resolve(null) + return + } let url = '/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid' let rst = await requestGet(url, {