no message

language/original-web.txt

@@ -873,9 +873,6 @@ Pro版
 颜色
 黄色
 默认
-3天
-5天
-7天
 一
 三
 二
@@ -1825,3 +1822,6 @@ WiFi签到延迟时长为±1分钟。
 指定人员最多可选择200人
 禁止打包下载文件。
 文件设置
+
+今天下班前
+明天下班前

language/translate.json

@@ -11303,42 +11303,6 @@
         "id": "Default",
         "ru": "По умолчанию"
     },
-    {
-        "key": "3天",
-        "zh": "",
-        "zh-CHT": "3天",
-        "en": "3 days",
-        "ko": "3일",
-        "ja": "3日間",
-        "de": "3 Tage",
-        "fr": "3 jours",
-        "id": "3 hari",
-        "ru": "3 дня"
-    },
-    {
-        "key": "5天",
-        "zh": "",
-        "zh-CHT": "5天",
-        "en": "5 days",
-        "ko": "5일",
-        "ja": "5日間",
-        "de": "5 Tage",
-        "fr": "5 jours",
-        "id": "5 hari",
-        "ru": "5 дней"
-    },
-    {
-        "key": "7天",
-        "zh": "",
-        "zh-CHT": "7天",
-        "en": "7 days",
-        "ko": "7일",
-        "ja": "7日間",
-        "de": "7 Tage",
-        "fr": "7 jours",
-        "id": "7 hari",
-        "ru": "7 дней"
-    },
     {
         "key": "一",
         "zh": "",
@@ -26974,5 +26938,29 @@
         "fr": "Cette fonctionnalité est désactivée",
         "id": "Fitur ini dinonaktifkan",
         "ru": "Эта функция отключена"
+    },
+    {
+        "key": "今天下班前",
+        "zh": "",
+        "zh-CHT": "今天下班前",
+        "en": "Today EOD",
+        "ko": "오늘 업무종료",
+        "ja": "本日終業まで",
+        "de": "Heute COB",
+        "fr": "Aujourd'hui COB",
+        "id": "Hari ini COB",
+        "ru": "Сегодня КРД"
+    },
+    {
+        "key": "明天下班前",
+        "zh": "",
+        "zh-CHT": "明天下班前",
+        "en": "Tomorrow EOD",
+        "ko": "내일 업무종료",
+        "ja": "明日終業まで",
+        "de": "Morgen COB",
+        "fr": "Demain COB",
+        "id": "Besok COB",
+        "ru": "Завтра КРД"
     }
 ]

resources/assets/js/pages/manage/components/TaskDetail.vue

@@ -646,7 +646,7 @@ export default {
             delayTaskQuicks: [],
             delayTaskForm: {
                 type: "hour",
-                time: "24",
+                time: 24,
                 remark: ""
             },
             delayTaskRule: {
@@ -668,8 +668,8 @@ export default {
             this.navActive = navActive;
         }
         $A.IDBJson('delayTaskForm').then(data => {
+            data.time && this.$set(this.delayTaskForm, 'time', Math.round(time * 100) / 100);
             data.type && this.$set(this.delayTaskForm, 'type', data.type);
-            data.time && this.$set(this.delayTaskForm, 'time', data.time);
         });
     },
 
@@ -1811,11 +1811,11 @@ export default {
                         {time: 5, type: 'day', name: '5天'},
                     ];
                     const offDuty = $A.dayjs(`${$A.dayjs().format('YYYY-MM-DD')} ${this.systemConfig.task_default_time[1]}`)
-                    const diffEnd = offDuty.diff($A.dayjs(this.taskDetail.end_at), 'hour', true).toFixed(1)
+                    const diffEnd = offDuty.diff($A.dayjs(this.taskDetail.end_at), 'hour', true).toFixed(2)
                     const diffEnd2 = offDuty.diff($A.dayjs(this.taskDetail.end_at).subtract(1, 'day'), 'day', true).toFixed(2)
                     const quickEnd = {time: diffEnd, type: 'hour', name: `今天下班前`}
                     const quickEnd2 = {time: diffEnd2, type: 'day', name: `明天下班前`}
-                    if (quickEnd.time > 24) {
+                    if (quickEnd.time >= 24) {
                         quickEnd.type = 'day'
                         quickEnd.time = (quickEnd.time / 24).toFixed(2)
                     }
@@ -1837,7 +1837,15 @@ export default {
                 if (!valid) {
                     return
                 }
-                const endAt = $A.dayjs(this.taskDetail.end_at).add(this.delayTaskForm.time, this.delayTaskForm.type)
+                let {type, time} = this.delayTaskForm
+                if (type === 'day') {
+                    type = 'minute'
+                    time = time * 24 * 60
+                } else if (type === 'hour') {
+                    type = 'minute'
+                    time = time * 60
+                }
+                const endAt = $A.dayjs(this.taskDetail.end_at).add(time, type)
                 this.updateData('times', {
                     start_at: this.taskDetail.start_at,
                     end_at: endAt.format('YYYY-MM-DD HH:mm:ss'),
@@ -1879,7 +1887,7 @@ export default {
         },
 
         onTaskQuick(time, type) {
-            this.$set(this.delayTaskForm, 'time', time)
+            this.$set(this.delayTaskForm, 'time', Math.round(time * 100) / 100)
             this.$set(this.delayTaskForm, 'type', type)
         }
     }