DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(hrm): 将请假时长单位从天改为小时

Browse Source 
修改所有相关组件中的请假时长显示单位，从"天"改为"小时"，包括图表、表格和表单中的标签。同时调整时间差计算逻辑，直接计算小时数而非天数。
This commit is contained in:
砂糖
2026-03-18 13:36:51 +08:00
parent 49331dcc24
commit 69d2c4acc3
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-ui/src/views/wms/hrm/apply/leave.vue
View File

@@ -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;
}

4
klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue
View File

@@ -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);

2
klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue
View File

@@ -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 />

4
klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue
View File

@@ -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);

2
klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue
View File

@@ -39,7 +39,7 @@ export default {
label: { show: true, fontSize: 12 }
},
{
name: '请假天数占比',
name: '请假小时占比',
type: 'pie',
radius: ['20%', '40%'],
center: ['75%', '60%'],

4
klp-ui/src/views/wms/hrm/records/leave.vue
View File

@@ -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">

2
klp-ui/src/views/wms/hrm/todo/index.vue
View File

@@ -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="附件">