update 流程校验调整

This commit is contained in:
danshihao
2024-01-19 15:09:14 +08:00
parent c503bab2f7
commit 8fcdd702ae
12 changed files with 188 additions and 55 deletions
@@ -329,23 +329,26 @@ export default {
async getPageParams (isValidate = true) {
// 去除备注必填
this.validatorRules.remarks.rules[0].required = false
// 报错标记(base基本信息校验失败,user人员信息校验失败)
let flag = ''
const base = 'base'
const user = 'user'
const params = {}
// 收集所有表单信息
let formDataList = []
if (isValidate) {
// 记录表单验证是否报错
let err = null
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm).catch(() => {
err = true
if (!flag) {
flag = base
}
// 设置成数组防止后面报错
return []
})
formDataList[2] = await this.$refs.baseInfoForm.getDataValidate().catch(() => {
err = true
if (!flag) {
flag = base
}
})
// 如果有错误就跳转表单
if (err !== null) {
throw new Error('base')
}
} else {
formDataList = [
this.processInfoForm.getFieldsValue(),
@@ -357,9 +360,9 @@ export default {
}
// 收集人员信息
const personInfo = this.getPersonInfo(isValidate)
const personInfo = this.getPersonInfo(isValidate && !flag)
if (!personInfo) {
throw new Error('user')
flag = user
}
// 开始处理信息
@@ -397,6 +400,11 @@ export default {
// 业务数据,用于强制撤回后回显
draftData: params.processMeetingManage
})
// 如果有校验失败的,那就报错
if (flag) {
throw new Error(flag)
}
return params
},
/**