From 04b8d36f3ea20c8fba702aacb612cddb18147acd Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 16:53:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/shequzhili/event-info.scss | 4 ++++ src/views/modules/shequzhili/event/cpts/event-info.vue | 2 +- .../modules/shequzhili/event/cpts/process-form-demand.vue | 4 ++-- src/views/modules/shequzhili/event/eventList.vue | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) 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..4458df11 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 @@
-
+
{ 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, From 797e3aa577ad76e6edb5dc674d6817cce1ce17a1 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 17:08:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/event/cpts/event-info.vue | 25 ++++++++++++------- .../event/cpts/process-form-demand.vue | 5 +++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 4458df11..cf5a7573 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -356,7 +356,6 @@ export default { this.$refs.ref_add.getEventInfo() if (this.$refs.ref_add.okflag) { - this.eventInfoData = this.$refs.ref_add.formData } else { return false @@ -369,18 +368,21 @@ export default { this.formData.operationType = this.$refs.ref_processinfo_add.operationType this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType - // this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList + if (this.formData.operationType === '0') { this.project = {} this.demand = {} this.replayInfo = this.$refs.ref_processinfo_add.replayInfo console.log('replayInfo', this.replayInfo) + //回复属性赋值 this.eventInfoData.content = this.replayInfo.content this.eventInfoData.status = this.replayInfo.status - this.eventInfoData.categoryList = [] - this.eventInfoData.categoryList.push(this.replayInfo.categoryId) + if (this.replayInfo.categoryId) { + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.replayInfo.categoryId) + } } else if (this.formData.operationType === '1') { @@ -389,17 +391,22 @@ export default { this.project = this.$refs.ref_processinfo_add.project //项目的属性同事件一样 this.project.gridId = this.eventInfoData.gridId + + if (this.project.categoryList && this.project.categoryList.length > 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 5f425578..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) @@ -412,7 +416,6 @@ export default { handleChangeCate () { console.log(this.$refs["myCascader"].getCheckedNodes()[0].data) this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data - this.formData.categoryId = this.selCateObj.id },