From bee6ce5593f7d738da367fbdb2d788748484d5c0 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 18 Nov 2023 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=96=B9=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B94?= =?UTF-8?q?=E4=B8=AA=E6=89=BE=E4=BA=BA=E6=9C=8D=E5=8A=A1=E6=96=B9=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwuzhaoren/addForm.vue | 2 +- .../gangweizhaoren/addForm.vue | 2 +- .../modules/communityService/gxxq/addForm.vue | 29 ++++++++++++++++--- .../jinengzhaoren/addForm.vue | 2 +- .../communityService/measure/index.vue | 19 ++---------- .../communityService/policy/addPolicy.vue | 8 ++--- .../wennuanzhaoren/addForm.vue | 2 +- 7 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index f63ed31f0..17def638d 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -788,7 +788,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare'); } }) .catch(() => { diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index 066ad4cf5..2d2edaf38 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -793,7 +793,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'); } }) .catch(() => { diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index 71b327d2f..aa20a8419 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -20,7 +20,9 @@ :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}" clearable size="small" + ref="categoryCode" class="u-item-width-normal" + @change="handelChangeCategoryCode" > parentMappings[checkedParent].includes(item.value)); + } else { + this.serviceOptions = this.originalServiceOptions + } + }, async iniDefaultData() { const { defaultData } = this; console.log("iniDefaultData3", defaultData); @@ -524,6 +544,7 @@ export default { return this.$message.error(res.msg); } else { this.serviceOptions = res.data; + this.originalServiceOptions = [...this.serviceOptions]; } }) .catch(() => { @@ -579,12 +600,12 @@ export default { }, async getServiceuserList(serverOrgType) { - if (this.formData.categoryCode == [] || !serverOrgType) return; - const url = "/actual/base/serviceitem/listServerOrg"; + if (this.formData.categoryCode.length === 0) return; + const url = "/actual/base/serviceitem/listServerOrgNewTask"; let params = { - serviceTypeId: this.formData.categoryCode[1], + serverOrgCategoryCode: this.formData.categoryCode[1], + serverParentOrgCategoryCode:this.formData.categoryCode[0], serverOrgType: serverOrgType, - businessType: "common_service", }; let { data, code, msg } = await requestPost(url, params); if (code == 0) { diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue index ff156a444..9ef813823 100644 --- a/src/views/modules/communityService/jinengzhaoren/addForm.vue +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -791,7 +791,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare'); } }) .catch(() => { diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index b2190c3e6..b0d5f0a60 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -686,22 +686,7 @@ export default { boxHeight:true, serviceOptions: [ - { - label: "志愿者", - value: "volunteer", - }, - // { - // label: '社会组织', - // value: 'social_org' - // }, - { - label: "社区自组织", - value: "community_org", - }, - { - label: "区域党建单位", - value: "party_unit", - }, + ], serviceOptiondList: [], options: [ @@ -1402,7 +1387,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value != 'fifteen_mins_places'); } }) .catch(() => { diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 7a9dac658..585646186 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -569,11 +569,11 @@ export default { this.$message.error("请先选择需求类别!"); return; } - const url = "/actual/base/serviceitem/listServerOrg"; + const url = "/actual/base/serviceitem/listServerOrgNewTask"; let params = { - serviceTypeId: this.formData.categoryCode[1], + serverOrgCategoryCode: this.formData.categoryCode[1], + serverParentOrgCategoryCode:this.formData.categoryCode[0], serverOrgType: this.newFormData.serverOrgType ||this.formData.assignInfo.serverOrgType, - businessType: "common_service", }; console.log(this.formData); let { data, code, msg } = await requestPost(url, params); @@ -592,7 +592,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare'); } }) .catch(() => { diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index 7df70934c..efd4b338a 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -751,7 +751,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data; + this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'); } }) .catch(() => {