fix 79597

This commit is contained in:
danshihao
2023-12-22 17:13:09 +08:00
parent f059d0fc27
commit 2c7657f3d8
3 changed files with 32 additions and 11 deletions
@@ -393,7 +393,16 @@ export default {
// 收集所有表单信息 // 收集所有表单信息
let formDataList = [] let formDataList = []
if (isValidate) { if (isValidate) {
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm, this.baseInfoForm) // 记录表单验证是否报错
let err = null
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm, this.baseInfoForm).catch(() => {
err = true
return []
})
// 如果有错误就跳转表单
if (err !== null) {
throw new Error('base')
}
} else { } else {
formDataList = [ formDataList = [
this.processInfoForm.getFieldsValue(), this.processInfoForm.getFieldsValue(),
@@ -311,8 +311,19 @@ export default {
// 收集所有表单信息 // 收集所有表单信息
let formDataList = [] let formDataList = []
if (isValidate) { if (isValidate) {
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm) // 记录表单验证是否报错
formDataList[2] = await this.$refs.baseInfoForm.getDataValidate() let err = null
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm).catch(() => {
err = true
return []
})
formDataList[2] = await this.$refs.baseInfoForm.getDataValidate().catch(() => {
err = true
})
// 如果有错误就跳转表单
if (err !== null) {
throw new Error('base')
}
} else { } else {
formDataList = [ formDataList = [
this.processInfoForm.getFieldsValue(), this.processInfoForm.getFieldsValue(),
@@ -322,6 +333,7 @@ export default {
// 保存清空校验 // 保存清空校验
this.approvalInfoForm.validateFields(['commitText'], { force: true }, () => {}) this.approvalInfoForm.validateFields(['commitText'], { force: true }, () => {})
} }
// 收集人员信息 // 收集人员信息
const getPersonInfo = this.getPersonInfo(isValidate) const getPersonInfo = this.getPersonInfo(isValidate)
if (!getPersonInfo) { if (!getPersonInfo) {
@@ -251,18 +251,22 @@ export default {
// 去除备注必填 // 去除备注必填
this.validatorRules.remarks.rules[0].required = false this.validatorRules.remarks.rules[0].required = false
const params = {} const params = {}
// 记录验证是否报错
let err = null
// 收集所有表单信息 // 收集所有表单信息
let formDataList = [] let formDataList = []
if (isValidate) { if (isValidate) {
// 记录表单验证是否报错
let err = null
formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm).catch(() => { formDataList = await this.validateFormList(this.processInfoForm, this.approvalInfoForm).catch(() => {
err = 'base' err = true
return [] return []
}) })
formDataList[2] = await this.$refs.baseInfoForm.getDataValidate().catch(() => { formDataList[2] = await this.$refs.baseInfoForm.getDataValidate().catch(() => {
err = 'base' err = true
}) })
// 如果有错误就跳转表单
if (err !== null) {
throw new Error('base')
}
} else { } else {
formDataList = [ formDataList = [
this.processInfoForm.getFieldsValue(), this.processInfoForm.getFieldsValue(),
@@ -294,10 +298,6 @@ export default {
projectId: this.projectId, projectId: this.projectId,
id: this.formInfo.id id: this.formInfo.id
}) })
// 如果有错误就跳转对应页面
if (err !== null) {
throw new Error(err)
}
return params return params
}, },
/** /**