From 32dd6afbdc5d05b812b5ca88a58628d7bdb990b4 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Fri, 17 Nov 2023 15:20:10 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E6=97=A0=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/eventOld/cpts/add.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue index 67486b3f7..a7bbaf710 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/add.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue @@ -86,7 +86,7 @@ - + From 075191bbc74bfefb99c7d09f3dfcb7d094fed629 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Nov 2023 15:24:04 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E9=9C=80=E6=B1=82,?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA,=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=89=BE=E4=BA=BA,=E5=B2=97=E4=BD=8D=E6=89=BE=E4=BA=BA,?= =?UTF-8?q?=E6=B8=A9=E6=9A=96=E6=89=BE=E4=BA=BA=E8=81=94=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E5=88=86=E7=B1=BB=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regionalParty/unitsForm.vue | 96 +++++++-- .../communityService/fuwuzhaoren/addForm.vue | 186 ++++++++--------- .../communityService/fuwuzhaoren/index.vue | 147 +++++--------- .../gangweizhaoren/addForm.vue | 180 ++++++++--------- .../modules/communityService/gxxq/addForm.vue | 156 +++++++-------- .../communityService/gxxq/detailForm.vue | 4 +- .../modules/communityService/gxxq/index.vue | 92 ++++----- .../jinengzhaoren/addForm.vue | 181 ++++++++--------- .../communityService/jinengzhaoren/index.vue | 139 +++++-------- .../communityService/measure/index.vue | 37 ++-- .../communityService/policy/addPolicy.vue | 189 +++++++----------- .../wennuanzhaoren/addForm.vue | 179 ++++++++--------- .../communityService/wennuanzhaoren/index.vue | 113 +++++------ .../tuceng/yingji/zizuzhi/addForm.vue | 83 ++++++-- src/views/modules/workSys/serviceMatters.vue | 115 +++++++---- .../serviceMattersComponents/addForm.vue | 91 ++++----- 16 files changed, 947 insertions(+), 1041 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 7f76ce9ce..e00dc980d 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -46,7 +46,7 @@ - {{ item.label }} + --> + + { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + 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; }, + //获取服务事项下拉框 + // async loadService() { + // const url = "/actual/base/serviceitem/dict-list"; + // let params = { + // type: "usable", + // // parentCategoryCode: '1010' + // }; + + // const { data, code, msg } = await requestPost(url, params); + + // if (code === 0) { + // this.serviceList = data; + // } else { + // this.$message.error(msg); + // } + // }, //加载组织 async loadFormData() { diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index f783d58a6..f63ed31f0 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -12,44 +12,16 @@ :rules="dataRule" class="div_form" > - - - - - - - - + - - - - + size="small" + class="u-item-width-normal" + > + - { - 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); + } + }) + .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; }, - handleSearch (val) { console.log(this.formData); this.pageNo = 1; @@ -556,18 +527,6 @@ export default { 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) { @@ -799,8 +758,7 @@ export default { resetSearch () { this.formData = { - serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id - serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id + categoryCode:'', serviceName: '',//项目名称 serviceOrgType: '',//服务组织类型 serviceOrgId: '',//服务组织Id @@ -814,7 +772,10 @@ export default { this.pageNo = 1 this.getTableData() }, - + handleCateCHange(val) { + this.formData.parentCategoryCode = val[0]; + this.formData.categoryCode = val[1]; + }, // 多选 onMultiSelect(row) { this.multiSelectedRows = row; diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index f4e7e7577..066ad4cf5 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -12,43 +12,15 @@ :rules="dataRule" class="div_form" > - - - - - - - - + - - - + size="small" + class="u-item-width-normal" + > - - - - - - - - - + - - - - - + size="small" + class="u-item-width-normal" + > + { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceTypesLevel1 = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); }, methods: { @@ -453,6 +409,11 @@ export default { this.formData.content = data.content; this.formData.assignFlag = data.assignFlag; this.formData.resiSearchTagId = data.resiSearchTagId; + if (data.categoryCode) { + this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode]; + } else { + this.formData.categoryCode = [data.parentCategoryCode]; + } if (data.assignInfo) { this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart; this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd; @@ -467,7 +428,6 @@ export default { } await this.getServiceuserList(data.assignInfo.serverOrgType); } - await this.handleChangeServiceTypeLevel1(); await // this.formData = { ...data }; await this.getTagName(); @@ -495,24 +455,7 @@ export default { } }, // 服务类型下拉框选中事件 - handleChangeServiceTypeLevel1() { - // this.formData.commonServiceTypeId = ""; - 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("网络错误"); - }); - }, + // 如果服务方有选择第一个的话让它更新 handleChangeServiceTypeLevel2() { if (this.newFormData.serverOrgType) { @@ -587,17 +530,59 @@ export default { return this.$message.error("网络错误"); }); }, - + async getDemandOptions() { + this.$http + .post("/actual/base/serviceitem/listAllCategory") + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + 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; + }, async handleServiceChange(type, val) { this.newFormData.serverOrgId = '' await this.getServiceuserList(val); }, async getServiceuserList(serverOrgType) { - if (this.formData.commonServiceTypeId == "" || !serverOrgType) return; + if (this.formData.categoryCode == [] || !serverOrgType) return; const url = "/actual/base/serviceitem/listServerOrg"; let params = { - serviceTypeId: this.formData.commonServiceTypeId, + serviceTypeId: this.formData.categoryCode[1], serverOrgType: serverOrgType, businessType: "common_service", }; @@ -625,6 +610,7 @@ export default { this.$message.error(rspMsg); } }, + //子级为空数组的赋值为null解决有空白页的问题 handleData(data) { for (let i = 0; i < data.length; i++) { @@ -731,6 +717,8 @@ export default { commonServiceTypeId: this.formData.commonServiceTypeId, resiSearchTagId: this.formData.resiSearchTagId, assignFlag: this.formData.assignFlag, + categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'', + parentCategoryCode:this.formData.categoryCode[0] }; if (this.formData.assignFlag === 1) { diff --git a/src/views/modules/communityService/gxxq/detailForm.vue b/src/views/modules/communityService/gxxq/detailForm.vue index 74999f331..50cf4c6fc 100644 --- a/src/views/modules/communityService/gxxq/detailForm.vue +++ b/src/views/modules/communityService/gxxq/detailForm.vue @@ -5,7 +5,7 @@
需求类别: - {{ ServiceTypeName || "--" }} + {{ formData.allCategoryName || "--" }}
- { - 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); + } + }) + .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; }, handleSearch (val) { @@ -555,21 +525,11 @@ export default { } 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("网络错误"); - }); }, - + handleCateCHange(val) { + this.formData.parentCategoryCode = val[0]; + this.formData.categoryCode = val[1]; + }, handleServiceChange (type, val) { this.formData.serviceOrgId = '' if (val === "social_org") { @@ -799,8 +759,7 @@ export default { resetSearch () { this.formData = { - serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id - serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id + categoryCode:'', serviceName: '',//项目名称 serviceOrgType: '',//服务组织类型 serviceOrgId: '',//服务组织Id diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 142946e59..b2190c3e6 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -35,7 +35,7 @@ class="u-item-width-daterange2" size="small" :options="searchdemandOptions" - :props="{ checkStrictly: true }" + :props="{ checkStrictly: true,label: 'categoryName',value: 'categoryCode',children: 'childCateList'}" clearable @change="handleCateCHange" > @@ -341,7 +341,7 @@ - + { - if (item.value == val[0]) this.form.parentCode = item.pvalue; - }); - this.form.categoryCode = val[0]; + this.form.parentCode = val[0]; + this.form.categoryCode = ''; } else { this.form.parentCode = val[0]; this.form.categoryCode = val[1]; @@ -1197,16 +1196,8 @@ export default { async editCate() { const categoryCode = this.form.categoryCode; if (Array.isArray(categoryCode)) { - if (categoryCode.length === 1) { - this.demandOptions.forEach((item) => { - if (item.value == categoryCode[0]) - this.form.parentCode = item.pvalue; - }); - this.form.categoryCode = categoryCode[0]; - } else { this.form.parentCode = categoryCode[0]; - this.form.categoryCode = categoryCode[1]; - } + this.form.categoryCode = categoryCode[1]? categoryCode[1]:''; } const _form = { @@ -1267,10 +1258,10 @@ export default { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; - if (item.children) { - if (item.children.length === 0) - _item = { ...item, children: undefined }; - else _item = { ...item, children: this.getTreeData(item.children) }; + if (item.childCateList) { + if (item.childCateList.length === 0) + _item = { ...item, childCateList: undefined }; + else _item = { ...item, childCateList: this.getTreeData(item.childCateList) }; } else { _item = { ...item }; } @@ -1282,8 +1273,8 @@ export default { if (!Array.isArray(data)) return []; let arr1 = data.filter((item) => item[flag]); let arr2 = arr1.map((item) => { - if (item.children) - return { ...item, children: this.getFlagData(item.children, flag) }; + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; else return item; }); // console.log('arrr-oppp', arr2) @@ -1337,7 +1328,7 @@ export default { async getDemandOptions() { this.$http - .post("/governance/icresidemanddict/demandoption") + .post("/actual/base/serviceitem/listAllCategory") .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 0bd011feb..7a9dac658 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -10,45 +10,16 @@ class="div_form" > - - - - - - - - + - - - - - + size="small" + class="u-item-width-normal" + > + { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceTypesLevel1 = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + }, // 获取服务范围树 @@ -687,22 +639,6 @@ export default { ); }, - // handleCateSlect(val) { - // console.log("val", val); - // let arr = []; - // val.forEach((item) => { - // let obj = { - // codePath: item.join(","), - // categoryCode: item[item.length - 1], - // }; - - // arr.push(obj); - // }); - - // console.log("arr", arr); - // this.formData.categoryList = arr; - // }, - async handleAdd() { // var oDate1 = new Date(this.formData.startDate); // var oDate2 = new Date(this.formData.endDate); @@ -814,7 +750,7 @@ export default { url = "/governance/policy/updatePolicy"; this.formData.policyId = this.policyId; } - //为什么不能传null还要返回null呢? + if (this.formType == "copy" && this.formData.assignFlag == 0) { this.formData.assignInfo = { noticeApproches: [], @@ -828,10 +764,19 @@ export default { } // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate' let params = { - ...this.formData, + categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'', + parentCategoryCode:this.formData.categoryCode[0], + policyLevel:this.formData.policyLevel, + startDate:this.formData.startDate, + endDate:this.formData.endDate, + title:this.formData.title, + content:this.formData.content, + attachmentList:this.formData.attachmentList, + assignFlag:this.formData.assignFlag, + assignInfo:this.formData.assignInfo, + resiSearchTagId:this.formData.resiSearchTagId, + policyId:this.formData.policyId }; - delete params.policyCategoryL1; - delete params.resiSearchTagName; console.log(params); const { data, code, msg } = await requestPost(url, params); @@ -844,7 +789,35 @@ export default { this.$message.error(msg); } }, - + async getDemandOptions() { + this.$http + .post("/actual/base/serviceitem/listAllCategory") + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.children) + return { ...item, children: this.getFlagData(item.children, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + getTreeData(data) { if (!Array.isArray(data)) return []; let arr = data.map((item) => { @@ -964,14 +937,18 @@ export default { resetData() { this.formData = { - serviceTypeLevel1Id: "", - serviceTypeLevel2Id: "", + categoryCode: [], + parentCategoryCode: "", policyLevel: "", //政府级别 startDate: "", //起始时间yyyy-MM-dd endDate: "", //截止时间yyyy-MM-dd title: "", // content: "", // attachmentList: [], + resiSearchTagName: "", //符合政策人员标签 + assignFlag: 0, //是否指派服务 + resiSearchTagId: "", //符合政策人员id + assignInfo: {}, }; }, // 开启加载动画 @@ -991,32 +968,12 @@ export default { }, // 服务类型下拉框选中事件 - handleChangeServiceTypeLevel1() { - this.formData.policyCategoryL2 = ""; - this.getCommonServiceTypeSelectList() - }, - getCommonServiceTypeSelectList(){ - this.$http - .get( - "/governance/commonServiceType/selectList/" + - this.formData.policyCategoryL1 - ) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceTypesLevel2 = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); - }, + }, computed: { dataRule() { return { - policyCategoryL2: [ + categoryCode: [ { required: true, message: "政策类型不能为空", trigger: "blur" }, ], policyLevel: [ diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index 9c90d611a..7df70934c 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -12,44 +12,16 @@ :rules="dataRule" class="div_form" > - - - - - - - - + - - - - + size="small" + class="u-item-width-normal" + > + + @@ -249,7 +257,6 @@ export default { gridList: [], //所属网格list--场所区域 placeTypeList: [], //场所类型 list: {}, - serviceList: [], formData: { organizationName: '', categoryCode: '', @@ -265,6 +272,7 @@ export default { latitude: '', organizationPersonnel: [] }, + demandOptions:[], dataRule: { organizationName: [ { required: true, message: '组织名称 不能为空', trigger: 'blur' }, @@ -302,7 +310,9 @@ export default { this.startLoading(); this.getVolunteerList(); this.loadplaceType(); - this.loadserviceList(); + this.getDemandOptions() + + // this.loadserviceList(); // this.loadGrid(); // this.loadplaceType(); if (this.pageType != 'add') { @@ -315,17 +325,60 @@ export default { }, methods: { - async loadserviceList() { - const url = '/actual/base/serviceitem/dict-list'; - const params = { - type: 'usable' - }; - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { - this.serviceList = data; - } else { - this.$message.error(msg); - } + // async loadserviceList() { + // const url = '/actual/base/serviceitem/dict-list'; + // const params = { + // type: 'usable' + // }; + // const { data, code, msg } = await requestPost(url, params); + // if (code === 0) { + // this.serviceList = data; + // } else { + // this.$message.error(msg); + // } + // }, + async getDemandOptions() { + this.$http + .post("/actual/base/serviceitem/listAllCategory") + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + 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; }, querySearchVolunteer(queryString, cb) { const { volunteerList } = this; diff --git a/src/views/modules/workSys/serviceMatters.vue b/src/views/modules/workSys/serviceMatters.vue index 171c47d62..df9b3800b 100644 --- a/src/views/modules/workSys/serviceMatters.vue +++ b/src/views/modules/workSys/serviceMatters.vue @@ -2,41 +2,38 @@
-
新增
- - - - - - +
新增 +
+ + + + + - +
- +
- +
@@ -69,11 +66,37 @@ export default { detailData: {}, multipleSelection: [], rowObj: {}, - importLoading: false + importLoading: false, + tableHeader: [ + { + label: '分类名称', + align: 'left', + columnName: 'categoryName' + }, { + label: '状态', + columnName: 'usableFlag', + align: 'center', + options: [{ + value: true, + label: '启用' + }, { + value: false, + label: '禁用' + }] + } + ], + + tableLoading: false, }; }, components: { addForm }, - created() {}, + + created() { + this.user = this.$store.state.user; + this.agencyId = this.user.agencyId; + this.customerId = this.user.customerId; + this.getTableData(); + }, computed: { maxTableHeight() { return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410; @@ -82,11 +105,7 @@ export default { }, watch: {}, mounted() { - this.user = this.$store.state.user; - this.agencyId = this.user.agencyId; - this.customerId = this.user.customerId; - console.log('this.customerId ', this.customerId); - this.getTableData(); + }, methods: { async handleDel(rowData) { @@ -99,7 +118,7 @@ export default { .then(() => { this.del(rowData.categoryId); }) - .catch(err => {}); + .catch(err => { }); }, async del(id) { const url = `/actual/base/serviceitem/delete/${id}`; @@ -151,9 +170,20 @@ export default { this.detailId = ''; this.getTableData(); }, + handleFilterSpan(row, item) { + let _val = '' + if (item.options && item.options.length > 0) { + item.options.forEach((n) => { + if (n.value === row[item.columnName]) _val = n.label + }) + } + return _val || row[item.columnName] + }, async getTableData() { - const url = '/actual/base/serviceitem/list'; + this.tableLoading = true + + const url = '/actual/base/serviceitem/listAllCategory'; // const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list'; const { pageSize, pageNo, customerId } = this; const { data, code, msg } = await requestPost(url, { @@ -163,14 +193,28 @@ export default { }); if (code === 0) { this.total = data.total || 0; - this.tableData = data.list - ? data.list.map(item => { - return item; - }) + this.tableData = data + ? data.map((item, index) => { + return { + ...item, + index: index + 1, + hasBtn: true, + children: item.childCateList.map(n => { + return { + ...n, + hasBtn: true + } + }) + } + }) : []; + + console.log(this.tableData); } else { this.$message.error(msg); } + this.tableLoading = false + }, handleSizeChange(val) { this.pageSize = val; @@ -194,6 +238,7 @@ export default { diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index fed357721..58d508716 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -24,32 +24,16 @@ - - - - {{item.label}} - - - - - + + - { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + 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; + }, async loadGrid () { const url = "/gov/org/customergrid/gridoption" @@ -313,26 +343,7 @@ export default { }, - //获取服务事项下拉框 - async loadService () { - const url = "/actual/base/serviceitem/dict-list" - - let params = { - type: 'usable' - // parentCategoryCode: '1010' - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.serviceList = data - - } else { - this.$message.error(msg) - } - - }, - + //加载组织 async loadFormData () { const url = '/heart/icpartyactivity/detail' diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 9cabb8148..b25369ec7 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -523,6 +523,7 @@ export default { //点击标签触发事件 handleClickLabel() { this.showLabelForm = true; + this.$refs['ref_form'].clearValidate('resiSearchTagId') this.$nextTick(() => { this.$refs["ref_label_form"].initForm("info"); }); @@ -796,7 +797,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.demandOptions = this.getFlagData( + this.demandOptions = this.getFlagDatas( this.getTreeData(res.data), "usableFlag" ); @@ -806,12 +807,12 @@ export default { return this.$message.error("网络错误"); }); }, - getFlagData(data, flag) { + getFlagDatas(data, flag) { if (!Array.isArray(data)) return []; let arr1 = data.filter((item) => item[flag]); let arr2 = arr1.map((item) => { - if (item.children) - return { ...item, children: this.getFlagData(item.children, flag) }; + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; else return item; }); // console.log('arrr-oppp', arr2) @@ -822,10 +823,10 @@ export default { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; - if (item.children) { - if (item.children.length === 0) - _item = { ...item, children: undefined }; - else _item = { ...item, children: this.getTreeData(item.children) }; + if (item.childCateList) { + if (item.childCateList.length === 0) + _item = { ...item, childCateList: undefined }; + else _item = { ...item, childCateList: this.getTreeData(item.childCateList) }; } else { _item = { ...item }; } diff --git a/src/views/modules/workSys/serviceMatters.vue b/src/views/modules/workSys/serviceMatters.vue index df9b3800b..7660f0612 100644 --- a/src/views/modules/workSys/serviceMatters.vue +++ b/src/views/modules/workSys/serviceMatters.vue @@ -33,7 +33,7 @@
+ :dialogVisible="dialogVisible" :categoryOptions="categoryOptions" :levelFlag="levelFlag" @handleClose="handleClose" /> @@ -87,6 +87,10 @@ export default { ], tableLoading: false, + + categoryOptions:[],//子组件一级分类过滤用 + + levelFlag:false }; }, components: { addForm }, @@ -134,6 +138,7 @@ export default { handleAdd(row, type) { if (row.categoryId) { this.detailId = row.categoryId; + this.levelFlag = (row.children || []).length > 0; } this.pageType = type; this.dialogVisible = true; @@ -208,7 +213,7 @@ export default { } }) : []; - + this.categoryOptions= this.tableData.map(item=>({label:item.categoryName,value:item.categoryName})) console.log(this.tableData); } else { this.$message.error(msg); diff --git a/src/views/modules/workSys/serviceMattersComponents/addForm.vue b/src/views/modules/workSys/serviceMattersComponents/addForm.vue index 813bb0362..fdc7a336a 100644 --- a/src/views/modules/workSys/serviceMattersComponents/addForm.vue +++ b/src/views/modules/workSys/serviceMattersComponents/addForm.vue @@ -16,16 +16,18 @@ :rules="dataRule" :label-width="'120px'" > - - + + > - + [] + }, + levelFlag:{ + type:Boolean, + default:false } }, @@ -182,6 +192,17 @@ export default { }, methods: { + querySearch(queryString, cb) { + console.log(this.categoryOptions); + const results = this.categoryOptions.filter(option => + option.label.includes(queryString) + ); + console.log(results); + cb(results); + }, + handleSelect(item){ + console.log(item); + }, handleAreaChange1(data) { let that = this; let demandList = []; @@ -281,7 +302,6 @@ export default { async save() { let form = this.formData; - console.log("this.formData", this.formData); const url = "/actual/base/serviceitem/saveorupdate"; var params = {}; params = { ...this.formData }; From f88471f80342bdfaef6a1fd8a8e8ba3878d23c79 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Nov 2023 15:19:10 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/fuwuzhaoren/addForm.vue | 6 +++--- .../modules/communityService/gangweizhaoren/addForm.vue | 6 +++--- .../modules/communityService/jinengzhaoren/addForm.vue | 6 +++--- .../modules/communityService/wennuanzhaoren/addForm.vue | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index 375538050..6cb5f03fb 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -825,11 +825,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] ||this.formData.categoryCode[0], + 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/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index 77dd3d666..c20cbc722 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -830,11 +830,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] ||this.formData.categoryCode[0], + 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 55bd2e55f..c18836f91 100644 --- a/src/views/modules/communityService/jinengzhaoren/addForm.vue +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -828,11 +828,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] ||this.formData.categoryCode[0], + 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/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index ca82a113d..0b1188879 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -832,11 +832,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] ||this.formData.categoryCode[0], + 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) { From a5dbe915e9cdcbb687c84ffe2d76827e784bf198 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Nov 2023 19:17:13 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E8=BF=87?= =?UTF-8?q?=E6=BB=A4,bugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regionalParty/activitysForm.vue | 3 +- .../regionalParty/unitsForm.vue | 3 +- .../communityService/fuwuzhaoren/addForm.vue | 2 +- .../gangweizhaoren/addForm.vue | 2 +- .../modules/communityService/gxxq/addForm.vue | 95 +++++++++++-------- .../modules/communityService/gxxq/index.vue | 1 + .../jinengzhaoren/addForm.vue | 2 +- .../communityService/policy/addPolicy.vue | 29 +++++- .../wennuanzhaoren/addForm.vue | 2 +- .../tuceng/yingji/zizuzhi/addForm.vue | 1 + 10 files changed, 94 insertions(+), 46 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 58d508716..04a6c0c8c 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -28,8 +28,9 @@ diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index e00dc980d..7b9fb09cf 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -69,8 +69,9 @@ diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index 6cb5f03fb..706475b44 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -585,7 +585,7 @@ export default { this.demandOptions = this.getFlagData( this.getTreeData(res.data), "usableFlag" - ); + ).filter((item) => item.categoryCode == '1038' ||item.categoryCode == '1039'||item.categoryCode == '1041'); } }) .catch(() => { diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index c20cbc722..774ee25a6 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -575,7 +575,7 @@ export default { this.demandOptions = this.getFlagData( this.getTreeData(res.data), "usableFlag" - ); + ).filter((item) => item.categoryCode == '1044'); } }) .catch(() => { diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index 48488ade5..889086bae 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -12,7 +12,6 @@ class="div_form" > - @@ -364,6 +363,15 @@ export default { policyList: [], showLabelForm: false, + codeFilters: { + '1038': ['party_unit', 'community_org'], + '1039': ['party_unit', 'community_org'], + '1040': ['party_unit', 'community_org'], + '1041': ['party_unit', 'community_org', 'publicWelfare'], + '1042': ['party_unit', 'community_org', 'publicWelfare'], + '1043': ['party_unit', 'community_org', 'publicWelfare'], + '1044': ['party_unit', 'community_org'], + }, }; }, @@ -386,7 +394,6 @@ export default { created() {}, async mounted() { this.startLoading(); - // this.getCategrayList(); await this.getPolicyList(); await this.loadScopeTree(); await this.getDictOptions(); @@ -396,17 +403,17 @@ export default { }, methods: { - async initForm(type, row) { + initForm(type, row) { this.formType = type; this.scopeId = row.id; - await this.getDetail(row.id); + this.$nextTick(()=>{ + this.getDetail(row.id); + }) }, async getDetail(id) { const url = `/governance/commonDemand/detail/${id}`; const { data, code, msg } = await requestGet(url); - if (code === 0) { - this.formData.serviceTypeLevel1Id = data.servicePid; this.formData.commonServiceTypeId = data.commonServiceTypeId; this.formData.title = data.title; this.formData.content = data.content; @@ -417,6 +424,7 @@ export default { } else { this.formData.categoryCode = [data.parentCategoryCode]; } + if (data.assignInfo) { this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart; this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd; @@ -486,21 +494,16 @@ export default { this.formData.resiSearchTagName = ""; }, handelChangeCategoryCode() { - this.serviceOptions = [...this.originalServiceOptions]; - const parentMappings = { - '公益事业类': ['party_unit', 'community_org'], - '技能培训类': ['party_unit', 'publicWelfare', 'community_org'], - '教育讲座类': ['party_unit', 'community_org'], - '社会治理类': ['party_unit', 'community_org'], - '公共服务类': ['party_unit', 'community_org', 'publicWelfare'], - '岗位提供类': ['party_unit', 'community_org'], - }; - const checkedParent = this.$refs['categoryCode'].getCheckedNodes()[0].parent.label; - if (parentMappings[checkedParent] && Array.isArray(parentMappings[checkedParent])) { - this.serviceOptions = this.serviceOptions.filter(item => parentMappings[checkedParent].includes(item.value)); - } else { - this.serviceOptions = this.originalServiceOptions - } + this.serviceOptions = [...this.originalServiceOptions]; + const codeFilters = this.codeFilters; + console.log(this.serviceOptions); + const checkedCode = this.$refs['myCategoryCode'].getCheckedNodes()[0].parent.value; + console.log(checkedCode); + if (codeFilters[checkedCode] && Array.isArray(codeFilters[checkedCode])) { + this.serviceOptions = this.serviceOptions.filter(item => codeFilters[checkedCode].includes(item.value)); + } else { + this.serviceOptions = this.originalServiceOptions; + } }, async iniDefaultData() { const { defaultData } = this; @@ -535,22 +538,37 @@ export default { } }, async getDictOptions() { - this.$http - .post("/sys/dict/data/dictlist", { - dictType: "user_demand_service_type", - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.serviceOptions = res.data; - this.originalServiceOptions = [...this.serviceOptions]; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); - }, + this.$http + .post("/sys/dict/data/dictlist", { + dictType: "user_demand_service_type", + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.originalServiceOptions = [...res.data]; + console.log(this.originalServiceOptions); + if (this.formType == 'edit') { + this.$nextTick(() => { + const code = this.$refs['myCategoryCode'].checkedValue[0]; + const filterOptions = (filterCodes) => { + this.serviceOptions = res.data.filter(item => filterCodes.includes(item.value)); + }; + + if (code && this.codeFilters[code]) { + filterOptions(this.codeFilters[code]); + } + }); + }else{ + this.serviceOptions = res.data; + } + + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, async getDemandOptions() { this.$http .post("/actual/base/serviceitem/listAllCategory") @@ -810,6 +828,7 @@ export default { } }, }, + computed:{} }; diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue index 6d33185bd..df28e6cae 100644 --- a/src/views/modules/communityService/gxxq/index.vue +++ b/src/views/modules/communityService/gxxq/index.vue @@ -253,6 +253,7 @@ import { mapGetters } from "vuex"; import addForm from "./addForm.vue"; import detailForm from "./detailForm.vue"; import axios from "axios"; +import nextTick from "dai-js/tools/nextTick"; export default { data() { let endDisabledDate = (time) => { diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue index c18836f91..399c19e3c 100644 --- a/src/views/modules/communityService/jinengzhaoren/addForm.vue +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -574,7 +574,7 @@ export default { this.demandOptions = this.getFlagData( this.getTreeData(res.data), "usableFlag" - ); + ).filter((item) => item.categoryCode == '1043'); } }) .catch(() => { diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index b25369ec7..8c777e722 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -12,12 +12,14 @@ parentMappings[checkedParent].includes(item.value)); + } else { + this.serviceOptions = this.originalServiceOptions + } + console.log(this.serviceOptions); + }, //点击标签触发事件 handleClickLabel() { this.showLabelForm = true; @@ -593,7 +617,9 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare'); + this.serviceOptions = res.data; + this.originalServiceOptions = [...this.serviceOptions]; + } }) .catch(() => { @@ -601,7 +627,6 @@ export default { }); }, getDictOptions() { - // 政策级别下拉 this.$http .post("/sys/dict/data/dictlist", { dictType: "policy_level", diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index 0b1188879..34ac34703 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -785,7 +785,7 @@ export default { this.demandOptions = this.getFlagData( this.getTreeData(res.data), "usableFlag" - ); + ).filter((item) => item.categoryCode == '1040'); } }) .catch(() => { diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 04d55b6f8..cce8a375e 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -93,6 +93,7 @@ :options="demandOptions" :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}" clearable + collspse-tags size="small" class="u-item-width-normal" > From 2347a9d00cd4de830249a76ec727de7564697142 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Nov 2023 20:03:28 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E6=89=BE=E4=BA=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?,=E6=9C=8D=E5=8A=A1=E6=96=B9=E6=94=B9=E4=B8=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwuzhaoren/addForm.vue | 30 +--- .../communityService/fuwuzhaoren/index.vue | 34 ++-- .../gangweizhaoren/addForm.vue | 12 +- .../communityService/gangweizhaoren/index.vue | 147 ++++++++---------- .../modules/communityService/gxxq/addForm.vue | 12 +- .../communityService/gxxq/detailForm.vue | 2 +- .../jinengzhaoren/addForm.vue | 12 +- .../communityService/jinengzhaoren/index.vue | 32 ++-- .../wennuanzhaoren/addForm.vue | 12 +- .../communityService/wennuanzhaoren/index.vue | 32 ++-- 10 files changed, 134 insertions(+), 191 deletions(-) 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) { From 5170c663c64d4d8fd202cdeacf977f705d698ecc Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Nov 2023 20:03:57 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E4=B8=BA=E6=9C=8D=E5=8A=A1=E7=BB=84?= =?UTF-8?q?=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/details/yxwxfw.vue | 2 +- src/views/dataBoard/renfang/resi/classNew.vue | 6 +++--- .../satisfactionEval/potentialPeople/details/xqwmz.vue | 4 ++-- .../satisfactionEval/potentialPeople/details/yxwxfw.vue | 4 ++-- src/views/dataBoard/sida/fuwu/need-detail.vue | 4 ++-- src/views/dataBoard/sida/xq/need-detail.vue | 4 ++-- src/views/dataBoard/sida/zy/gexingDetail.vue | 2 +- src/views/modules/communityService/commonDemand/addForm.vue | 6 +++--- .../modules/communityService/commonDemand/detailForm.vue | 2 +- .../modules/communityService/commonDemand/editForm.vue | 2 +- src/views/modules/communityService/commonDemand/index.vue | 2 +- src/views/modules/communityService/jinengzhaoren/index.vue | 2 +- src/views/modules/communityService/measure/detail.vue | 2 +- src/views/modules/communityService/measure/index.vue | 6 +++--- src/views/modules/communityService/measure/info.vue | 2 +- src/views/modules/communityService/policy/addPolicy.vue | 6 +++--- src/views/modules/communityService/wennuanzhaoren/index.vue | 2 +- src/views/modules/home/cpts/xuqiu-info.vue | 2 +- src/views/modules/home/index.vue | 2 +- src/views/modules/portrayal/jumin/cpts/details/fwdetail.vue | 2 +- src/views/modules/shequ/chaxun.vue | 2 +- src/views/modules/shequ/cpts/xuqiu-info.vue | 2 +- src/views/modules/shequ/index.vue | 4 ++-- .../modules/shequzhili/event/cpts/process-form-demand.vue | 4 ++-- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 2 +- .../shequzhili/eventOld/cpts/process-form-demand.vue | 4 ++-- src/views/modules/shequzhili/welfare/addForm.vue | 2 +- src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue | 2 +- .../visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue | 2 +- src/views/modules/visual/communityParty/memberInfo.vue | 2 +- src/views/modules/visual/measure/dialogInfo.vue | 6 +++--- src/views/modules/visual/measure/service.vue | 2 +- 32 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index 0dfb0ccef..a083839a6 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -62,7 +62,7 @@ {{ $sensitive(formData.principalContact, 3, 7) }}
- 服务方： + 服务组织： {{ formData.principalName }}
diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue index ef98fc2a1..07c0088e5 100644 --- a/src/views/dataBoard/renfang/resi/classNew.vue +++ b/src/views/dataBoard/renfang/resi/classNew.vue @@ -195,7 +195,7 @@ type="text" v-model="searchParams.serviceOrgName" :clearable="true" - placeholder="请输入服务方名称" + placeholder="请输入服务组织名称" @blur="changeFwfmc" />
@@ -641,7 +641,7 @@ export default { ) { setTimeout(() => { this.searchParams = { - serviceOrgName: null, // 服务方名称 + serviceOrgName: null, // 服务组织名称 }; this.oldValsss = null; }, 200); @@ -691,7 +691,7 @@ export default { "服务事项", "来源", "服务时间", - "服务方", + "服务组织", "服务人数", "操作", ]; diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue index ff912d49f..6e2207c5b 100644 --- a/src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue +++ b/src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue @@ -132,7 +132,7 @@
-
指派给服务方：
+
指派给服务组织：
{{ item.serverName }} （{{ item.serviceType === 'volunteer' ? '志愿者' : @@ -147,7 +147,7 @@
-
服务方：
+
服务组织：
{{ item.serviceParty }}
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue index f26343913..d466e8df0 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue @@ -104,7 +104,7 @@ - +