elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改事件管理bug；

feature
luyan 2 years ago
parent
6a32cd0d50
commit
77953bacbd
3 changed files with 40 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/modules/shequzhili/eventOld/cpts/add.vue
  2. 70
      src/views/modules/shequzhili/eventOld/cpts/event-info.vue
  3. 2
      src/views/modules/shequzhili/eventOld/cpts/process-form.vue

5
src/views/modules/shequzhili/eventOld/cpts/add.vue
View File

@ -131,8 +131,8 @@ function iniFmData() {
return { return {
gridId: "", //所属网格 gridId: "", //所属网格
reportUserId: "", // 上报人ID reportUserId: "", // 上报人ID
name: "cc", // 上报人姓名 name: "", // 上报人姓名
mobile: "17637255555", // 联系电话 mobile: "", // 联系电话
idCard: "", // 证件号 idCard: "", // 证件号
sourceType: "", // 反映渠道 sourceType: "", // 反映渠道
happenTime: "", //上报时间 happenTime: "", //上报时间
@ -383,7 +383,6 @@ export default {
}); });
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if ( if (
this.formData.idCard && this.formData.idCard &&

70
src/views/modules/shequzhili/eventOld/cpts/event-info.vue
View File

@ -433,40 +433,42 @@ export default {
return false; return false;
} }
this.$refs.ref_processinfo_add.getProcessInfo(); this.$refs.ref_processinfo_add.getProcessInfo();
this.formData.operationType = this.$refs.ref_processinfo_add.operationType; if (this.$refs.ref_processinfo_add.okflag) {
this.eventInfoData.operationType = this.formData.operationType = this.$refs.ref_processinfo_add.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") { if (this.formData.operationType === "0" || this.formData.operationType === "6") {
this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
//回复属性赋值 //回复属性赋值
this.eventInfoData.content = this.replayInfo.content; this.eventInfoData.content = this.replayInfo.content;
this.eventInfoData.status = this.replayInfo.status; this.eventInfoData.status = this.replayInfo.status;
this.eventInfoData.timeLimit = this.replayInfo.timeLimit; this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
if (this.replayInfo.categoryId) { if (this.replayInfo.categoryId) {
this.eventInfoData.categoryList = []; this.eventInfoData.categoryList = [];
this.eventInfoData.categoryList.push(this.replayInfo.categoryId); this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
} }
} else if (this.formData.operationType === "5") { } else if (this.formData.operationType === "5") {
this.replayInfo = this.$refs.ref_processinfo_add.replayInfo; this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
//回复属性赋值 //回复属性赋值
this.eventInfoData.content = this.replayInfo.content; this.eventInfoData.content = this.replayInfo.content;
this.eventInfoData.status = this.replayInfo.status; this.eventInfoData.status = this.replayInfo.status;
this.eventInfoData.timeLimit = this.replayInfo.timeLimit; this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
if (this.replayInfo.categoryId) { if (this.replayInfo.categoryId) {
this.eventInfoData.categoryList = []; this.eventInfoData.categoryList = [];
this.eventInfoData.categoryList.push(this.replayInfo.categoryId); 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.formData = {
...this.eventInfoData, ...this.eventInfoData,
// replayInfo: this.replayInfo, replayInfo: this.replayInfo,
project: this.project, project: this.project,
demand: this.demand, demand: this.demand,
issueInfo: this.issueInfo, issueInfo: this.issueInfo,
@ -503,6 +505,7 @@ export default {
}, },
async handelDispose() { async handelDispose() {
console.log(this.$refs.ref_processinfo_dispose.okflag);
this.$refs.ref_processinfo_dispose.getProcessInfo(); this.$refs.ref_processinfo_dispose.getProcessInfo();
if (this.$refs.ref_processinfo_dispose.okflag) { if (this.$refs.ref_processinfo_dispose.okflag) {
this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
@ -510,6 +513,10 @@ export default {
|| this.formData.operationType === '6') { || this.formData.operationType === '6') {
this.project = {}; this.project = {};
this.demand = {}; this.demand = {};
if(this.$refs.ref_processinfo_dispose.replayInfo.okflag){
this.endLoading();
return false
}
this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo; this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
this.replayInfo.icEventId = this.eventId; this.replayInfo.icEventId = this.eventId;
//回复属性赋值 //回复属性赋值
@ -528,7 +535,6 @@ export default {
this.demand = this.$refs.ref_processinfo_dispose.demand; this.demand = this.$refs.ref_processinfo_dispose.demand;
//需求的属性同事件一样 //需求的属性同事件一样
this.demand.icEventId = this.eventId; this.demand.icEventId = this.eventId;
console.log(this.eventDetailData);
if (this.demand.gridId === '') { if (this.demand.gridId === '') {
this.demand.gridId = this.eventDetailData.gridId this.demand.gridId = this.eventDetailData.gridId
} }
@ -540,7 +546,6 @@ export default {
this.project = {}; this.project = {};
this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo; this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo;
//项目的属性同事件一样 //项目的属性同事件一样
console.log("issueInfo", this.issueInfo);
let url = "/governance/icEventOld/icEventToIssue"; let url = "/governance/icEventOld/icEventToIssue";
await this.submitDispose(url, this.issueInfo); await this.submitDispose(url, this.issueInfo);
} else { } else {
@ -556,7 +561,6 @@ export default {
}); });
if (code === 0) { if (code === 0) {
this.$message.success("操作成功！"); this.$message.success("操作成功！");
this.$emit("handleOk"); this.$emit("handleOk");
} else { } else {
this.$message.error(msg); this.$message.error(msg);

2
src/views/modules/shequzhili/eventOld/cpts/process-form.vue
View File

@ -149,7 +149,7 @@ export default {
async getProcessInfo() { async getProcessInfo() {
this.okflag = false this.okflag = false
if (this.operationType === '0') {//回复 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) { if (this.$refs.ref_process_form_replay.okflag) {
this.replayInfo = this.$refs.ref_process_form_replay.formData; this.replayInfo = this.$refs.ref_process_form_replay.formData;
this.okflag = true; this.okflag = true;

Write Preview
Loading…
Cancel
Save