检查任务制定
1、提示修改 2、自动加载 检查人 处理 3、删除行 处理(原先最后一行删除有问题)
This commit is contained in:
parent
86b292a4b5
commit
79924f9d34
@ -330,7 +330,8 @@
|
||||
Nav_Standard: { //Nav_Law
|
||||
NAME: ''
|
||||
}
|
||||
}]
|
||||
}],
|
||||
DetailUserNAME: ''
|
||||
}] //子表
|
||||
},
|
||||
isAudit: true,
|
||||
@ -362,12 +363,14 @@
|
||||
'CHECKTIME': {
|
||||
type: 'string',
|
||||
required: true,
|
||||
trigger: ['blur', 'change']
|
||||
trigger: ['blur', 'change'],
|
||||
message: '请选择检查时间'
|
||||
},
|
||||
'listCheckUserSign': {
|
||||
type: 'string',
|
||||
required: true,
|
||||
trigger: ['blur', 'change']
|
||||
trigger: ['blur', 'change'],
|
||||
message: '请选择检查人员'
|
||||
}
|
||||
},
|
||||
|
||||
@ -395,7 +398,8 @@
|
||||
Nav_Standard: { //Nav_Law
|
||||
NAME: ''
|
||||
}
|
||||
}]
|
||||
}],
|
||||
DetailUserNAME: ''
|
||||
}],
|
||||
}
|
||||
|
||||
@ -425,7 +429,15 @@
|
||||
if (this.Nav_ListSafeCheckDetailShow == null) {
|
||||
this.Nav_ListSafeCheckDetailShow = []
|
||||
}
|
||||
var ROW_NO = this.model.Nav_ListSafeCheckDetail.length + 1
|
||||
var ROW_NO = 1; //this.model.Nav_ListSafeCheckDetail.length + 1
|
||||
if (this.model.Nav_ListSafeCheckDetail.length > 0) {
|
||||
// ROW_NO=0
|
||||
this.model.Nav_ListSafeCheckDetail.forEach(e => {
|
||||
if (e.IS_DELETED == undefined || e.IS_DELETED == false)
|
||||
ROW_NO++
|
||||
})
|
||||
}
|
||||
|
||||
var modelAdd = {
|
||||
ID: guid(),
|
||||
ORG_ID: this.ORG_ID,
|
||||
@ -579,18 +591,29 @@
|
||||
|
||||
// 行数据处理 把选择人 分别插入 每行的人员信息
|
||||
this.modelEdit.Nav_ListSafeCheckDetail.forEach(e => {
|
||||
e.Nav_ListCheckDetailUser = []
|
||||
this.modelEdit.Nav_ListCheckUser.forEach((u, i) => {
|
||||
let userSign = {
|
||||
ID: guid(),
|
||||
ORG_ID: orgId,
|
||||
// SAFE_CHECK_ID: this.model.ID,//重点!!!后台作为关键字在处理 不加此属性
|
||||
SAFE_CHECK_DETAIL_ID: e.ID,
|
||||
USER_ID: u.SUSER_ID,
|
||||
ISMAINCHECK: i == 0 ? 1 : 0
|
||||
if ((!this.modelEdit.Nav_ListCheckUser || this.modelEdit.Nav_ListCheckUser.length <
|
||||
1) && this.modelEdit.listCheckUserSign.length > 0) {
|
||||
//自动加载 不需要处理
|
||||
if (e.Nav_ListCheckDetailUser != null && e.Nav_ListCheckDetailUser.length >
|
||||
0) {
|
||||
e.Nav_ListCheckDetailUser.forEach(eu => {
|
||||
eu.Nav_User = null
|
||||
})
|
||||
}
|
||||
e.Nav_ListCheckDetailUser.push(userSign)
|
||||
})
|
||||
} else {
|
||||
e.Nav_ListCheckDetailUser = []
|
||||
this.modelEdit.Nav_ListCheckUser.forEach((u, i) => {
|
||||
let userSign = {
|
||||
ID: guid(),
|
||||
ORG_ID: orgId,
|
||||
// SAFE_CHECK_ID: this.model.ID,//重点!!!后台作为关键字在处理 不加此属性
|
||||
SAFE_CHECK_DETAIL_ID: e.ID,
|
||||
USER_ID: u.SUSER_ID,
|
||||
ISMAINCHECK: i == 0 ? 1 : 0
|
||||
}
|
||||
e.Nav_ListCheckDetailUser.push(userSign)
|
||||
})
|
||||
}
|
||||
if (e.Nav_ListLaw != null)
|
||||
e.Nav_ListLaw.forEach(u => {
|
||||
u.Nav_Standard = null //Nav_Law
|
||||
@ -613,7 +636,11 @@
|
||||
}, 'success', 1000)
|
||||
})
|
||||
}).catch(err => {
|
||||
uni.$showErrorInfo('校验失败');
|
||||
if (err.length > 0) {
|
||||
uni.$showErrorInfo(err[0].message)
|
||||
} else {
|
||||
uni.$showErrorInfo('校验失败!')
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -709,6 +736,30 @@
|
||||
this.model.RiskAreaNAME = strRiskAreaNAME
|
||||
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
|
||||
this.model.CheckProjectNAME = CheckProjectNAME
|
||||
|
||||
if (this.model.CheckUsers && this.model.CheckUsers.length > 0) {
|
||||
//默认处理了人员信息
|
||||
// var sreq='erwqreqreqerwqrewq'
|
||||
// var cdd0=sreq.replace(/q/g,'1')
|
||||
// var cdd2=sreq.replace('q','1')
|
||||
this.model.listCheckUserSign = this.model.CheckUsers.replace(/,/g, ' ')
|
||||
//不处理 做区分
|
||||
// this.model.Nav_ListCheckUser = listUsers
|
||||
}
|
||||
|
||||
// DetailUserNAME
|
||||
var DetailUserNAME = ''
|
||||
this.model.Nav_ListSafeCheckDetail.forEach(e => {
|
||||
if (e.Nav_ListCheckDetailUser != null && e.Nav_ListCheckDetailUser.length >
|
||||
0) {
|
||||
DetailUserNAME = e.Nav_ListCheckDetailUser[0].Nav_User.NAME
|
||||
e.Nav_ListCheckDetailUser.forEach((eu, index) => {
|
||||
if (index > 0)
|
||||
DetailUserNAME += ' ' + eu.Nav_User.NAME
|
||||
})
|
||||
e.DetailUserNAME = DetailUserNAME
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
|
||||
this.model.RiskAreaNAME = strRiskAreaNAME
|
||||
|
||||
Loading…
Reference in New Issue
Block a user