chengc 1 Minggu lalu
induk
melakukan
f470a2393a

+ 11 - 11
assets/i18n/en.json

@@ -307,8 +307,8 @@
     "scopeSubordinates": "Subordinate Approvals"
   },
   "expenseApply": {
-    "expenseApplyList": "Expense Application List",
-    "expenseApplyDetail": "Expense Application Details",
+    "expenseApplyList": "Expense Applications",
+    "expenseApplyDetail": "Expense Apply",
     "statusConvertedToExpense": "Converted to Expense",
     "expenseApplyRequest": "Expense Application",
     "expenseApplyImport": "Import Approved Applications",
@@ -319,7 +319,7 @@
     "searchExpenseApply": "Search application no. or applicant",
     "noExpenseApplications": "No applications",
     "reportExpenseApply": "Expense Application Report",
-    "reportExpenseApplyDetail": "Expense Application Detail Report",
+    "reportExpenseApplyDetail": "Expense Apply Report",
     "emergencyLevel": "Urgency",
     "feeType": "Fee Type",
     "feeReason": "Fee Reason",
@@ -429,14 +429,14 @@
     "addExpenseDetailFirst": "Please add expense items in the details"
   },
   "expense": {
-    "expenseList": "Expense List",
+    "expenseList": "Expense Records",
     "expenseDetail": "Expense Details",
     "editExpense": "Modify Expense",
     "expenseApply": "Reimbursement",
     "searchExpense": "Search expense No. or applicant",
     "noExpenses": "No expense reports",
     "reportExpense": "Expense Report",
-    "reportExpenseDetail": "Expense Detail Report",
+    "reportExpenseDetail": "Expense Report",
     "expenseDate": "Expense Date",
     "expenseNo": "Expense No.",
     "autoGenerated": "Auto-generated",
@@ -523,8 +523,8 @@
     "paymentArchiveSuccess": "Payment and archive completed"
   },
   "overtime": {
-    "overtimeList": "Overtime Records",
-    "overtimeDetail": "Overtime Details",
+    "overtimeList": "Overtime Applications",
+    "overtimeDetail": "Overtime Apply",
     "overtimeApply": "Overtime Application",
     "overtimeRecords": "Overtime Records",
     "searchOvertime": "Search overtime no. or applicant",
@@ -532,7 +532,7 @@
     "noOvertimeApplications": "No overtime records",
     "noOvertimes": "No overtime records",
     "reportOvertime": "Overtime Report",
-    "reportOvertimeDetail": "Overtime Detail Report",
+    "reportOvertimeDetail": "Overtime Apply Report",
     "overtimeInfo": "Overtime Info",
     "overtimeType": "Overtime Type",
     "overtimeDetailReason": "Overtime Reason",
@@ -609,14 +609,14 @@
     "saturday": "Saturday"
   },
   "vehicle": {
-    "vehicleList": "Vehicle Records",
+    "vehicleList": "Vehicle Applications",
     "vehicleApply": "Vehicle Application",
-    "vehicleDetail": "Vehicle Details",
+    "vehicleDetail": "Vehicle Apply",
     "vehicleRecords": "Vehicle Records",
     "searchVehicle": "Search vehicle no. or applicant",
     "noVehicles": "No vehicle records",
     "reportVehicle": "Vehicle Report",
-    "reportVehicleDetail": "Vehicle Detail Report",
+    "reportVehicleDetail": "Vehicle Apply Report",
     "vehicleInfo": "Vehicle Info",
     "vehicleReason": "Vehicle Reason",
     "selectVehicle": "Select vehicle",

+ 10 - 10
assets/i18n/zh_CN.json

@@ -307,7 +307,7 @@
     "scopeSubordinates": "下属审批"
   },
   "expenseApply": {
-    "expenseApplyList": "报销申请列表",
+    "expenseApplyList": "报销申请记录",
     "expenseApplyDetail": "报销申请详情",
     "statusConvertedToExpense": "已转报销",
     "expenseApplyRequest": "报销申请",
@@ -319,7 +319,7 @@
     "searchExpenseApply": "搜索申请单号或申请人",
     "noExpenseApplications": "暂无报销申请",
     "reportExpenseApply": "报销申请报表",
-    "reportExpenseApplyDetail": "报销申请明细报表",
+    "reportExpenseApplyDetail": "报销申请报表",
     "emergencyLevel": "紧急程度",
     "feeType": "费用类型",
     "feeReason": "费用事由",
@@ -430,14 +430,14 @@
     "addExpenseDetailFirst": "请在明细中添加费用项"
   },
   "expense": {
-    "expenseList": "报销列表",
+    "expenseList": "报销记录",
     "expenseDetail": "报销详情",
     "editExpense": "修改报销",
     "expenseApply": "报销",
     "searchExpense": "搜索报销单号或报销人",
     "noExpenses": "暂无报销单",
     "reportExpense": "报销报表",
-    "reportExpenseDetail": "报销明细报表",
+    "reportExpenseDetail": "报销报表",
     "expenseDate": "报销日期",
     "expenseNo": "报销单号",
     "autoGenerated": "系统自动生成",
@@ -524,8 +524,8 @@
     "paymentArchiveSuccess": "打款归档成功"
   },
   "overtime": {
-    "overtimeList": "加班记录",
-    "overtimeDetail": "加班详情",
+    "overtimeList": "加班申请记录",
+    "overtimeDetail": "加班申请详情",
     "overtimeApply": "加班申请",
     "overtimeRecords": "加班记录",
     "searchOvertime": "搜索加班单号或申请人",
@@ -533,7 +533,7 @@
     "noOvertimeApplications": "暂无加班记录",
     "noOvertimes": "暂无加班记录",
     "reportOvertime": "加班报表",
-    "reportOvertimeDetail": "加班明细报表",
+    "reportOvertimeDetail": "加班申请单报表",
     "overtimeInfo": "加班信息",
     "overtimeType": "加班类型",
     "overtimeDetailReason": "加班事由",
@@ -609,14 +609,14 @@
     "saturday": "星期六"
   },
   "vehicle": {
-    "vehicleList": "用车记录",
+    "vehicleList": "用车申请记录",
     "vehicleApply": "用车申请",
-    "vehicleDetail": "用车详情",
+    "vehicleDetail": "用车申请详情",
     "vehicleRecords": "用车记录",
     "searchVehicle": "搜索用车单号或申请人",
     "noVehicles": "暂无用车记录",
     "reportVehicle": "用车报表",
-    "reportVehicleDetail": "用车明细报表",
+    "reportVehicleDetail": "用车申请单报表",
     "vehicleInfo": "用车信息",
     "vehicleReason": "用车事由",
     "selectVehicle": "选择车辆",

+ 10 - 10
assets/i18n/zh_TW.json

@@ -307,7 +307,7 @@
     "scopeSubordinates": "下属審批"
   },
   "expenseApply": {
-    "expenseApplyList": "報銷申請列表",
+    "expenseApplyList": "報銷申請記錄",
     "expenseApplyDetail": "報銷申請詳情",
     "statusConvertedToExpense": "已轉報銷",
     "expenseApplyRequest": "報銷申請",
@@ -319,7 +319,7 @@
     "searchExpenseApply": "搜索申請單號或申請人",
     "noExpenseApplications": "暫無報銷申請",
     "reportExpenseApply": "報銷申請報表",
-    "reportExpenseApplyDetail": "報銷申請明細報表",
+    "reportExpenseApplyDetail": "報銷申請報表",
     "emergencyLevel": "紧急程度",
     "feeType": "費用類型",
     "feeReason": "費用事由",
@@ -430,14 +430,14 @@
     "addExpenseDetailFirst": "請在明細中添加費用項"
   },
   "expense": {
-    "expenseList": "報销列表",
+    "expenseList": "報銷記錄",
     "expenseDetail": "報销詳情",
     "editExpense": "修改報销",
     "expenseApply": "費用報销",
     "searchExpense": "搜尋報銷單號或報銷人",
     "noExpenses": "暫無報销單",
     "reportExpense": "費用報销報表",
-    "reportExpenseDetail": "費用報销明細報表",
+    "reportExpenseDetail": "報銷單報表",
     "expenseDate": "報销日期",
     "expenseNo": "報銷單號",
     "autoGenerated": "係統自動生成",
@@ -524,8 +524,8 @@
     "paymentArchiveSuccess": "打款歸檔成功"
   },
   "overtime": {
-    "overtimeList": "加班記錄",
-    "overtimeDetail": "加班詳情",
+    "overtimeList": "加班申請記錄",
+    "overtimeDetail": "加班申請詳情",
     "overtimeApply": "加班申請",
     "overtimeRecords": "加班記錄",
     "searchOvertime": "搜索加班單號或申請人",
@@ -533,7 +533,7 @@
     "noOvertimeApplications": "暫無加班記錄",
     "noOvertimes": "暫無加班記錄",
     "reportOvertime": "加班報表",
-    "reportOvertimeDetail": "加班明細報表",
+    "reportOvertimeDetail": "加班申請單報表",
     "overtimeInfo": "加班信息",
     "overtimeType": "加班類型",
     "overtimeDetailReason": "加班事由",
@@ -609,14 +609,14 @@
     "saturday": "星期六"
   },
   "vehicle": {
-    "vehicleList": "用車記錄",
+    "vehicleList": "用車申請記錄",
     "vehicleApply": "用車申請",
-    "vehicleDetail": "用車詳情",
+    "vehicleDetail": "用車申請詳情",
     "vehicleRecords": "用車記錄",
     "searchVehicle": "搜索用車單號或申請人",
     "noVehicles": "暫無用車記錄",
     "reportVehicle": "用車報表",
-    "reportVehicleDetail": "用車明細報表",
+    "reportVehicleDetail": "用車申請單報表",
     "vehicleInfo": "用車信息",
     "vehicleReason": "用車事由",
     "selectVehicle": "選擇車辆",

+ 2 - 2
lib/features/vehicle/vehicle_apply_detail_page.dart

@@ -537,7 +537,7 @@ class _VehicleApplyDetailPageState
         FormFieldRow(
           label: l10n.get('actualReturnTime'),
           value: app.returnTime != null
-              ? du.DateUtils.formatDateTimeSec(app.returnTime!)
+              ? du.DateUtils.formatDateTime(app.returnTime!)
               : '-',
           readOnly: true,
           showArrow: false,
@@ -576,7 +576,7 @@ class _VehicleApplyDetailPageState
         FormFieldRow(
           label: l10n.get('checkDd'),
           value: app.checkDd != null
-              ? du.DateUtils.formatDateTimeSec(app.checkDd!)
+              ? du.DateUtils.formatDateTime(app.checkDd!)
               : '-',
           readOnly: true,
           showArrow: false,