diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index cb97b636..eddc90d5 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -56,6 +56,10 @@ .g-page { display: flex; + width:100%; + .g-total{ + width:100%; + } .g-left { box-sizing: border-box; width: 65%; diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index d3d65609..cf5a7573 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -31,7 +31,7 @@
-
+
0) { + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.project.categoryList[0].id) + } + console.log('projectInfo', this.project) } else if (this.formData.operationType === '2') { this.replayInfo = {} this.project = {} this.demand = this.$refs.ref_processinfo_add.demand + //需求的属性同事件一样 - this.demand.gridId = this.eventInfoData.gridId - this.demand.reportUserName = this.eventInfoData.name//上报人姓名同需求上报人姓名 - this.demand.reportUserMobile = this.eventInfoData.mobile//上报人手机号同需求上报人手机号 - this.demand.reportTime = this.eventInfoData.happenTime//上报时间 + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.demand.categoryId) console.log('demond', this.demand) } @@ -413,7 +420,7 @@ export default { } console.log('this.formData', this.formData) - await this.submit() + // await this.submit() }, async submit () { diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index b9b0ed97..8458cdc4 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -363,6 +363,10 @@ export default { this.formData.reportUserName = this.eventDetailCopy.name this.formData.reportTime = this.eventDetailCopy.happenTime this.formData.gridId = this.eventDetailCopy.gridId + this.formData.demandUserId = this.eventDetailCopy.reportUserId + this.formData.demandUserName = this.eventDetailCopy.name + this.formData.demandUserMobile = this.eventDetailCopy.mobile + if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { this.selCategoryArray = [] this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId) @@ -525,10 +529,9 @@ export default { this.$refs["ref_form"].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj); - + // this.formData.categoryId = this.selCateObj.id } else { - this.okflag = true } }); diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 09bf4e10..cee63d86 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -440,7 +440,7 @@ export default { }, async handleExport () { - const url = "/epmetuser/icBirthRecord/export"; + const url = "/gov/project/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url,