From 9a02598c00c0af120b38cfd09229abe17b10c4b7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 25 十月 2024 11:13:13 +0800
Subject: [PATCH] !151 发布 vue 版本 5.2.3 与 cloud 版本 2.2.2 Merge pull request !151 from 疯狂的狮子Li/dev
---
src/views/workflow/leave/leaveEdit.vue | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 28087ab..55556fd 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -3,34 +3,10 @@
<el-card shadow="never">
<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'))
- "
- :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'))
- "
- :loading="buttonLoading"
- type="primary"
- @click="submitForm('submit')"
- >鎻� 浜�</el-button
- >
- <el-button
- v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
- :loading="buttonLoading"
- type="primary"
- @click="approvalVerifyOpen"
- >瀹℃壒</el-button
- >
- <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">鏆傚瓨</el-button>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">鎻� 浜�</el-button>
+ <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">瀹℃壒</el-button>
+ <el-button v-if="form && form.id && form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
<div>
<el-button style="float: right" @click="goBack()">杩斿洖</el-button>
@@ -47,10 +23,12 @@
<el-form-item label="璇峰亣鏃堕棿">
<el-date-picker
v-model="leaveTime"
+ value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="To"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
+ :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
@change="changeLeaveTime()"
/>
</el-form-item>
@@ -214,8 +192,8 @@
taskVariables.value = {
entity: data,
leaveDays: data.leaveDays,
- userList: [1, 3],
- userList2: [1, 3]
+ userList: ["1", "3"],
+ userList2: ["1", "3"]
};
submitFormData.value.variables = taskVariables.value;
const resp = await startWorkFlow(submitFormData.value);
@@ -246,6 +224,21 @@
const approvalVerifyOpen = async () => {
submitVerifyRef.value.openDialog(routeParams.value.taskId);
};
+//鏍￠獙鎻愪氦鎸夐挳鏄惁鏄剧ず
+const submitButtonShow = computed(() => {
+ return (
+ routeParams.value.type === 'add' ||
+ (routeParams.value.type === 'update' &&
+ form.value.status &&
+ (form.value.status === 'draft' || form.value.status === 'cancel' || form.value.status === 'back'))
+ );
+});
+
+//鏍￠獙瀹℃壒鎸夐挳鏄惁鏄剧ず
+const approvalButtonShow = computed(() => {
+ return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
+});
+
onMounted(() => {
nextTick(async () => {
routeParams.value = proxy.$route.query;
--
Gitblit v1.9.3