From 34661eefdd339840f643248d0439590e3699e54f Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 10:30:42 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuceng/yingji/zizuzhi/addForm.vue | 24 ++++++++++++++--- .../tuceng/yingji/zizuzhi/index.vue | 26 +++++++++++++------ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index f1cb3a2af..4070eb944 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -69,7 +69,9 @@ - + + + @@ -128,7 +130,7 @@ - + {{ formData.organizationName }} @@ -161,7 +163,7 @@ {{ formData.organizationCreatedTime }} - + {{ formData.address }} @@ -243,6 +245,7 @@ export default { gridList: [], //所属网格list--场所区域 placeTypeList: [], //场所类型 list: {}, + serviceList:[], formData: { organizationName: '', categoryCode: '', @@ -293,6 +296,7 @@ export default { this.startLoading(); this.getVolunteerList(); this.loadplaceType(); + this.loadserviceList(); // this.loadGrid(); // this.loadplaceType(); if (this.pageType != 'add') { @@ -305,6 +309,18 @@ 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); + } + }, querySearchVolunteer(queryString, cb) { const { volunteerList } = this; var results = queryString @@ -376,7 +392,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/safetyEquipment/detail/${this.detailId}`; + const url = `/actual/base/iccommunityselforganization/community-self-org-detail/${this.detailId}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue index f28439364..8c189557b 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue @@ -9,6 +9,7 @@ - + @@ -71,9 +72,9 @@ @@ -353,8 +354,8 @@ export default { }); }, handleAdd(row, type) { - if (row.equipmentId) { - this.detailId = row.equipmentId; + if (row.orgId) { + this.detailId = row.orgId; } this.pageType = type; if (type == 'view') { @@ -388,7 +389,7 @@ export default { type: 'warning' }) .then(() => { - this.del(rowData.equipmentId); + this.del(rowData.orgId); }) .catch(err => {}); }, @@ -407,6 +408,15 @@ export default { const url = '/actual/base/iccommunityselforganization/communityselforganizationlist'; // const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list'; const { pageSize, pageNo, formData } = this; + + if (Array.isArray(formData.createTime) && formData.createTime.length == 2) { + formData.startTime = formData.createTime[0]; + formData.endTime = formData.createTime[1]; + } else { + formData.startTime = ''; + formData.endTime = ''; + } + const { data, code, msg } = await requestPost(url, { pageSize, pageNo, From 929df026200181ad05f6061154b21255ed349a07 Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 10:54:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuceng/yingji/zizuzhi/addForm.vue | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 4070eb944..c6913e5b3 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -68,8 +68,8 @@ - - + + @@ -152,7 +152,7 @@ - {{ formData.serviceItem }} + {{ formData.serviceMatterList }} {{ formData.principalName }} @@ -249,7 +249,7 @@ export default { formData: { organizationName: '', categoryCode: '', - serviceItem: '', + serviceMatterList: [], organizationPersonCount: '', principalName: '', principalPhone: '', @@ -272,7 +272,7 @@ export default { ], categoryCode: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }], organizationPersonCount: [{ required: true, message: '组织人数不能为空', trigger: 'blur' }], - serviceItem: [{ required: true, message: '服务事项不能为空', trigger: 'blur' }], + serviceMatterList: [{ required: true, message: '服务事项不能为空', trigger: 'blur' }], principalName: [{ required: true, message: '负责人不能为空', trigger: 'blur' }], principalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }], address: [{ required: true, message: '地址不能为空', trigger: 'blur' }] @@ -451,23 +451,24 @@ export default { }, async save() { - let url = ''; - if (this.formType === 'add') { - url = '/actual/base/iccommunityselforganization/addcommunityselforganization'; - } else { - url = '/actual/base/iccommunityselforganization/editcommunityselforganization'; - // this.dataForm.orgId = this.orgId; - } console.log('this.', this.formData); - let params = { ...this.formData }; - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { - this.$message.success('添加成功'); - this.resetData(); - this.handleCancle(); - } else if (code >= 8000) { - this.$message.error(msg); - } + // let url = ''; + // if (this.formType === 'add') { + // url = '/actual/base/iccommunityselforganization/addcommunityselforganization'; + // } else { + // url = '/actual/base/iccommunityselforganization/editcommunityselforganization'; + // // this.dataForm.orgId = this.orgId; + // } + + // let params = { ...this.formData }; + // const { data, code, msg } = await requestPost(url, params); + // if (code === 0) { + // this.$message.success('添加成功'); + // this.resetData(); + // this.handleCancle(); + // } else if (code >= 8000) { + // this.$message.error(msg); + // } }, handleCancle() { this.resetData(); From 79dd564bab56139fdb02875e703818baedc01a73 Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 11:05:47 +0800 Subject: [PATCH 3/9] 1 --- .../tuceng/yingji/zizuzhi/addForm.vue | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index c6913e5b3..fb50f467d 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -152,7 +152,7 @@ - {{ formData.serviceMatterList }} + {{ formData.serviceItem }} {{ formData.principalName }} @@ -452,23 +452,23 @@ export default { async save() { console.log('this.', this.formData); - // let url = ''; - // if (this.formType === 'add') { - // url = '/actual/base/iccommunityselforganization/addcommunityselforganization'; - // } else { - // url = '/actual/base/iccommunityselforganization/editcommunityselforganization'; - // // this.dataForm.orgId = this.orgId; - // } + let url = ''; + if (this.formType === 'add') { + url = '/actual/base/iccommunityselforganization/addcommunityselforganization'; + } else { + url = '/actual/base/iccommunityselforganization/editcommunityselforganization'; + // this.dataForm.orgId = this.orgId; + } - // let params = { ...this.formData }; - // const { data, code, msg } = await requestPost(url, params); - // if (code === 0) { - // this.$message.success('添加成功'); - // this.resetData(); - // this.handleCancle(); - // } else if (code >= 8000) { - // this.$message.error(msg); - // } + let params = { ...this.formData }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.$message.success('添加成功'); + this.resetData(); + this.handleCancle(); + } else if (code >= 8000) { + this.$message.error(msg); + } }, handleCancle() { this.resetData(); From 1588ba8f5dad8e19b21f711418be738cee70b34b Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 11:24:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=87=AA=E7=BB=84=E7=BB=87=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8A=9F=E8=83=BD=E5=A5=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuceng/yingji/zizuzhi/addForm.vue | 50 ++++++++++--------- .../tuceng/yingji/zizuzhi/index.vue | 3 +- .../tuceng/yingji/zizuzhi/scoreRecord.vue | 22 +++++--- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index fb50f467d..9d4d55ac3 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -34,6 +34,22 @@ > + + + + + + + + + + + + + + + +
@@ -67,28 +83,13 @@
- - - + + + - - - - - - - - - - - - - - - + @@ -126,7 +127,7 @@ - + diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue index aebaeef8e..83688eabb 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue @@ -100,14 +100,9 @@ export default { type: Boolean, default: '' }, - detailId: { type: String, default: '' - }, - serviceType: { - type: String, - default: '' } }, async created() {}, @@ -130,19 +125,30 @@ export default { handleSearch() { this.loadTable(); }, - + // \ + // 社区自组织的积分记录，与原来一样；原来接口调用的/heart/userdemand/recordList + // 现在改为： + // /governance/userdemand/recordList + // { + // "serviceType": "community_org", //前端写死此值 + // "serviceId": "当前社区自组织组织id", + // "pageSize": 10, + // "pageNo": 1, + // "startTime": "2023-02-28 00:00:00",// 用户所选拼接00:00:00 + // "endTime": "2023-03-31 23:59:59" // 拼接23:59:59 + // } async loadTable() { this.tableLoading = true; const url = '/governance/userdemand/recordList'; // const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList" let params = { - serviceType: this.serviceType, + serviceType: 'community_org', serviceId: this.detailId, pageSize: this.pageSize, pageNo: this.pageNo, ...this.formData }; - + console.log("params",params); const { data, code, msg } = await requestPost(url, params); if (code === 0) { From f8c6c1c70fef02e8c14add714d5c2cbeedbc6f83 Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 11:26:43 +0800 Subject: [PATCH 5/9] 1 --- .../tuceng/yingji/zizuzhi/addForm.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 9d4d55ac3..58b7510ad 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -140,7 +140,17 @@ {{ formData.organizationPersonCount }} + + {{ formData.principalName }} + + + {{ formData.principalPhone }} + + + {{ formData.organizationCreatedTime }} + +
@@ -152,18 +162,9 @@
- + {{ formData.serviceItem }} - - {{ formData.principalName }} - - - {{ formData.principalPhone }} - - - {{ formData.organizationCreatedTime }} - {{ formData.address }} From fe51e5665912247a027a579d957ea996bda802ff Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 11:26:47 +0800 Subject: [PATCH 6/9] 1 --- src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue index 57b0739a5..0c40f01bf 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue @@ -59,7 +59,7 @@ - + From 9eaa7b6bc3a44e581b4d3d10f9c043d2092e8c8b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 31 Mar 2023 12:06:28 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E7=99=BB=E8=AE=B0,?= =?UTF-8?q?=E8=BF=81=E5=87=BA=E7=99=BB=E8=AE=B0=E6=97=B6=E9=97=B4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiChangeTransfer.vue | 9 +++++++++ src/views/modules/plugins/change/resideathAdd.vue | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 5f4f32abf..b30cf0032 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -20,6 +20,7 @@ {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now() + return time.getTime() > nowData + } return { btnDisable: false, communityList: [], @@ -214,6 +219,10 @@ export default { welfareFlag: false, }, + startPickerOptions: { + disabledDate: startDisabledDate + }, + customerId: "", //客户id userId: "", //操作人员id gridName: "", diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue index c3d1453b0..f202ecc9a 100644 --- a/src/views/modules/plugins/change/resideathAdd.vue +++ b/src/views/modules/plugins/change/resideathAdd.vue @@ -22,6 +22,7 @@ {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now() + return time.getTime() > nowData + } return { btnDisable: false, @@ -85,6 +90,10 @@ export default { deathReason: "", deathDate: "", }, + + startPickerOptions: { + disabledDate: startDisabledDate + }, }; }, components: {}, From 7c304dda3c7cb346781a96e06146befb28b3b369 Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 12:27:43 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue index 83688eabb..594ea9e69 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue @@ -73,7 +73,7 @@ export default { totalPoint: 100, total: 0, pageSize: 10, - pageNo: 0, + pageNo: 1, tableLoading: false, serviceId: '', From 023e8d87cf0d5b383e7ea68c48adfe6758f982a5 Mon Sep 17 00:00:00 2001 From: tianq Date: Fri, 31 Mar 2023 13:37:12 +0800 Subject: [PATCH 9/9] bug --- src/views/dataBoard/sida/cpts/sqpj.vue | 13 +++++++------ .../shequzhili/tuceng/yingji/zizuzhi/addForm.vue | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/dataBoard/sida/cpts/sqpj.vue b/src/views/dataBoard/sida/cpts/sqpj.vue index 6bc0a9cb9..815d18587 100644 --- a/src/views/dataBoard/sida/cpts/sqpj.vue +++ b/src/views/dataBoard/sida/cpts/sqpj.vue @@ -100,10 +100,10 @@ export default { }, methods: { async init() { - // if (this.orgId) { - // await this.getResiCategoryData(); - // this.getPie(); - // } + if (this.orgId) { + await this.getResiCategoryData(); + this.getPie(); + } }, handleClickItem(item) { @@ -120,6 +120,7 @@ export default { }, async getResiCategoryData() { + let url = ''; if (this.currentTab == '满意度') { url = 'satis_eval_view'; @@ -131,7 +132,7 @@ export default { // 烦心度 url = 'upset_eval_view'; } - + const { data, code, msg } = await requestPostBi( url, { @@ -142,7 +143,7 @@ export default { } }, { - // mockId: 60031937, + mockId: 66906114, } ); if (code === 0) { diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 58b7510ad..34f1114a9 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -140,7 +140,7 @@ {{ formData.organizationPersonCount }} - + {{ formData.principalName }} @@ -399,6 +399,7 @@ export default { const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); + data.categoryList = data.categoryList.map(item => item.categoryCode); this.formData = { ...data }; this.initMap();