From 9c87a28c549b8b6d034ed2bd252dbd4f9cf454c9 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 18 Dec 2024 20:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=AE=A1=E7=90=86=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=A4=E6=96=AD=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/qjgl/index.ts | 1 + src/views/Home/qjgl/QjglCreate.vue | 12 ++++--- src/views/Home/qjgl/QjglDetail.vue | 51 ++++++++++++++++++------------ 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/api/home/qjgl/index.ts b/src/api/home/qjgl/index.ts index 4098936..ffc01fa 100644 --- a/src/api/home/qjgl/index.ts +++ b/src/api/home/qjgl/index.ts @@ -9,6 +9,7 @@ export interface QjglVO { startTime: Date // 开始时间 endTime: Date // 结束时间 day: number // 请假天数 + remainingDays: number // 请假天数 filePath: string // 文件路径 userName: string // 作者 deptId: number // 部门id diff --git a/src/views/Home/qjgl/QjglCreate.vue b/src/views/Home/qjgl/QjglCreate.vue index 071030a..f1f71b4 100644 --- a/src/views/Home/qjgl/QjglCreate.vue +++ b/src/views/Home/qjgl/QjglCreate.vue @@ -76,8 +76,8 @@ - - + + @@ -139,6 +139,7 @@ const formData = ref({ startTime: undefined, endTime: undefined, day: 0, + remainingDays: 0, filePath: undefined, userName: '', deptId: undefined, @@ -356,7 +357,9 @@ const getNjglData = async ()=> { // 直接第一条拿出来不用每次都写 if (njData.value.list[0]) { njList.value = njData.value.list[0] + formData.value.remainingDays = njList.value?.remainingDays } + } /** 重置表单 */ const resetForm = () => { @@ -367,10 +370,11 @@ const resetForm = () => { type: undefined, startTime: undefined, endTime: undefined, - day: undefined, + day: 0, + remainingDays: 0, filePath: undefined, userName: '', - deptId: '', + deptId: undefined, deptName: '', processInstanceId: undefined, userId: undefined, diff --git a/src/views/Home/qjgl/QjglDetail.vue b/src/views/Home/qjgl/QjglDetail.vue index cff6faf..12a2d1c 100644 --- a/src/views/Home/qjgl/QjglDetail.vue +++ b/src/views/Home/qjgl/QjglDetail.vue @@ -8,12 +8,12 @@ label-width="100px" v-loading="formLoading" > - + @@ -22,59 +22,68 @@ - - + + + + - + + + + - + + + + + + - @@ -108,6 +117,7 @@ const formData = ref({ startTime: undefined, endTime: undefined, day: undefined, + remainingDays: undefined, filePath: undefined, userName: undefined, deptId: undefined, @@ -186,6 +196,7 @@ const resetForm = () => { startTime: undefined, endTime: undefined, day: undefined, + remainingDays: undefined, filePath: undefined, userName: undefined, deptId: undefined,