github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-15 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化审批功能

Browse Source
This commit is contained in:
kuaifan 2024-11-17 10:56:50 +08:00
parent b78d92b387
commit 428b72ef3d
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -147,7 +147,7 @@ services:
approve: approve:
container_name: "dootask-approve-${APP_ID}" container_name: "dootask-approve-${APP_ID}"
image: "kuaifan/dooapprove:0.1.3" image: "kuaifan/dooapprove:0.1.5"
environment: environment:
TZ: "${TIMEZONE:-PRC}" TZ: "${TIMEZONE:-PRC}"
MYSQL_HOST: "${DB_HOST}" MYSQL_HOST: "${DB_HOST}"

4
language/original-api.txt
View File

@ -736,3 +736,7 @@ webhook地址最长仅支持255个字符。
新会议 新会议
加入会议 加入会议
产检假
其他

3
language/original-web.txt
View File

@ -1790,3 +1790,6 @@ WiFi签到延迟时长为±1分钟。
正在会议中，无法进入其他会议室 正在会议中，无法进入其他会议室
正在安装更新，请稍候... 正在安装更新，请稍候...
产检假
其他

4
resources/assets/js/pages/manage/approve/details.vue
View File

@ -326,10 +326,10 @@ export default {
const minutes = Math.floor(timeDiff / 60); const minutes = Math.floor(timeDiff / 60);
return {time: minutes, unit: this.$L('分钟')}; return {time: minutes, unit: this.$L('分钟')};
} else if (timeDiff < 3600 * 24) { } 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('小时')}; return {time: hours, unit: this.$L('小时')};
} else { } 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('天')}; return {time: days + 1, unit: this.$L('天')};
} }
}, },

2
resources/assets/js/pages/manage/approve/index.vue
View File

@ -334,7 +334,7 @@ export default {
endTime: {type: 'string', required: true, message: this.$L('请选择结束时间！'), trigger: 'change'}, endTime: {type: 'string', required: true, message: this.$L('请选择结束时间！'), trigger: 'change'},
description: {type: 'string', required: true, message: this.$L('请输入事由！'), trigger: 'change'}, description: {type: 'string', required: true, message: this.$L('请输入事由！'), trigger: 'change'},
}, },
selectTypes: ["年假", "事假", "病假", "调休", "产假", "陪产假", "婚假", "丧假", "哺乳假"], selectTypes: ["年假", "事假", "病假", "调休", "产假", "陪产假", "婚假", "丧假", "哺乳假", "产检假", "其他"],
// //
showDateTime: false showDateTime: false