no message

app/Http/Controllers/Api/ApproveController.php

@@ -816,7 +816,7 @@ class ApproveController extends AbstractController
             // 计算审批耗时
             $startTime = Carbon::parse($val['start_time'])->timestamp;
             $endTime = $val['end_time'] ? Carbon::parse($val['end_time'])->timestamp : time();
-            $approval_time = Base::timeDiff($startTime, $endTime); // 审批耗时
+            $approval_time = Doo::translate(Base::timeDiff($startTime, $endTime)); // 审批耗时
             // 计算时长
             $varStartTime = Carbon::parse($val['var']['start_time']);
             $varEndTime = Carbon::parse($val['var']['end_time']);

app/Http/Controllers/Api/ProjectController.php

@@ -1281,7 +1281,7 @@ class ProjectController extends AbstractController
                         if ($residueTime < 0) {
                             $overTime = Doo::translate(Base::timeFormat(abs($residueTime)));
                         }
-                        $planTime = Base::timeDiff($startTime, $endTime);
+                        $planTime = Doo::translate(Base::timeDiff($startTime, $endTime));
                     }
                     $actualTime = $task->complete_at ? $totalTime : 0; // 实际完成用时
                     $statusText = '未完成';
@@ -1321,7 +1321,7 @@ class ProjectController extends AbstractController
                         $task->end_at ?: '-',
                         $task->complete_at ?: '-',
                         $task->archived_at ?: '-',
-                        $planTime ?: '-',
+                        $planTime,
                         $actualTime ? Doo::translate(Base::timeFormat($actualTime)) : '-',
                         $overTime,
                         $developTime > 0 ? Doo::translate(Base::timeFormat($developTime)) : '-',
@@ -1466,7 +1466,7 @@ class ProjectController extends AbstractController
                         if ($residueTime < 0) {
                             $overTime = Doo::translate(Base::timeFormat(abs($residueTime)));
                         }
-                        $planTime = Base::timeDiff($startTime, $endTime);
+                        $planTime = Doo::translate(Base::timeDiff($startTime, $endTime));
                     }
                     $ownerIds = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
                     $ownerNames = [];
@@ -1480,7 +1480,7 @@ class ProjectController extends AbstractController
                         Base::filterEmoji($task->name),
                         $task->start_at ?: '-',
                         $task->end_at ?: '-',
-                        $planTime ?: '-',
+                        $planTime,
                         $overTime,
                         implode("、", $ownerNames),
                         Base::filterEmoji(User::userid2nickname($task->userid)) . " (ID: {$task->userid})",

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   php:
     container_name: "dootask-php-${APP_ID}"
-    image: "kuaifan/php:swoole-8.0.rc16"
+    image: "kuaifan/php:swoole-8.0.rc17"
     shm_size: "2gb"
     ulimits:
       core:
@@ -147,7 +147,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "kuaifan/dooapprove:0.1.2"
+    image: "kuaifan/dooapprove:0.1.3"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       MYSQL_HOST: "${DB_HOST}"

language/original-web.txt

@@ -1740,3 +1740,6 @@ WiFi签到延迟时长为±1分钟。
 请选择文字后再操作
 插入链接
 请输入完整的链接地址
+
+自动通过,审批人与发起人为同一人
+自动通过,审批人已审核

language/translate.json

@@ -14007,13 +14007,13 @@
         "key": "自动通过,审批人与发起人为同一人",
         "zh": "",
         "zh-CHT": "自動通過,審批人與發起人為同一人",
-        "en": "Auto-approve if approver and initiator are the same person",
-        "ko": "승인자와 시작자가 동일인일 경우 자동 승인",
-        "ja": "承認者と発起者が同一人物の場合、自動承認",
-        "de": "Automatisch genehmigen, wenn Genehmiger und Initiator dieselbe Person sind",
-        "fr": "Approbation automatique si l'approbateur et l'initiateur sont la même personne",
-        "id": "Persetujuan otomatis jika pemberi persetujuan dan pemohon adalah orang yang sama",
-        "ru": "Автоматическое утверждение, если утверждающий и инициатор - одно и то же лицо"
+        "en": "Auto-approved, the approver is the same person as the initiator",
+        "ko": "자동 승인, 승인자와 신청자가 동일인",
+        "ja": "自動承認、承認者と申請者が同一人物",
+        "de": "Automatisch genehmigt, Genehmiger und Antragsteller sind dieselbe Person",
+        "fr": "Approuvé automatiquement, l'approbateur est la même personne que l'initiateur",
+        "id": "Disetujui otomatis, pemberi persetujuan adalah orang yang sama dengan pemohon",
+        "ru": "Автоматически одобрено, утверждающий и инициатор - одно и то же лицо"
     },
     {
         "key": "您当前未加入任何部门，不能发起！",
@@ -25738,5 +25738,17 @@
         "fr": "(*)min",
         "id": "(*)m",
         "ru": "(*)мин"
+    },
+    {
+        "key": "自动通过,审批人已审核",
+        "zh": "",
+        "zh-CHT": "自動通過,審批人已審核",
+        "en": "Auto-approved, the approver has reviewed",
+        "ko": "자동 승인, 승인자가 이미 검토함",
+        "ja": "自動承認、承認者が既に審査済み",
+        "de": "Automatisch genehmigt, der Genehmiger hat bereits geprüft",
+        "fr": "Approuvé automatiquement, l'approbateur a déjà examiné",
+        "id": "Disetujui otomatis, pemberi persetujuan telah melakukan peninjauan",
+        "ru": "Автоматически одобрено, утверждающий уже выполнил проверку"
     }
 ]

resources/assets/js/pages/manage/approve/details.vue

@@ -110,7 +110,7 @@
                                 <p>{{item.claim_time?.substr(0,16)}}</p>
                             </div>
                         </div>
-                        <p class="comment" v-if="item.identitylink?.comment"><span>“{{ item.identitylink?.comment  }}”</span></p>
+                        <p class="comment" v-if="item.identitylink?.comment"><span>“{{ item.identitylink?.is_system ? $L(item.identitylink?.comment) : item.identitylink?.comment  }}”</span></p>
                     </TimelineItem>
 
                     <!-- 抄送 -->
@@ -143,7 +143,7 @@
                 </template>
             </Timeline>
 
-            <template v-if="datas.global_comments">
+            <template v-if="$A.arrayLength(datas.global_comments) > 0">
                 <Divider/>
                 <h3 class="approve-details-subtitle">{{$L('全文评论')}}</h3>
                 <div class="approve-record-comment">