From 221918bba28d2384d03c596a68256d7832e4a0e0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 894a5d4..1b3ebc5 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -588,7 +588,7 @@
})
const deleteSignFormRule = reactive<FormRules<typeof deleteSignForm>>({
deleteSignTaskId: [{ required: true, message: '减签人员不能为空', trigger: 'change' }],
- reason: [{ required: true, message: '审批意见不能为空', trigger: 'blur' }],
+ reason: [{ required: true, message: '审批意见不能为空', trigger: 'blur' }],
})
// 退回表单
@@ -627,11 +627,11 @@
const openPopover = async (type: string) => {
if (type === 'approve') {
// 校验流程表单
- const valid = await validateNormalForm();
- if (!valid) {
+ const valid = await validateNormalForm();
+ if (!valid) {
message.warning('表单校验不通过，请先完善表单!!')
return;
- }
+ }
}
if (type === 'return') {
// 获取退回节点
@@ -652,7 +652,7 @@
const closePropover = (type: string, formRef: FormInstance | undefined) => {
if (formRef) {
formRef.resetFields()
- }
+ }
popOverVisible.value[type] = false
}
@@ -664,8 +664,8 @@
if (!formRef) return
await formRef.validate()
if (pass) {
- // 获取修改的流程变量, 暂时只支持流程表单
- const variables = getUpdatedProcessInstanceVaiables();
+ // 获取修改的流程变量, 暂时只支持流程表单
+ const variables = getUpdatedProcessInstanceVaiables();
// 审批通过数据
const data = {
id: runningTask.value.id,
@@ -684,8 +684,8 @@
popOverVisible.value.approve = false
message.success('审批通过成功')
} else {
- // 审批不通过数据
- const data = {
+ // 审批不通过数据
+ const data = {
id: runningTask.value.id,
reason: rejectReasonForm.reason,
}
@@ -752,7 +752,7 @@
const handleDelegate = async () => {
formLoading.value = true
try {
-
+
// 1.1 校验表单
if (!delegateFormRef.value) return
await delegateFormRef.value.validate()
--
Gitblit v1.9.3