From 77953bacbd382d2f68fc8684939223c97b3290fc Mon Sep 17 00:00:00 2001 From: luyan Date: Mon, 20 Nov 2023 14:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/eventOld/cpts/add.vue | 5 +- .../shequzhili/eventOld/cpts/event-info.vue | 70 ++++++++++--------- .../shequzhili/eventOld/cpts/process-form.vue | 2 +- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue index a7bbaf710..30ab7ab5e 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/add.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue @@ -131,8 +131,8 @@ function iniFmData() { return { gridId: "", //所属网格 reportUserId: "", // 上报人ID - name: "cc", // 上报人姓名 - mobile: "17637255555", // 联系电话 + name: "", // 上报人姓名 + mobile: "", // 联系电话 idCard: "", // 证件号 sourceType: "", // 反映渠道 happenTime: "", //上报时间 @@ -383,7 +383,6 @@ export default { }); return false; } - const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X if ( this.formData.idCard && diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index c2fab3dc1..4ed81607d 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -433,40 +433,42 @@ export default { return false; } this.$refs.ref_processinfo_add.getProcessInfo(); - this.formData.operationType = this.$refs.ref_processinfo_add.operationType; - this.eventInfoData.operationType = - this.$refs.ref_processinfo_add.operationType; - if (this.formData.operationType === "0" || this.formData.operationType === "6") { - this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; - //回复属性赋值 - this.eventInfoData.content = this.replayInfo.content; - this.eventInfoData.status = this.replayInfo.status; - this.eventInfoData.timeLimit = this.replayInfo.timeLimit; - if (this.replayInfo.categoryId) { - this.eventInfoData.categoryList = []; - this.eventInfoData.categoryList.push(this.replayInfo.categoryId); - } - } else if (this.formData.operationType === "5") { - this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; - //回复属性赋值 - this.eventInfoData.content = this.replayInfo.content; - this.eventInfoData.status = this.replayInfo.status; - this.eventInfoData.timeLimit = this.replayInfo.timeLimit; - if (this.replayInfo.categoryId) { - this.eventInfoData.categoryList = []; - this.eventInfoData.categoryList.push(this.replayInfo.categoryId); + if (this.$refs.ref_processinfo_add.okflag) { + this.formData.operationType = this.$refs.ref_processinfo_add.operationType; + this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType; + if (this.formData.operationType === "0" || this.formData.operationType === "6") { + this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; + //回复属性赋值 + this.eventInfoData.content = this.replayInfo.content; + this.eventInfoData.status = this.replayInfo.status; + this.eventInfoData.timeLimit = this.replayInfo.timeLimit; + if (this.replayInfo.categoryId) { + this.eventInfoData.categoryList = []; + this.eventInfoData.categoryList.push(this.replayInfo.categoryId); + } + } else if (this.formData.operationType === "5") { + this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; + //回复属性赋值 + this.eventInfoData.content = this.replayInfo.content; + this.eventInfoData.status = this.replayInfo.status; + this.eventInfoData.timeLimit = this.replayInfo.timeLimit; + if (this.replayInfo.categoryId) { + this.eventInfoData.categoryList = []; + this.eventInfoData.categoryList.push(this.replayInfo.categoryId); + } + } else if (this.formData.operationType === "2") { + this.replayInfo = {}; + this.project = {}; + this.demand = this.$refs.ref_processinfo_add.demand; + this.demand.gridId = this.eventInfoData.gridId; + } else if (this.formData.operationType === "4") { + this.replayInfo = {}; } - } else if (this.formData.operationType === "2") { - this.replayInfo = {}; - this.project = {}; - this.demand = this.$refs.ref_processinfo_add.demand; - this.demand.gridId = this.eventInfoData.gridId; - } else if (this.formData.operationType === "4") { - this.replayInfo = {}; } + this.formData = { ...this.eventInfoData, - // replayInfo: this.replayInfo, + replayInfo: this.replayInfo, project: this.project, demand: this.demand, issueInfo: this.issueInfo, @@ -503,6 +505,7 @@ export default { }, async handelDispose() { + console.log(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; @@ -510,6 +513,10 @@ export default { || this.formData.operationType === '6') { this.project = {}; this.demand = {}; + if(this.$refs.ref_processinfo_dispose.replayInfo.okflag){ + this.endLoading(); + return false + } this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo; this.replayInfo.icEventId = this.eventId; //回复属性赋值 @@ -528,7 +535,6 @@ export default { this.demand = this.$refs.ref_processinfo_dispose.demand; //需求的属性同事件一样 this.demand.icEventId = this.eventId; - console.log(this.eventDetailData); if (this.demand.gridId === '') { this.demand.gridId = this.eventDetailData.gridId } @@ -540,7 +546,6 @@ export default { this.project = {}; this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo; //项目的属性同事件一样 - console.log("issueInfo", this.issueInfo); let url = "/governance/icEventOld/icEventToIssue"; await this.submitDispose(url, this.issueInfo); } else { @@ -556,7 +561,6 @@ export default { }); if (code === 0) { this.$message.success("操作成功！"); - this.$emit("handleOk"); } else { this.$message.error(msg); diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue index d24438e01..6ebc1ab9c 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue @@ -149,7 +149,7 @@ export default { async getProcessInfo() { this.okflag = false if (this.operationType === '0') {//回复 - this.$refs.ref_process_form_replay.getReplayInfo() + this.$refs.ref_process_form_replay.getReplayInfo(); if (this.$refs.ref_process_form_replay.okflag) { this.replayInfo = this.$refs.ref_process_form_replay.formData; this.okflag = true;