From 69d2c4acc357d949ce534365318b18ec758ca0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 18 Mar 2026 13:36:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(hrm):=20=E5=B0=86=E8=AF=B7=E5=81=87?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=8D=95=E4=BD=8D=E4=BB=8E=E5=A4=A9=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改所有相关组件中的请假时长显示单位，从"天"改为"小时"，包括图表、表格和表单中的标签。同时调整时间差计算逻辑，直接计算小时数而非天数。
---
 klp-ui/src/views/wms/hrm/apply/leave.vue                 | 6 +++---
 klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue   | 4 ++--
 klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue | 2 +-
 klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue  | 4 ++--
 klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue   | 2 +-
 klp-ui/src/views/wms/hrm/records/leave.vue               | 4 ++--
 klp-ui/src/views/wms/hrm/todo/index.vue                  | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/klp-ui/src/views/wms/hrm/apply/leave.vue b/klp-ui/src/views/wms/hrm/apply/leave.vue
index d1f81c85..c2881e38 100644
--- a/klp-ui/src/views/wms/hrm/apply/leave.vue
+++ b/klp-ui/src/views/wms/hrm/apply/leave.vue
@@ -49,7 +49,7 @@
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="请假天数" :prop="`list[${index}].leaveDays`" :rules="rules.listItem.leaveDays">
+              <el-form-item label="请假小时" :prop="`list[${index}].leaveDays`" :rules="rules.listItem.leaveDays">
                 <el-input v-model="item.leaveDays" placeholder="选择时间后自动计算，也可手动修改" />
               </el-form-item>
               <el-form-item label="请假原因" :prop="`list[${index}].leaveReason`" :rules="rules.listItem.leaveReason">
@@ -126,7 +126,7 @@
               </template>
             </el-table-column>
             <el-table-column label="具体原因" align="center" prop="leaveReason" show-overflow-tooltip />
-            <el-table-column label="请假天数" align="center" prop="leaveDays" />
+            <el-table-column label="请假小时" align="center" prop="leaveDays" />
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope" v-if="scope.row.approvalStatus === '待审批'">
                 <el-button icon="el-icon-edit" size="mini" @click="handleEdit(scope.row)">修改</el-button>
@@ -459,7 +459,7 @@ export default {
         }
         // 计算时间差(毫秒) → 转天 → 保留2位小数
         const diffTime = end - start;
-        const diffDays = (diffTime / (1000 * 60 * 60 * 24)).toFixed(2);
+        const diffDays = parseInt(diffTime / (1000 * 60 * 60));
         // 赋值到对应行的天数输入框
         item.leaveDays = diffDays;
       }
