diff --git a/src/views/modules/peopleOpinons/cpts/eventDetail.vue b/src/views/modules/peopleOpinons/cpts/eventDetail.vue index bfd565dff..3535705e9 100644 --- a/src/views/modules/peopleOpinons/cpts/eventDetail.vue +++ b/src/views/modules/peopleOpinons/cpts/eventDetail.vue @@ -7,7 +7,7 @@
-
+
上报时间： - {{ info.happenTime }} + {{ info.submitTime }}
征集领域： - {{ info.eventContent }} + {{ info.typeCode }}
是否愿意公开： - {{ info.eventContent }} + + {{info.eventContent==1?'是':'否'}}
意见标题： - {{ info.eventContent }} + {{ info.subjectTitle }}
选为"金点子"建议: - {{ info.markTypeName || "--" }} + + + +
-
办理前： -
-
@@ -248,6 +255,9 @@ export default { }, methods: { + sendValue(){ + this.$emit('update-value', this.info); // 触发事件并传递值 + }, watchImg(src) { window.open(src); }, diff --git a/src/views/modules/peopleOpinons/cpts/eventInfo.vue b/src/views/modules/peopleOpinons/cpts/eventInfo.vue index 5e293d92c..0250c4410 100644 --- a/src/views/modules/peopleOpinons/cpts/eventInfo.vue +++ b/src/views/modules/peopleOpinons/cpts/eventInfo.vue @@ -9,7 +9,7 @@
-
@@ -283,9 +283,10 @@ function iniData() { issuePageType: "", issueDetailData: {}, sourceType: "", - + goldenIdeaFlag:'', level: '', replayDetailObj:{}, + newgoldList:{} }; } export default { @@ -355,7 +356,16 @@ export default { }, methods: { - + handleValue(val) { + console.log(val,"ds;lfk;dfl "); + this.newgoldList=val + if (val.goldenIdeaFlag) { + this.goldenIdeaFlag=1 + }else{ + this.goldenIdeaFlag=0 + } + + }, changeName(val) { this.demandUserName = val; }, @@ -420,12 +430,14 @@ export default { async handelDispose() { console.log("handelDispose......"); console.log("okflag:"+this.$refs.ref_processinfo_dispose.okflag); + this.$refs.ref_processinfo_dispose.getProcessInfo(); if (this.$refs.ref_processinfo_dispose.okflag) { this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo; this.replayInfo.icEventId = this.eventId; - await this.submitDispose('/governance/icEvent/reply', this.replayInfo); + await this.submitDispose('/governance/icEventOld/reply', this.replayInfo); + } else { return false; } @@ -436,6 +448,7 @@ export default { ...params, }); if (code === 0) { + await this.icEventOldupdate('/governance/icEventOld/update') this.$message.success("操作成功！"); this.$emit("handleOk"); @@ -444,6 +457,19 @@ export default { } }, + async icEventOldupdate(url) { + console.log("sdfl;sdm.fm ",this.eventId); + + const params={ + goldenIdeaFlag:this.goldenIdeaFlag, + id:this.newgoldList.icEventId + } + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + } else { + this.$message.error(msg); + } + }, handleClose() { if (this.pageTypeCopy === "add") { this.eventInfo = this.$refs.ref_add.resetData(); diff --git a/src/views/modules/peopleOpinons/opinionsDaily.vue b/src/views/modules/peopleOpinons/opinionsDaily.vue index b1068c2b8..8bc04a6d2 100644 --- a/src/views/modules/peopleOpinons/opinionsDaily.vue +++ b/src/views/modules/peopleOpinons/opinionsDaily.vue @@ -78,47 +78,24 @@
导出 - - - - - - +
- + - - + - + @@ -137,27 +114,27 @@ --> - - - @@ -354,19 +331,17 @@ export default { {label:'违章停车',value:'1'} ], formData: { - agencyId: "", - gridId:"", - sourceType: "", - eventContent: "", + demandType: "", name: "", mobile: "", - startTime: "", - endTime: "", - status: "", - firstIdList: [], - secondIdList: [], - openFlag:null, - keyProblem:'' + eventContent: "", + operationType: 4, + openFlag: "", + specialSubjectId: "", + subjectTitle: "", + goldenIdeaFlag: "", + agencyId: "", + clientType: "web" }, cateOptions: [], optionProps: { @@ -423,8 +398,8 @@ export default { mounted() { this.user = this.$store.state.user; this.agencyId = this.user.agencyId; - this.getOrgTreeList() - this.getGridList() + // this.getOrgTreeList() + // this.getGridList() this.getTableData(); this.getCateOptions(); }, @@ -618,7 +593,7 @@ export default { async handleDispose(row,type) { // this.eventDetailData = { ...data }; // this.pageType = type - this.eventId = "1855782512757325825"; + this.eventId = row.icEventId; const url = "/governance/icEventOld/detail"; const { data, code, msg } = await requestPost(url, { icEventId: this.eventId, @@ -694,24 +669,24 @@ export default { }, async getTableData() { - const url = "/governance/icEventOld/list"; + const url = "/governance/icEventOld/ideaList"; console.log(this.formData,"formData"); - if (this.eventTypeCheck) { - this.formData.secondIdList = this.eventTypeCheck - } - // 处理 agencyId - if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) { - if(this.level=="grid"){ - this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1]; - this.formData.agencyId = ""; - }else{ - this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1]; - this.formData.gridId = ""; - } - } else { - this.formData.agencyId = ""; - this.formData.gridId = ""; - } + // if (this.eventTypeCheck) { + // this.formData.secondIdList = this.eventTypeCheck + // } + // // 处理 agencyId + // if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) { + // if(this.level=="grid"){ + // this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1]; + // this.formData.agencyId = ""; + // }else{ + // this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1]; + // this.formData.gridId = ""; + // } + // } else { + // this.formData.agencyId = ""; + // this.formData.gridId = ""; + // } const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { @@ -726,19 +701,6 @@ export default { return item; }) : []; - - // this.tableData.forEach(item => { - // if (item.operationType === '2') { - // item.operationTypeShow = '已转服务' - // } - // if (item.operationType === '1') { - // item.operationTypeShow = '已立项' - // } - // if (item.operationType === '0') { - // item.operationTypeShow = '已回复' - // } - - // }); } else { this.$message.error(msg); } diff --git a/src/views/modules/workPc/guidance/add.vue b/src/views/modules/workPc/guidance/add.vue index 5b4225a6c..6686b07a6 100644 --- a/src/views/modules/workPc/guidance/add.vue +++ b/src/views/modules/workPc/guidance/add.vue @@ -121,14 +121,15 @@ export default { keyWords: '', activityId: '', formData: { - title: "",//标题 - content: "",//内容 - tagId: "",//标签id + orgId: "",//发布组织 + categoryCode: "",//栏目分类 + title: "",//文章标题 coverPic: "",//封面图 - releaseTime: "",//发布时间 + activeName: "",//发布内容 sendMsg: false,//是否推送 top: 1,//是否置顶 - status: 0 //状态 + status: 0, //状态 + attachmentList:[] }, serviceList: [], // gridList: [], diff --git a/src/views/modules/workPc/guidance/addForm.vue b/src/views/modules/workPc/guidance/addForm.vue index 3052db9bc..8324debf0 100644 --- a/src/views/modules/workPc/guidance/addForm.vue +++ b/src/views/modules/workPc/guidance/addForm.vue @@ -472,7 +472,6 @@ export default { if (res.code === 0 && res.msg === 'success') { const array = file.name.split('.') const fileType = array[array.length - 1] - file.url = res.data.url file.type = fileType this.fileList.push(file)