fix(wms): 修复三处业务显示与逻辑不一致问题
1. 修复异常报表接口数据字段使用错误,将rows改为data 2. 调整标签渲染PDF的图片缩放和位置,避免内容超出页面 3. 修改考勤审核页面的请假天数列标题为请假小时,匹配实际展示数据
This commit is contained in:
@@ -318,13 +318,15 @@ export default {
|
|||||||
// 确保页面尺寸正确:宽100mm,高80mm(横向)
|
// 确保页面尺寸正确:宽100mm,高80mm(横向)
|
||||||
const page = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
|
const page = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
|
||||||
|
|
||||||
// 直接拉伸填充整个PDF页面,不留边距,确保占满整张纸
|
// 缩放到原尺寸的95%,原点为左上
|
||||||
// 从(0,0)开始,直接填充整个页面尺寸
|
const scaleFactor = 0.95;
|
||||||
|
const imgWidth = pageWidthPt * scaleFactor;
|
||||||
|
const imgHeight = pageHeightPt * scaleFactor;
|
||||||
page.drawImage(imgPng, {
|
page.drawImage(imgPng, {
|
||||||
x: 0,
|
x: 0,
|
||||||
y: 0,
|
y: pageHeightPt - imgHeight,
|
||||||
width: pageWidthPt,
|
width: imgWidth,
|
||||||
height: pageHeightPt
|
height: imgHeight
|
||||||
});
|
});
|
||||||
|
|
||||||
const pdfBytes = await pdfDoc.save();
|
const pdfBytes = await pdfDoc.save();
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
<el-table-column prop="applicantDeptName" label="部门" />
|
<el-table-column prop="applicantDeptName" label="部门" />
|
||||||
<el-table-column prop="startTime" label="开始时间" />
|
<el-table-column prop="startTime" label="开始时间" />
|
||||||
<el-table-column prop="endTime" 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="leaveReason" label="请假原因" />
|
||||||
<el-table-column prop="approvalStatus" label="审批状态">
|
<el-table-column prop="approvalStatus" label="审批状态">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -342,7 +342,7 @@
|
|||||||
<el-table-column prop="leaveType" label="请假类型" width="100" />
|
<el-table-column prop="leaveType" label="请假类型" width="100" />
|
||||||
<el-table-column prop="startTime" label="开始时间" width="150" />
|
<el-table-column prop="startTime" label="开始时间" width="150" />
|
||||||
<el-table-column prop="endTime" 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="leaveReason" label="原因" />
|
||||||
<el-table-column prop="approvalStatus" label="状态" width="100">
|
<el-table-column prop="approvalStatus" label="状态" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|||||||
@@ -273,7 +273,7 @@ export default {
|
|||||||
this.loading = true;
|
this.loading = true;
|
||||||
const actions = await listLightPendingAction({ ...this.queryParams, actionTypes: this.actionTypes, actionStatus: 2 });
|
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) {
|
if (!outIds) {
|
||||||
this.outList = []
|
this.outList = []
|
||||||
|
|||||||
Reference in New Issue
Block a user