diff --git a/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue
index a51f316c..41f93545 100644
--- a/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue
+++ b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue
@@ -27,13 +27,13 @@ export default {
       const option = {
         title: { text: '按部门请假统计', left: 'center', textStyle: { fontSize: 14 } },
         tooltip: { trigger: 'axis' },
-        legend: { data: ['请假记录数', '请假总天数'], top: 30 },
+        legend: { data: ['请假记录数', '请假总小时'], top: 30 },
         grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
         xAxis: [{ type: 'category', data: this.chartData.xAxis }],
         yAxis: [{ type: 'value' }],
         series: [
           { name: '请假记录数', type: 'bar', data: this.chartData.countData, barWidth: '30%' },
-          { name: '请假总天数', type: 'bar', data: this.chartData.dayData, barWidth: '30%' }
+          { name: '请假总小时', type: 'bar', data: this.chartData.dayData, barWidth: '30%' }
         ]
       };
       this.chart.setOption(option);
diff --git a/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue
index 2291d07b..363053bb 100644
--- a/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue
+++ b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue
@@ -3,7 +3,7 @@
     :row-key="'leaveId'" :tree-props="{ children: 'children' }" default-expand-all>
     <el-table-column prop="userName" label="请假人" align="center" width="120" />
     <el-table-column label="请假总次数" align="center" prop="leaveCount"></el-table-column>
-    <el-table-column label="请假总时长(天)" align="center" prop="leaveDays"></el-table-column>
+    <el-table-column label="请假总时长(小时)" align="center" prop="leaveDays"></el-table-column>
     <el-table-column prop="leaveType" label="请假类型" align="center" width="120" />
     <el-table-column prop="leaveDays" label="请假时长(天)" align="center" width="120" />
     <el-table-column prop="leaveReason" label="请假理由" align="center" show-overflow-tooltip />
diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue
index e3eff65c..8acd2b07 100644
--- a/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue
+++ b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue
@@ -42,13 +42,13 @@ export default {
       const option = {
         title: { text: '按时间请假统计', left: 'center', textStyle: { fontSize: 14 } },
         tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { data: ['请假记录数', '请假总天数'], top: 30 },
+        legend: { data: ['请假记录数', '请假总小时'], top: 30 },
         grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
         xAxis: [{ type: 'category', data: this.chartData.xAxis }],
         yAxis: [{ type: 'value' }],
         series: [
           { name: '请假记录数', type: 'line', data: this.chartData.countData, smooth: true },
-          { name: '请假总天数', type: 'line', data: this.chartData.dayData, smooth: true }
+          { name: '请假总小时', type: 'line', data: this.chartData.dayData, smooth: true }
         ]
       };
       this.chart.setOption(option);
diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue
index 0491445d..876d85db 100644
--- a/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue
+++ b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue
@@ -39,7 +39,7 @@ export default {
             label: { show: true, fontSize: 12 }
           },
           {
-            name: '请假天数占比',
+            name: '请假小时占比',
             type: 'pie',
             radius: ['20%', '40%'],
             center: ['75%', '60%'],
diff --git a/klp-ui/src/views/wms/hrm/records/leave.vue b/klp-ui/src/views/wms/hrm/records/leave.vue
index 47718f9c..89ac3a88 100644
--- a/klp-ui/src/views/wms/hrm/records/leave.vue
+++ b/klp-ui/src/views/wms/hrm/records/leave.vue
@@ -79,7 +79,7 @@
         </template>
       </el-table-column>
       <el-table-column label="具体原因" align="center" prop="leaveReason" show-overflow-tooltip />
-      <el-table-column label="请假天数" align="center" prop="leaveDays" />
+      <el-table-column label="请假小时" align="center" prop="leaveDays" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -122,7 +122,7 @@
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="请假天数" prop="leaveDays">
+        <el-form-item label="请假小时" prop="leaveDays">
           <el-input v-model="form.leaveDays" placeholder="选择时间后自动计算，也可手动修改" />
         </el-form-item>
         <el-form-item label="请假原因" prop="leaveReason">
diff --git a/klp-ui/src/views/wms/hrm/todo/index.vue b/klp-ui/src/views/wms/hrm/todo/index.vue
index 3495565f..fd351f5e 100644
--- a/klp-ui/src/views/wms/hrm/todo/index.vue
+++ b/klp-ui/src/views/wms/hrm/todo/index.vue
@@ -179,7 +179,7 @@
           <el-descriptions-item label="请假开始时间">{{ formatTime(currentDetail.startTime) || '-' }}</el-descriptions-item>
           <el-descriptions-item label="请假结束时间">{{ formatTime(currentDetail.endTime) || '-' }}</el-descriptions-item>
           <el-descriptions-item label="请假班次">{{ currentDetail.leaveShift || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="请假天数">{{ currentDetail.leaveDays || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="请假小时">{{ currentDetail.leaveDays || '-' }}</el-descriptions-item>
           <el-descriptions-item label="请假原因">{{ currentDetail.leaveReason || '-' }}</el-descriptions-item>
           <el-descriptions-item label="备注">{{ currentDetail.remark || '-' }}</el-descriptions-item>
           <el-descriptions-item label="附件">