From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index f5b4d14..eb6c39d 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -445,7 +445,7 @@
if(type === '新增'){
this.ifShow = false
this.title = '新建巡检计划设定'
- this.noticeDepartment = ''
+ // this.noticeDepartment = ''
this.execDepartment = ''
this.inspectionTaskForm = {
type:null,
@@ -454,7 +454,7 @@
execUid: null,
intervalSeconds: null,
noticeSeconds: null,
- noticeUid: null,
+ // noticeUid: null,
title:'',
riskControlMeasureIdList: [
],
@@ -467,6 +467,7 @@
}else{
this.ifShow = true
this.title = '编辑巡检计划设定'
+ debugger
// this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
// this.changeNotice()
this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
@@ -481,6 +482,7 @@
}
},
handleDepartment(value){
+ debugger
let department = ''
for(let i in this.userList){
if(this.userList[i].id === value){
@@ -595,11 +597,11 @@
})
},
receiveToForm(value) {
- // this.inspectionTaskForm.riskControlMeasureIdList = []
- // this.inspectionTaskForm.riskControlMeasureIdList = value.map( item => {
- // return item.id
- // })
- this.inspectionTaskForm.riskControlMeasureIdList.push({id:value.id})
+ this.inspectionTaskForm.riskControlMeasureIdList = []
+ this.inspectionTaskForm.riskControlMeasureIdList = value.map( item => {
+ return item.id
+ })
+ // this.inspectionTaskForm.riskControlMeasureIdList.push({id:value.id})
},
refreshHandle(){
this.getInspectionTaskData()
--
Gitblit v1.9.2