审批流优化
This commit is contained in:
@ -38,7 +38,7 @@
|
||||
</template>
|
||||
</a-space>
|
||||
</div>
|
||||
<component v-if="customFormConfig.codeList.includes(curPageCode)" :is="componentName" :disabled="readonly" />
|
||||
<component v-if="customFormConfig.codeList.includes(curPageCode)" :is="componentName" ref="formInformation" :disabled="true" />
|
||||
<FormInformation
|
||||
v-else
|
||||
:key="renderKey"
|
||||
@ -393,12 +393,16 @@
|
||||
async function onApproveClick(isAutoAgreeBreak = false) {
|
||||
try {
|
||||
openSpinning();
|
||||
if (!isAutoAgreeBreak) {
|
||||
await submit();
|
||||
}
|
||||
if (!validateSuccess.value) {
|
||||
closeSpinning();
|
||||
return;
|
||||
if (!customFormConfig.codeList.includes(curPageCode.value)) {
|
||||
if (!isAutoAgreeBreak) {
|
||||
await submit();
|
||||
}
|
||||
if (!validateSuccess.value) {
|
||||
closeSpinning();
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
validateSuccess.value = true
|
||||
}
|
||||
const params = await getApproveParams();
|
||||
const nextNodes = await postGetNextTaskMaybeArrival(params);
|
||||
@ -681,9 +685,20 @@
|
||||
|
||||
async function getApproveParams() {
|
||||
try {
|
||||
let formModels = {}
|
||||
let system = {}
|
||||
let fileFolderIds = []
|
||||
if (!customFormConfig.codeList.includes(curPageCode.value)) {
|
||||
let formModels = await formInformation.value.getFormModels();
|
||||
let system = formInformation.value.getSystemType();
|
||||
let fileFolderIds = getUploadFileFolderIds(formModels);
|
||||
} else {
|
||||
let value = await formInformation.value.getFormValue();
|
||||
let key = data.formInfos[0]?.formConfig?.key
|
||||
formModels[key] = value
|
||||
system[key] = false
|
||||
fileFolderIds = []
|
||||
}
|
||||
return {
|
||||
approvedType: approvalData.approvedType,
|
||||
approvedResult: approvalData.approvedResult, // approvalData.approvedType 审批结果 如果为 4 就需要传buttonCode
|
||||
@ -708,13 +723,16 @@
|
||||
try {
|
||||
if (validateSuccess.value || values === 'reject' || values === 'finish' || values === 'disagree') {
|
||||
let params = await getApproveParams();
|
||||
openSpinning()
|
||||
let response = await postApproval(params);
|
||||
closeSpinning()
|
||||
// 判断返回值是否带有isAutoAgree 来判断中间是否有自动审批的业务,如有再执行判断待审人员是否包含自己,不包含就直接flowSuccess
|
||||
if (checkIsAutoAgree(response)) return;
|
||||
flowSuccess();
|
||||
data.submitLoading = false;
|
||||
}
|
||||
} catch (error) {
|
||||
closeSpinning()
|
||||
flowFail();
|
||||
throw new Error(error);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user