Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-05-27 11:18:04 +08:00
commit 5d3fa0c6bd
1 changed files with 99 additions and 84 deletions

View File

@ -972,9 +972,9 @@ export default {
this.postList = response.data
})
},
submitForm(formName, submitType) {
async submitForm(formName, submitType) {
this.loading = true
let isReturn = false
let isReturn = true
if (submitType === '提交') {
const param = {
...this.getParams(),
@ -997,27 +997,35 @@ export default {
return false
}
//
try {
const response = judgeIsFileComplete(param)
console.log('response=====', response)
if (response.msg === '部分人员文件不存在,请先仔细核对,上传相关文件!') {
this.$message({
message: '部分人员文件不存在,请先仔细核对,上传相关文件!',
type: 'error',
})
// return false
isReturn = true
}
} catch (error) {
this.$message({
message: '文件检查失败,请稍后重试!',
type: 'error',
})
// return false
}
}
// try {
// const response = await judgeIsFileComplete(param)
// console.log('response=====', response)
// // if (response.msg === '') {
// // this.$message({
// // message: '',
// // type: 'error',
// // })
// // // return false
// // isReturn = true
// // }
// if (response.code == 500) {
// this.$message({
// message: response.msg,
// type: 'error',
// })
// // return false
// isReturn = true
// }
// } catch (error) {
// this.$message({
// message: '',
// type: 'error',
// })
// // return false
// }
if (isReturn) return
judgeIsFileComplete(param)
.then(res => {
this.$refs[formName].validate(valid => {
if (submitType === '提交' && !valid) {
return this.$modal.msgError('请完善全部上传信息')
@ -1083,6 +1091,13 @@ export default {
}
)
})
})
.catch(error => {
// console.log(error, '')
})
}
// if (isReturn) return
},
/**
* 提交审批