diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index 706475b44..0f1b6c8f0 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -12,7 +12,7 @@ :rules="dataRule" class="div_form" > - + - @@ -413,10 +397,10 @@ export default { resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 serviceName: "", //服务事项 - noticeApproches: [], //通知服务方 + noticeApproches: [], //通知服务组织 policyId: "", //政策依据 - serviceOrgType: "", //服务方类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit - serviceOrgId: "", //服务方Id + serviceOrgType: "", //服务组织类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit + serviceOrgId: "", //服务组织Id gridIdList: [], // principalName: "", //经办人(责任人)姓名 principalContact: "", //经办人联系方式 @@ -444,7 +428,7 @@ export default { { required: true, message: "服务事项不能为空", trigger: "change" }, ], serviceOrgId: [ - { required: true, message: "服务方不能为空", trigger: "change" }, + { required: true, message: "服务组织不能为空", trigger: "change" }, ], serviceTimeStart: [ diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue index 0c300e1e6..a3317d059 100644 --- a/src/views/modules/communityService/fuwuzhaoren/index.vue +++ b/src/views/modules/communityService/fuwuzhaoren/index.vue @@ -203,7 +203,7 @@ @@ -484,7 +484,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.searchdemandOptions = this.getTreeData(res.data); + this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1038' ||item.categoryCode == '1039'||item.categoryCode == '1041'); } }) .catch(() => { @@ -522,7 +522,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.serviceOptions = data; + this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare'); } else { this.$message.error(msg) } @@ -544,24 +544,18 @@ export default { async getServiceuserList (serviceType, query) { if (!serviceType) return false; - - const params = { - serviceName: "", - serviceType: serviceType, - queryPurpose: query, + const url = "/actual/base/serviceitem/listServerOrgNewTask"; + let params = { + serverOrgCategoryCode: this.formData.categoryCode, + serverParentOrgCategoryCode:this.formData.parentCategoryCode, + serverOrgType: serviceType, }; - await this.$http - .post("/governance/userdemand/servicelist", params) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceOptiondList = res.data - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.serviceOptiondList = data; + } else if (code >= 8000) { + this.$message.error(msg); + } }, //加载人员列表数据 async handlePersonList (row) { diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index 774ee25a6..8ec770471 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -96,7 +96,7 @@ @@ -414,10 +414,10 @@ export default { resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 serviceName: "", //服务事项 - noticeApproches: [], //通知服务方 + noticeApproches: [], //通知服务组织 policyId: "", //政策依据 - serviceOrgType: "", //服务方类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit - serviceOrgId: "", //服务方Id + serviceOrgType: "", //服务组织类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit + serviceOrgId: "", //服务组织Id gridIdList: [], // principalName: "", //经办人(责任人)姓名 principalContact: "", //经办人联系方式 @@ -445,7 +445,7 @@ export default { { required: true, message: "服务事项不能为空", trigger: "change" }, ], serviceOrgId: [ - { required: true, message: "服务方不能为空", trigger: "change" }, + { required: true, message: "服务组织不能为空", trigger: "change" }, ], serviceTimeStart: [ diff --git a/src/views/modules/communityService/gangweizhaoren/index.vue b/src/views/modules/communityService/gangweizhaoren/index.vue index 07b929420..f6a227af4 100644 --- a/src/views/modules/communityService/gangweizhaoren/index.vue +++ b/src/views/modules/communityService/gangweizhaoren/index.vue @@ -6,36 +6,17 @@ :model="formData" ref="ref_searchform" :label-width="'100px'"> - - - - - - - - - - - - + + + @@ -222,7 +203,7 @@ @@ -411,9 +392,6 @@ export default { } return { - // 公共服务分类 - serviceTypesLevel1:[], - serviceTypesLevel2:[], tableLoading: false, user: {}, agencyId: '', @@ -447,8 +425,8 @@ export default { ], formData: { - serviceTypeLevel1Id:'',// 公共服务(政策级别)一级分类id - serviceTypeLevel2Id:'',// 公共服务(政策级别)二级分类id + categoryCode:'', + parentCategoryCode:'', serviceName: '',//项目名称 serviceOrgType: '',//服务组织类型 serviceOrgId: '',//服务组织Id @@ -488,7 +466,8 @@ export default { ruleList: [], // 多选行 - multiSelectedRows: [] + multiSelectedRows: [], + searchdemandOptions:[] }; }, computed: { @@ -515,26 +494,44 @@ export default { this.agencyId = this.user.agencyId this.getDictOptions() this.getTableData(); + this.getDemandOptions() + }, methods: { - // 服务类型下拉框选中事件 - handleChangeServiceTypeLevel1() { - this.formData.serviceTypeLevel2Id = '' + async getDemandOptions() { this.$http - .get("/governance/commonServiceType/selectList/" + this.formData.serviceTypeLevel1Id) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceTypesLevel2 = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }) + .post("/actual/base/serviceitem/listAllCategory") + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1043'); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getTreeData(data) { + if (!Array.isArray(data)) return []; + let arr = data.map((item) => { + let _item = {}; + if (item.childCateList) { + if (item.childCateList.length === 0) + _item = { ...item, childCateList: undefined }; + else _item = { ...item, childCateList: this.getTreeData(item.childCateList) }; + } else { + _item = { ...item }; + } + return _item; + }); + return arr; + }, + handleCateCHange(val) { + this.formData.parentCategoryCode = val[0]; + this.formData.categoryCode = val[1]; }, - handleSearch (val) { console.log(this.formData); this.pageNo = 1; @@ -551,23 +548,10 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.serviceOptions = data; + this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'); } else { this.$message.error(msg) } - - this.$http - .get("/governance/commonServiceType/selectList/0") - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceTypesLevel1 = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); }, handleServiceChange (type, val) { @@ -585,24 +569,18 @@ export default { async getServiceuserList (serviceType, query) { if (!serviceType) return false; - - const params = { - serviceName: "", - serviceType: serviceType, - queryPurpose: query, + const url = "/actual/base/serviceitem/listServerOrgNewTask"; + let params = { + serverOrgCategoryCode: this.formData.categoryCode, + serverParentOrgCategoryCode:this.formData.parentCategoryCode, + serverOrgType: serviceType, }; - await this.$http - .post("/governance/userdemand/servicelist", params) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceOptiondList = res.data - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.serviceOptiondList = data; + } else if (code >= 8000) { + this.$message.error(msg); + } }, //加载人员列表数据 async handlePersonList (row) { @@ -799,8 +777,7 @@ export default { resetSearch () { this.formData = { - serviceTypeLevel1Id:'',// 公共服务(政策级别)一级分类id - serviceTypeLevel2Id:'',// 公共服务(政策级别)二级分类id + categoryCode:'', serviceName: '',//项目名称 serviceOrgType: '',//服务组织类型 serviceOrgId: '',//服务组织Id diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index 889086bae..4221e221b 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -86,7 +86,7 @@ @@ -319,7 +319,7 @@ export default { }, newFormData: { noticeApproches: [], //服务范围 - serviceScopeList: [], //通知服务方 + serviceScopeList: [], //通知服务组织 serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeEnd: "", //服务截止时间yyyy-MM-dd serverOrgType: "", //服务组织类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit @@ -346,7 +346,7 @@ export default { }, newDataRule: { serverOrgId: [ - { required: true, message: "服务方不能为空", trigger: "bulr" }, + { required: true, message: "服务组织不能为空", trigger: "bulr" }, ], serviceScopeList: [ { required: true, message: "服务范围不能为空", trigger: "bulr" }, @@ -467,7 +467,7 @@ export default { }, // 服务类型下拉框选中事件 - // 如果服务方有选择第一个的话让它更新 + // 如果服务组织有选择第一个的话让它更新 handleChangeServiceTypeLevel2() { if (this.newFormData.serverOrgType) { this.getServiceuserList(this.newFormData.serverOrgType); @@ -716,7 +716,7 @@ export default { }, async addFuwu() { - // 通知服务方方式,如果都没有选中传数组字符串'0' + // 通知服务组织方式,如果都没有选中传数组字符串'0' if (this.newFormData.noticeApproches.length == 0) { this.newFormData.noticeApproches.push(0); } diff --git a/src/views/modules/communityService/gxxq/detailForm.vue b/src/views/modules/communityService/gxxq/detailForm.vue index 50cf4c6fc..d26b25c03 100644 --- a/src/views/modules/communityService/gxxq/detailForm.vue +++ b/src/views/modules/communityService/gxxq/detailForm.vue @@ -39,7 +39,7 @@ }}
- 服务方: + 服务组织: {{ serverOrgType }} - {{serverOrgName}}
diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue index 399c19e3c..e52c68e50 100644 --- a/src/views/modules/communityService/jinengzhaoren/addForm.vue +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -96,7 +96,7 @@ @@ -413,10 +413,10 @@ export default { resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 serviceName: "", //服务事项 - noticeApproches: [], //通知服务方 + noticeApproches: [], //通知服务组织 policyId: "", //政策依据 - serviceOrgType: "", //服务方类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit - serviceOrgId: "", //服务方Id + serviceOrgType: "", //服务组织类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit + serviceOrgId: "", //服务组织Id gridIdList: [], // principalName: "", //经办人(责任人)姓名 principalContact: "", //经办人联系方式 @@ -445,7 +445,7 @@ export default { { required: true, message: "服务事项不能为空", trigger: "change" }, ], serviceOrgId: [ - { required: true, message: "服务方不能为空", trigger: "change" }, + { required: true, message: "服务组织不能为空", trigger: "change" }, ], serviceTimeStart: [ diff --git a/src/views/modules/communityService/jinengzhaoren/index.vue b/src/views/modules/communityService/jinengzhaoren/index.vue index 8d893fe52..aecb4d2ea 100644 --- a/src/views/modules/communityService/jinengzhaoren/index.vue +++ b/src/views/modules/communityService/jinengzhaoren/index.vue @@ -482,7 +482,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.searchdemandOptions = this.getTreeData(res.data); + this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1043'); } }) .catch(() => { @@ -521,7 +521,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.serviceOptions = data; + this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare');; } else { this.$message.error(msg) } @@ -545,24 +545,18 @@ export default { async getServiceuserList (serviceType, query) { if (!serviceType) return false; - - const params = { - serviceName: "", - serviceType: serviceType, - queryPurpose: query, + const url = "/actual/base/serviceitem/listServerOrgNewTask"; + let params = { + serverOrgCategoryCode: this.formData.categoryCode, + serverParentOrgCategoryCode:this.formData.parentCategoryCode, + serverOrgType: serviceType, }; - await this.$http - .post("/governance/userdemand/servicelist", params) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceOptiondList = res.data - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.serviceOptiondList = data; + } else if (code >= 8000) { + this.$message.error(msg); + } }, //加载人员列表数据 async handlePersonList (row) { diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index 34ac34703..5c32453c6 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -96,7 +96,7 @@ @@ -414,10 +414,10 @@ export default { resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 serviceName: "", //服务事项 - noticeApproches: [], //通知服务方 + noticeApproches: [], //通知服务组织 policyId: "", //政策依据 - serviceOrgType: "", //服务方类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit - serviceOrgId: "", //服务方Id + serviceOrgType: "", //服务组织类型 社区自组织:community_org, 志愿者:ic_user_volunteer, 联建单位:party_unit + serviceOrgId: "", //服务组织Id gridIdList: [], // principalName: "", //经办人(责任人)姓名 principalContact: "", //经办人联系方式 @@ -446,7 +446,7 @@ export default { { required: true, message: "服务事项不能为空", trigger: "change" }, ], serviceOrgId: [ - { required: true, message: "服务方不能为空", trigger: "change" }, + { required: true, message: "服务组织不能为空", trigger: "change" }, ], serviceTimeStart: [ diff --git a/src/views/modules/communityService/wennuanzhaoren/index.vue b/src/views/modules/communityService/wennuanzhaoren/index.vue index 634196ace..69feed533 100644 --- a/src/views/modules/communityService/wennuanzhaoren/index.vue +++ b/src/views/modules/communityService/wennuanzhaoren/index.vue @@ -506,7 +506,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.searchdemandOptions = this.getTreeData(res.data); + this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1040'); } }) .catch(() => { @@ -549,7 +549,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.serviceOptions = data; + this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'); } else { this.$message.error(msg) } @@ -570,24 +570,18 @@ export default { async getServiceuserList (serviceType, query) { if (!serviceType) return false; - - const params = { - serviceName: "", - serviceType: serviceType, - queryPurpose: query, + const url = "/actual/base/serviceitem/listServerOrgNewTask"; + let params = { + serverOrgCategoryCode: this.formData.categoryCode, + serverParentOrgCategoryCode:this.formData.parentCategoryCode, + serverOrgType: serviceType, }; - await this.$http - .post("/governance/userdemand/servicelist", params) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceOptiondList = res.data - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.serviceOptiondList = data; + } else if (code >= 8000) { + this.$message.error(msg); + } }, //加载人员列表数据 async handlePersonList (row) {