From 66482688806d0aa154ed20adeac83822cd219c73 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/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoardMain/main-navbar.vue | 4 +++- .../communityParty/comPromotion/add.vue | 19 +++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue index 352d12627..8f8f5c7a7 100644 --- a/src/views/dataBoardMain/main-navbar.vue +++ b/src/views/dataBoardMain/main-navbar.vue @@ -220,12 +220,12 @@ export default { params = { orgId: this.value, level: this.getChooseLabel(this.value) }; } this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => { - console.log(data); this.value = data.id; this.$store.dispatch("chooseArea/chooseName", { orgId: data.id, level: data.level, }); + console.log(children,data,"children"); let children = await this.dealTreeData(data.children); if (data.parentId) { this.options = [ @@ -260,9 +260,11 @@ export default { label: item.name, children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null, })); + console.log(data,"sdffs"); return data; }, setSelectName(index) { + console.log(index,"index"); const name = this.options.filter((item) => item.value === index)[0].label; const width = name.length > 5 ? name.length * 14 + 25 : 120; this.selectWidth = width; diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 6fa41a38e..4f3707620 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -37,7 +37,7 @@ - + @@ -115,8 +115,8 @@ export default { coverPic: "",//封面图 releaseTime: "",//发布时间 sendMsg: false,//是否推送 - top: 0,//是否置顶 - status: 1 //状态 + top: false,//是否置顶 + status: 0 //状态 }, serviceList: [], // gridList: [], @@ -172,13 +172,9 @@ export default { } this.formType=typeid - console.log(typeid); - console.log(this.formType,"5164"); + console.log(this.formData,"5164"); this.endLoading(); - if(typeid=="add"){ - this.setDefaultReleaseTime() - } - + this.setDefaultReleaseTime() }, async advertisingTag () { const url = "/actual/base/advertisingTag/page" @@ -263,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= 1 + this.formData.status= 0 console.log("this.formData看看里面村的什么",this.formData) if (!valid) { app.util.validateRule(messageObj) @@ -279,7 +275,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.top); console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { @@ -300,7 +296,6 @@ 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({ From 17a55e667a90ee65bd2189c02011541f0dfc0734 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, 17 Jul 2024 15:43:36 +0800 Subject: [PATCH 2/6] bug --- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 7 ++++++- .../modules/shequzhili/eventOld/cpts/process-form.vue | 4 ++++ src/views/modules/workSys/promotionTab/AddpromotionTab.vue | 7 ++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 06d5258d2..0e9c29939 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -529,7 +529,11 @@ export default { }, async handelDispose() { - this.$refs.ref_processinfo_dispose.getProcessInfo(); + console.log(this.formData.operationType); + console.log(this.formData.openFlag); + this.$refs.ref_processinfo_dispose.getProcessInfo(); + console.log(this.$refs.ref_processinfo_add.formData.openFlag); + this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag; if (this.$refs.ref_processinfo_dispose.okflag) { this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; if (this.formData.operationType === "0" || this.formData.operationType === '5' @@ -587,6 +591,7 @@ export default { } }, async submitDispose(url, params) { + params.openFlag=this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag; console.log(params); const { data, code, msg } = await requestPost(url, { ...params, diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue index 634d43b39..099566c26 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue @@ -13,6 +13,10 @@ 转服务 + + +
- - - + + From ce768c1a838d7b103bdda3f8af897d1802af33cf 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 16:53:12 +0800 Subject: [PATCH 3/6] 1 --- .../communityParty/activity/eventDetails.vue | 2 +- .../shequzhili/eventOld/cpts/event-info.vue | 7 +------ .../shequzhili/eventOld/cpts/process-form.vue | 4 ---- .../modules/shequzhili/eventOld/eventList.vue | 19 +++++-------------- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index 8a4608523..d2337b8da 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/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 0e9c29939..06d5258d2 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -529,11 +529,7 @@ export default { }, async handelDispose() { - console.log(this.formData.operationType); - console.log(this.formData.openFlag); - this.$refs.ref_processinfo_dispose.getProcessInfo(); - console.log(this.$refs.ref_processinfo_add.formData.openFlag); - this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag; + this.$refs.ref_processinfo_dispose.getProcessInfo(); if (this.$refs.ref_processinfo_dispose.okflag) { this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; if (this.formData.operationType === "0" || this.formData.operationType === '5' @@ -591,7 +587,6 @@ export default { } }, async submitDispose(url, params) { - params.openFlag=this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag; console.log(params); const { data, code, msg } = await requestPost(url, { ...params, diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue index 099566c26..634d43b39 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue @@ -13,10 +13,6 @@ 转服务 - - -
去评价 查看 删除 - {{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}} - - + 开启表决 @@ -643,23 +641,16 @@ export default { this.getTableData(); }, async handleVote(row){ - const url = "/governance/icEventOld/updateSpecialColumn"; + const url = "/governance/icEventOld/reply"; let params = { - + conten:row.eventContent, icEventId:row.icEventId, openFlag:row.openFlag==1?0:1, - + operationType:"operationType" } const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success("操作成功！"); - this.getTableData(); - } else { - this.$message.error("操作失败！"); - } - + console.log(data); }, async handleDel(rowData) { let message = "确认删除?"; From 5263f3ea459cdcafe7be258893d52bc60ff793fc 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 4/6] 1111 --- .../communityParty/activity/eventDetails.vue | 2 +- .../communityParty/comPromotion/add.vue | 9 ++++----- .../modules/shequzhili/eventOld/eventList.vue | 19 ++++++++++++++----- .../workSys/promotionTab/AddpromotionTab.vue | 4 ---- .../modules/workSys/promotionTab/index.vue | 14 ++------------ .../promotionTab/viewPromotionalTags.vue | 3 --- 6 files changed, 21 insertions(+), 30 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 4f3707620..f174a2f67 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -92,7 +92,7 @@ export default { adverTagList:[], ////// top:false, - fileList: [],//封面图片 + fileList: {},//封面图片 activityImgs:[],//活动照片 formType: 'add', //表单操作类型 add新增，edit编辑,records记录 // records:false, @@ -167,11 +167,11 @@ export default { this.startLoading(); if(row!=null){ this.formData = JSON.parse(JSON.stringify(row)); - this.fileList.push({fileUrl:this.formData.coverPic}) - console.log(this.formData.coverPic,'see'); + console.log(this.formData.coverPic); } this.formType=typeid + console.log(this.formData,"5164"); this.endLoading(); this.setDefaultReleaseTime() @@ -259,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) @@ -275,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/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue index bbcd4c6d5..1d04b7d2f 100644 --- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue +++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue @@ -11,10 +11,6 @@
- -
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 1a804284d..53b534aa2 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -7,12 +7,7 @@ - - - - - - +
查询 @@ -34,12 +29,7 @@ - - - - + diff --git a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue index 88e2fe4d1..0f862660d 100644 --- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue +++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue @@ -8,9 +8,6 @@ {{ tagName }}
- - -
From 2495c44e3431a26884db793e8b711ac1f2e55a57 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 16:53:12 +0800 Subject: [PATCH 5/6] 1111 --- .../communityParty/activity/eventDetails.vue | 2 +- .../modules/shequzhili/eventOld/eventList.vue | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index 8a4608523..d2337b8da 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/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index 8789de5ea..ad7e86dad 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -220,9 +220,7 @@ " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价 查看 删除 - {{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}} - - + 开启表决 @@ -643,23 +641,16 @@ export default { this.getTableData(); }, async handleVote(row){ - const url = "/governance/icEventOld/updateSpecialColumn"; + const url = "/governance/icEventOld/reply"; let params = { - + conten:row.eventContent, icEventId:row.icEventId, openFlag:row.openFlag==1?0:1, - + operationType:"operationType" } const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success("操作成功！"); - this.getTableData(); - } else { - this.$message.error("操作失败！"); - } - + console.log(data); }, async handleDel(rowData) { let message = "确认删除?"; From c0cc5fb73572f7a5e5293607279a89dfd0d11c9e 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: Tue, 16 Jul 2024 13:30:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/promotionTab/index.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 53b534aa2..0188cdba4 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -29,7 +29,12 @@ - + + + +