From e354db74a7e57be88215ddba2ea11d3cbc944321 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 六月 2024 11:00:23 +0800
Subject: [PATCH] !121 ♥️发布 2.2.0-BETA 公测版本 Merge pull request !121 from 疯狂的狮子Li/dev
---
src/views/workflow/leave/leaveEdit.vue | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index e978ad8..d6210f0 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -6,12 +6,7 @@
<el-button
v-if="
routeParams.type === 'add' ||
- (routeParams.type === 'update' &&
- form.processInstanceVo &&
- form.processInstanceVo.businessStatus &&
- (form.processInstanceVo.businessStatus === 'draft' ||
- form.processInstanceVo.businessStatus === 'cancel' ||
- form.processInstanceVo.businessStatus === 'back'))
+ (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
"
:loading="buttonLoading"
type="info"
@@ -21,11 +16,7 @@
<el-button
v-if="
routeParams.type === 'add' ||
- (routeParams.type === 'update' &&
- form.processInstanceVo &&
- (form.processInstanceVo.businessStatus === 'draft' ||
- form.processInstanceVo.businessStatus === 'cancel' ||
- form.processInstanceVo.businessStatus === 'back'))
+ (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
"
:loading="buttonLoading"
type="primary"
@@ -33,13 +24,13 @@
>鎻� 浜�</el-button
>
<el-button
- v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
+ v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
:loading="buttonLoading"
type="primary"
@click="approvalVerifyOpen"
>瀹℃壒</el-button
>
- <el-button v-if="processInstanceId" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
+ <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
<div>
<el-button style="float: right" @click="goBack()">杩斿洖</el-button>
@@ -91,8 +82,6 @@
const buttonLoading = ref(false);
const loading = ref(true);
const leaveTime = ref<Array<string>>([]);
-//娴佺▼瀹炰緥id
-const processInstanceId = ref('');
//璺敱鍙傛暟
const routeParams = ref<Record<string, any>>({});
const options = [
@@ -134,7 +123,7 @@
endDate: undefined,
leaveDays: undefined,
remark: undefined,
- processInstanceVo: {}
+ status: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
form: { ...initFormData },
@@ -177,9 +166,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;
});
@@ -243,7 +229,7 @@
};
//瀹℃壒璁板綍
const handleApprovalRecord = () => {
- approvalRecordRef.value.init(processInstanceId.value);
+ approvalRecordRef.value.init(form.value.id);
};
//鎻愪氦鍥炶皟
const submitCallback = async () => {
--
Gitblit v1.9.3