fix 81240

This commit is contained in:
赵霄
2024-01-26 10:44:56 +08:00
parent 6a5538278b
commit df6fa2174d
6 changed files with 17 additions and 16 deletions
@@ -580,14 +580,14 @@ export default {
*/
dealFormData () {
let flag = true, basicProcessInfoDTO = {}, basicTaskInfoDTO = {}, userInfoMap = {}
this.processInfoForm.validateFields((errors, values) => {
this.processInfoForm.validateFields({ force: true },(errors, values) => {
if (!errors) {
basicProcessInfoDTO = Object.assign(this.processInfo, values)
} else {
flag = false
}
})
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
basicTaskInfoDTO = Object.assign(this.approvalInfo, values)
basicTaskInfoDTO.taskId = this.$route.query.taskId
@@ -708,6 +708,7 @@ export default {
}
this.disabledBtnClick = true
this.validatorRules.handleText.rules[0].required = true
const formData = this.dealFormData()
if (!formData) {
this.disabledBtnClick = false
@@ -973,7 +973,7 @@ export default {
let flag = true
// 第一步,填写流程信息
if (this.currentStep === 0) {
this.processInfoForm.validateFields(this.processInfoShowField, (errors, values) => {
this.processInfoForm.validateFields(this.processInfoShowField, { force: true }, (errors, values) => {
if (errors) {
flag = false
} else {
@@ -1266,7 +1266,7 @@ export default {
}
}
// 流程审批意见数据
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
basicTaskInfoDTO = Object.assign(this.approvalInfo, values)
basicTaskInfoDTO.taskId = basicTaskInfoDTO.taskId || this.$route.query.taskId
@@ -1277,7 +1277,7 @@ export default {
})
// 抄送人员校验
if (this.showCcPerson) {
this.dispatchInfoForm.validateFields((errors, values) => {
this.dispatchInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
formData.businessInfoDTO.carbonCopyPersonnels = values.carbonCopyPersonnels
} else {
@@ -101,7 +101,7 @@
<regulatory-engineer-approval v-if="isRegulatoryEngineerApproval" ref="termList" :display-data-source="dispatchDataSource" />
<!--设计工程师补充立项项目号-->
<design-engineer-write-project v-if="isDesignEngineerWriteProject" ref="termList" :display-data-source="dispatchDataSource"/>
<design-engineer-write-project v-if="isDesignEngineerWriteProject" ref="termList" :display-data-source="dispatchDataSource" />
<!--流程审批信息-->
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
@@ -434,14 +434,14 @@ export default {
*/
async dealSubmitFormData (needValidateMainTable = true) {
let basicProcessInfoDTO = {}, basicTaskInfoDTO = {}, flag = true
this.processInfoForm.validateFields((errors, values) => {
this.processInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
basicProcessInfoDTO = Object.assign(this.processInfo, values)
} else {
flag = false
}
})
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
basicTaskInfoDTO = Object.assign(this.approvalInfo, values)
} else {
@@ -1007,7 +1007,7 @@ export default {
}
} else {
// 流程信息
this.processInfoForm.validateFields((errors, values) => {
this.processInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
processInfo = Object.assign(this.processInfo, values)
} else {
@@ -1015,7 +1015,7 @@ export default {
}
})
// 业务基本信息
this.basicServiceInfoForm.validateFields((errors, values) => {
this.basicServiceInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
basicServiceInfo = Object.assign(this.basicServiceInfo, values)
} else {
@@ -1023,7 +1023,7 @@ export default {
}
})
// 流程审批信息
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
approvalInfo = Object.assign(this.approvalInfo, values)
approvalInfo.finishFlag = 2 // 保存——1;提交/同意/驳回——2
@@ -1033,7 +1033,7 @@ export default {
})
// 业务分派信息
if (this.showDispatchInformation) {
this.dispatchInfoForm.validateFields((errors, values) => {
this.dispatchInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
dispatchInfo = Object.assign(this.dispatchInfo, values)
} else {
@@ -858,7 +858,7 @@ export default {
const formData = {}
let flag = true
// 处理流程信息
this.processInfoForm.validateFields((errors, values) => {
this.processInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
formData.basicProcessInfoDTO = Object.assign(this.processInfo, values)
} else {
@@ -889,7 +889,7 @@ export default {
}
})
// 处理流程审批信息
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
formData.basicTaskInfoDTO = Object.assign(this.approvalInfo, values)
formData.basicTaskInfoDTO.taskId = this.$route.query.taskId
@@ -382,7 +382,7 @@ export default {
}
} else {
// 流程信息
this.processInfoForm.validateFields((errors, values) => {
this.processInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
processInfo = Object.assign(this.processInfo, values)
} else {
@@ -396,7 +396,7 @@ export default {
}
businessInfo = this.dataSource
// 审批信息
this.approvalInfoForm.validateFields((errors, values) => {
this.approvalInfoForm.validateFields({ force: true }, (errors, values) => {
if (!errors) {
approvalInfo = Object.assign(this.approvalInfo, values)
approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId