From 66f0b3fdd742201250e54c364f7ab9a6af781265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Fri, 5 Jun 2026 10:44:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E4=B8=89?=
 =?UTF-8?q?=E5=A4=84=E4=B8=9A=E5=8A=A1=E6=98=BE=E7=A4=BA=E4=B8=8E=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复异常报表接口数据字段使用错误，将rows改为data
2. 调整标签渲染PDF的图片缩放和位置，避免内容超出页面
3. 修改考勤审核页面的请假天数列标题为请假小时，匹配实际展示数据
---
 .../src/views/wms/coil/panels/LabelRender/index.vue  | 12 +++++++-----
 .../src/views/wms/hrm/attendance/attendanceCheck.vue |  4 ++--
 klp-ui/src/views/wms/report/abnormal.vue             |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
index 9fa79e5e..23527b6b 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -318,13 +318,15 @@ export default {
         // 确保页面尺寸正确：宽100mm，高80mm（横向）
         const page = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
 
-        // 直接拉伸填充整个PDF页面，不留边距，确保占满整张纸
-        // 从(0,0)开始，直接填充整个页面尺寸
+        // 缩放到原尺寸的95%，原点为左上
+        const scaleFactor = 0.95;
+        const imgWidth = pageWidthPt * scaleFactor;
+        const imgHeight = pageHeightPt * scaleFactor;
         page.drawImage(imgPng, { 
           x: 0, 
-          y: 0, 
-          width: pageWidthPt, 
-          height: pageHeightPt 
+          y: pageHeightPt - imgHeight,
+          width: imgWidth, 
+          height: imgHeight 
         });
 
         const pdfBytes = await pdfDoc.save();
diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
index 1716ea73..b7d3558c 100644
--- a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
@@ -73,7 +73,7 @@
         <el-table-column prop="applicantDeptName" label="部门" />
         <el-table-column prop="startTime" label="开始时间" />
         <el-table-column prop="endTime" label="结束时间" />
-        <el-table-column prop="leaveDays" label="请假天数" />
+        <el-table-column prop="leaveDays" label="请假小时" />
         <el-table-column prop="leaveReason" label="请假原因" />
         <el-table-column prop="approvalStatus" label="审批状态">
           <template slot-scope="scope">
@@ -342,7 +342,7 @@
         <el-table-column prop="leaveType" label="请假类型" width="100" />
         <el-table-column prop="startTime" label="开始时间" width="150" />
         <el-table-column prop="endTime" label="结束时间" width="150" />
-        <el-table-column prop="leaveDays" label="天数" width="80" />
+        <el-table-column prop="leaveDays" label="小时" width="80" />
         <el-table-column prop="leaveReason" label="原因" />
         <el-table-column prop="approvalStatus" label="状态" width="100">
           <template slot-scope="scope">
diff --git a/klp-ui/src/views/wms/report/abnormal.vue b/klp-ui/src/views/wms/report/abnormal.vue
index ce6269e3..7a47b602 100644
--- a/klp-ui/src/views/wms/report/abnormal.vue
+++ b/klp-ui/src/views/wms/report/abnormal.vue
@@ -273,7 +273,7 @@ export default {
       this.loading = true;
       const actions = await listLightPendingAction({ ...this.queryParams, actionTypes: this.actionTypes, actionStatus: 2 });
 
-      const outIds = actions.rows.map(item => item.processedCoilIds).join(',');
+      const outIds = actions.data.map(item => item.processedCoilIds).join(',');
 
       if (!outIds) {
         this.outList = []