diff --git a/pages/alarmPage/disposition/disposition.vue b/pages/alarmPage/disposition/disposition.vue index 5cdd9f45..8e1928ac 100644 --- a/pages/alarmPage/disposition/disposition.vue +++ b/pages/alarmPage/disposition/disposition.vue @@ -13,7 +13,7 @@ - + + + + 已处置 + 误报忽略 - + - + * 违章人员 @@ -48,7 +51,7 @@ --> - + * @@ -72,7 +75,7 @@ export default { data() { return { - isDis: 'dis', + handleResult: '', dispositionForm: { workerId: '', desc: '', @@ -87,6 +90,7 @@ onLoad(option) { this.alarmItem = JSON.parse(decodeURIComponent(option.item)); this.alarmItem.deductScore = this.alarmItem.aiDeductRule.deductScore; + // this.handleResult = this.alarmItem.handleResult console.log('alarmItem',this.alarmItem) }, mounted() { @@ -109,13 +113,13 @@ } }) }, - isShowContent(e){ - this.isDis = e.detail.value - if(this.isDis === 'ign'){ - this.cleanForm() - } - console.log(this.dispositionForm); - }, + // isShowContent(e){ + // this.handleResult = e.detail.value + // if(this.handleResult === 2){ + // this.cleanForm() + // } + // console.log(this.dispositionForm); + // }, cleanForm(){ this.dispositionForm.workerId = '' this.dispositionForm.desc = '' diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue index 756bbf40..8f2f821d 100644 --- a/pages/projectEnd/qualityManage/addIssue.vue +++ b/pages/projectEnd/qualityManage/addIssue.vue @@ -570,7 +570,7 @@ this.getCheckPointList(); this.getIssueList(); this.getPersonList(); - this.getReviewPeopleList(); + // this.getReviewPeopleList(); // this.getPersonUpdateList(); this.getProgressListData() console.log('lll', option.taskId, option.itemId) @@ -590,7 +590,10 @@ method: 'post', data: { projectSn: this.projectSn, - enterpriseTypeId: 7, + // enterpriseTypeId: 7, + qualityRegionId: this.form.regionId, + qualityRegionBindType: 2, + isSupervisingRoleName: 1 }, success: res => { console.log(res.result) @@ -749,7 +752,8 @@ url: 'xmgl/qualityRegion/list', method: 'post', data: { - projectSn: this.projectSn + projectSn: this.projectSn, + notSupervisingUnit: 1 }, success: res => { if (res.code == 200) { @@ -810,6 +814,10 @@ // this.changePeopleIndex = index // } // }); + this.reviewList = []; + this.reviewIndex = null + this.form.reviewId = '' + this.getReviewPeopleList() } else if (type == 2) { console.log('选择问题描述的数据', val); //设置问题描述 diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index fa2e8c7a..f2b1d5c1 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -89,6 +89,7 @@ + 整改要求: