From 38df345078756e12d405922136837d07ec6e2de4 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 03 六月 2024 21:04:42 +0800
Subject: [PATCH] update 调整流程图预览校验
---
src/api/workflow/leave/types.ts | 6 ++++--
src/views/workflow/leave/leaveEdit.vue | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/api/workflow/leave/types.ts b/src/api/workflow/leave/types.ts
index b093546..b86c480 100644
--- a/src/api/workflow/leave/types.ts
+++ b/src/api/workflow/leave/types.ts
@@ -5,7 +5,8 @@
endDate: string;
leaveDays: number;
remark: string;
- processInstanceVo: any;
+ status?: string;
+ processInstanceId?: string;
}
export interface LeaveForm extends BaseEntity {
@@ -15,7 +16,8 @@
endDate?: string;
leaveDays?: number;
remark?: string;
- processInstanceVo?: any;
+ status?: string;
+ processInstanceId?: string;
}
export interface LeaveQuery extends PageQuery {
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index af25fad..3dca4fc 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -4,18 +4,20 @@
<div style="display: flex; justify-content: space-between">
<div>
<el-button
- v-if="routeParams.type === 'add' ||
- (routeParams.type === 'update' &&form.status &&
- (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+ v-if="
+ routeParams.type === 'add' ||
+ (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+ "
:loading="buttonLoading"
type="info"
@click="submitForm('draft')"
>鏆傚瓨</el-button
>
<el-button
- v-if="routeParams.type === 'add' ||
- (routeParams.type === 'update' && form.status &&
- (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+ v-if="
+ routeParams.type === 'add' ||
+ (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+ "
:loading="buttonLoading"
type="primary"
@click="submitForm('submit')"
@@ -28,7 +30,7 @@
@click="approvalVerifyOpen"
>瀹℃壒</el-button
>
- <el-button v-if="processInstanceId" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
+ <el-button v-if="form.processInstanceId" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
<div>
<el-button style="float: right" @click="goBack()">杩斿洖</el-button>
@@ -123,7 +125,8 @@
endDate: undefined,
leaveDays: undefined,
remark: undefined,
- processInstanceVo: {}
+ status: undefined,
+ processInstanceId: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
form: { ...initFormData },
@@ -166,9 +169,6 @@
leaveTime.value = [];
leaveTime.value.push(form.value.startDate);
leaveTime.value.push(form.value.endDate);
- if (form.value.processInstanceVo) {
- processInstanceId.value = form.value.processInstanceVo.id;
- }
loading.value = false;
buttonLoading.value = false;
});
--
Gitblit v1.9.3