From 2c9c837c1b999748e3ec7e0526f5673111d108bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 六月 2024 17:27:50 +0800
Subject: [PATCH] update 优化 请假天数计算不精确问题
---
src/views/workflow/leave/leaveEdit.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index af25fad..28087ab 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.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
<div>
<el-button style="float: right" @click="goBack()">杩斿洖</el-button>
@@ -80,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 = [
@@ -123,7 +123,7 @@
endDate: undefined,
leaveDays: undefined,
remark: undefined,
- processInstanceVo: {}
+ status: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
form: { ...initFormData },
@@ -154,7 +154,7 @@
const startDate = new Date(leaveTime.value[0]).getTime();
const endDate = new Date(leaveTime.value[1]).getTime();
const diffInMilliseconds = endDate - startDate;
- form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24));
+ form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)) + 1;
};
/** 鑾峰彇璇︽儏 */
const getInfo = () => {
@@ -166,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;
});
--
Gitblit v1.9.3