From ea22ed243cd78d4b2d8462d4c8b1578392f1cf85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 10 Jul 2024 14:05:28 +0800 Subject: [PATCH 1/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/comPromotion/add.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index f174a2f67..6c7c0a82b 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -171,7 +171,6 @@ export default { } this.formType=typeid - console.log(this.formData,"5164"); this.endLoading(); this.setDefaultReleaseTime() @@ -259,7 +258,7 @@ export default { this.$refs['ref_form'].validate((valid, messageObj) => { this.formData.agencyName= this.agencyName this.formData.agencyId= this.agencyId - this.formData.status= 1 + this.formData.status= 0 console.log("this.formData看看里面村的什么",this.formData) if (!valid) { app.util.validateRule(messageObj) @@ -275,6 +274,7 @@ export default { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 + console.log(this.formData.top); console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { From a6a51bb745d62d7514826b4a80c5446da0769ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 11 Jul 2024 18:27:29 +0800 Subject: [PATCH 2/9] 1111 --- .../communityParty/activity/eventDetails.vue | 2 +- .../communityParty/comPromotion/add.vue | 4 ++-- .../modules/shequzhili/eventOld/eventList.vue | 19 ++++++++++++++----- .../modules/workSys/promotionTab/index.vue | 7 +------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index d2337b8da..8a4608523 100644 --- a/src/views/modules/communityParty/activity/eventDetails.vue +++ b/src/views/modules/communityParty/activity/eventDetails.vue @@ -92,7 +92,7 @@ -
+
报名名单
diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 6c7c0a82b..f174a2f67 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -171,6 +171,7 @@ export default { } this.formType=typeid + console.log(this.formData,"5164"); this.endLoading(); this.setDefaultReleaseTime() @@ -258,7 +259,7 @@ export default { this.$refs['ref_form'].validate((valid, messageObj) => { this.formData.agencyName= this.agencyName this.formData.agencyId= this.agencyId - this.formData.status= 0 + this.formData.status= 1 console.log("this.formData看看里面村的什么",this.formData) if (!valid) { app.util.validateRule(messageObj) @@ -274,7 +275,6 @@ export default { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 - console.log(this.formData.top); console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index ad7e86dad..8789de5ea 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -220,7 +220,9 @@ " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价 查看 删除 - 开启表决 + {{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}} + + @@ -641,16 +643,23 @@ export default { this.getTableData(); }, async handleVote(row){ - const url = "/governance/icEventOld/reply"; + const url = "/governance/icEventOld/updateSpecialColumn"; let params = { - conten:row.eventContent, + icEventId:row.icEventId, openFlag:row.openFlag==1?0:1, - operationType:"operationType" + } const { data, code, msg } = await requestPost(url, params); - console.log(data); + + if (code === 0) { + this.$message.success("操作成功！"); + this.getTableData(); + } else { + this.$message.error("操作失败！"); + } + }, async handleDel(rowData) { let message = "确认删除?"; diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 0188cdba4..53b534aa2 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -29,12 +29,7 @@ - - - - + From 53d7f4cb9711d54b10ad2d44b681e5703f22d4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 12 Jul 2024 11:00:05 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=A3=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/comPromotion/add.vue | 15 ++++++++++----- .../workSys/promotionTab/AddpromotionTab.vue | 3 +++ src/views/modules/workSys/promotionTab/index.vue | 12 +++++++++++- .../workSys/promotionTab/viewPromotionalTags.vue | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index f174a2f67..266fe891f 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -115,8 +115,8 @@ export default { coverPic: "",//封面图 releaseTime: "",//发布时间 sendMsg: false,//是否推送 - top: false,//是否置顶 - status: 0 //状态 + top: 0,//是否置顶 + status: 1 //状态 }, serviceList: [], // gridList: [], @@ -171,10 +171,13 @@ export default { } this.formType=typeid - - console.log(this.formData,"5164"); + console.log(typeid); + console.log(this.formType,"5164"); this.endLoading(); - this.setDefaultReleaseTime() + if(typeid=="add"){ + this.setDefaultReleaseTime() + } + }, async advertisingTag () { const url = "/actual/base/advertisingTag/page" @@ -275,6 +278,7 @@ export default { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 + this.formData.status=0 console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { @@ -295,6 +299,7 @@ export default { console.log(this.formData,"formData"); this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 + const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue index 1d04b7d2f..22f03e2da 100644 --- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue +++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue @@ -11,6 +11,9 @@
+ + +
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 53b534aa2..f3482934e 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -7,7 +7,12 @@ - + + + + + +
查询 @@ -29,6 +34,11 @@ + + + diff --git a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue index 0f862660d..88e2fe4d1 100644 --- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue +++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue @@ -8,6 +8,9 @@ {{ tagName }}
+ + + From 0796a318f7d1b76618ea0742250a5330009ff103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 12 Jul 2024 11:00:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=A3=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/promotionTab/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index f3482934e..89b21fe2b 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -39,6 +39,11 @@ {{ scope.row.status === 1 ? '显示' : '关闭' }} + + + From d07e181b70ef13f749b8f4b079e4b98cafd90733 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 11 Jul 2024 18:43:28 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=A3=E4=BC=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/comPromotion/add.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 266fe891f..3e07aaeb1 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -37,7 +37,7 @@ - + @@ -92,7 +92,7 @@ export default { adverTagList:[], ////// top:false, - fileList: {},//封面图片 + fileList: [],//封面图片 activityImgs:[],//活动照片 formType: 'add', //表单操作类型 add新增，edit编辑,records记录 // records:false, @@ -115,8 +115,8 @@ export default { coverPic: "",//封面图 releaseTime: "",//发布时间 sendMsg: false,//是否推送 - top: 0,//是否置顶 - status: 1 //状态 + top: 1,//是否置顶 + status: 0 //状态 }, serviceList: [], // gridList: [], @@ -167,7 +167,8 @@ export default { this.startLoading(); if(row!=null){ this.formData = JSON.parse(JSON.stringify(row)); - console.log(this.formData.coverPic); + this.fileList.push({fileUrl:this.formData.coverPic}) + console.log(this.formData.coverPic,'see'); } this.formType=typeid From 3daf72bd0f02d09deb2f638e1e53b10767aaf9d0 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 18 Jul 2024 15:33:02 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=BD=AC=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eventOld/cpts/process-form-demand.vue | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) 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 27e2ed482..5768a7eec 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue @@ -24,7 +24,7 @@ prop="categoryCode">
-
@@ -363,9 +363,8 @@ export default { // } // }, async getDemandOptions() { - const url = "/governance/icresidemanddict/demandoption" - let params = {} - const { data, code, msg } = await requestPost(url, params) + const url = "/actual/base/serviceitem/listAllCategory" + const { data, code, msg } = await requestPost(url) if (code === 0) { this.demandOptions = this.getFlagData( this.getTreeData(data), @@ -391,10 +390,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 }; } @@ -406,8 +405,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) @@ -432,11 +431,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, + serverOrgCategoryCode: this.formData.categoryCode[1], serverOrgType: val, - businessType: "resi_service", + serverParentOrgCategoryCode:this.formData.categoryCode[0], }; let { data, code, msg } = await requestPost(url, params); if (code == 0) { From be5a7e3506b3b004083222dc17727fe34e8361e4 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 18 Jul 2024 16:10:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0openId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index b9caadb68..d4dbcfde6 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -538,7 +538,8 @@ export default { } this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo; this.replayInfo.icEventId = this.eventId; - this.replayInfo.openFlag = null + this.replayInfo.openFlag = null; + this.replayInfo.openId = this.eventDetailCopy.openId; //回复属性赋值 let url = "/governance/icEventOld/reply"; await this.submitDispose(url, this.replayInfo); From 4059b17aba380cf2b3d153a945626df3009ef97e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 18 Jul 2024 17:05:33 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BD=91=E6=A0=BCId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/eventOld/cpts/event-detail.vue | 2 +- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index d23be1520..ef8eb445d 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -12,7 +12,7 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index d4dbcfde6..b3d32f8e2 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -40,7 +40,7 @@
+ @handleToIssue="handleToIssue" @handleClose="handleClose" @handelCLickGridId="handelCLickGridId">
@@ -523,7 +523,9 @@ export default { this.$message.error("请选择处理方式!"); } }, - + handelCLickGridId(val){ + this.grid = val.value; + }, async handelDispose() { this.$refs.ref_processinfo_dispose.getProcessInfo(); if (this.$refs.ref_processinfo_dispose.okflag) { @@ -540,6 +542,7 @@ export default { this.replayInfo.icEventId = this.eventId; this.replayInfo.openFlag = null; this.replayInfo.openId = this.eventDetailCopy.openId; + this.replayInfo.grid = this.grid; //回复属性赋值 let url = "/governance/icEventOld/reply"; await this.submitDispose(url, this.replayInfo); From 2c353a908d1f9aff81592f2d3a9bb6a57b465664 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 18 Jul 2024 17:35:12 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=AD=97=E6=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index b3d32f8e2..ca929bc52 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -542,7 +542,7 @@ export default { this.replayInfo.icEventId = this.eventId; this.replayInfo.openFlag = null; this.replayInfo.openId = this.eventDetailCopy.openId; - this.replayInfo.grid = this.grid; + this.replayInfo.gridId = this.grid; //回复属性赋值 let url = "/governance/icEventOld/reply"; await this.submitDispose(url, this.replayInfo);