From 428b72ef3d3de2aa52bfb73057181f222a817752 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 17 Nov 2024 10:56:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                   | 2 +-
 language/original-api.txt                            | 4 ++++
 language/original-web.txt                            | 5 ++++-
 resources/assets/js/pages/manage/approve/details.vue | 4 ++--
 resources/assets/js/pages/manage/approve/index.vue   | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5466d6a61..f80c1c421 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -147,7 +147,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "kuaifan/dooapprove:0.1.3"
+    image: "kuaifan/dooapprove:0.1.5"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       MYSQL_HOST: "${DB_HOST}"
diff --git a/language/original-api.txt b/language/original-api.txt
index 04b7d2f4f..ecbb9dd25 100644
--- a/language/original-api.txt
+++ b/language/original-api.txt
@@ -736,3 +736,7 @@ webhook地址最长仅支持255个字符。
 
 新会议
 加入会议
+
+产检假
+其他
+
diff --git a/language/original-web.txt b/language/original-web.txt
index 2a8618123..0075b56e6 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1789,4 +1789,7 @@ WiFi签到延迟时长为±1分钟。
 错误的定位签到。
 
 正在会议中，无法进入其他会议室
-正在安装更新，请稍候...
\ No newline at end of file
+正在安装更新，请稍候...
+
+产检假
+其他
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index fb028db4e..744372eef 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -326,10 +326,10 @@ export default {
                 const minutes = Math.floor(timeDiff / 60);
                 return {time: minutes, unit: this.$L('分钟')};
             } else if (timeDiff < 3600 * 24) {
-                const hours = Math.floor(timeDiff / 60 / 60);
+                const hours = Math.floor(timeDiff / 60 / 60 * 10) / 10;
                 return {time: hours, unit: this.$L('小时')};
             } else {
-                const days = Math.floor(timeDiff / 60 / 60 / 24);
+                const days = Math.floor(timeDiff / 60 / 60 / 24 * 10) / 10;
                 return {time: days + 1, unit: this.$L('天')};
             }
         },
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 8d6078b78..73f18ad7e 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -334,7 +334,7 @@ export default {
                 endTime: {type: 'string', required: true, message: this.$L('请选择结束时间！'), trigger: 'change'},
                 description: {type: 'string', required: true, message: this.$L('请输入事由！'), trigger: 'change'},
             },
-            selectTypes: ["年假", "事假", "病假", "调休", "产假", "陪产假", "婚假", "丧假", "哺乳假"],
+            selectTypes: ["年假", "事假", "病假", "调休", "产假", "陪产假", "婚假", "丧假", "哺乳假", "产检假", "其他"],
 
             //
             showDateTime: false