diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
index 37995773..efdb877a 100644
--- a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
@@ -679,6 +679,7 @@ export default {
case 'absent_half': return '半天旷工'
case 'absent_full': return '全天旷工'
case 'abnormal': return '迟到/早退'
+ case 'missed': return '未打卡'
default: return '无'
}
},
diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue
index 50406eff..e010e378 100644
--- a/klp-ui/src/views/wms/report/template/action.vue
+++ b/klp-ui/src/views/wms/report/template/action.vue
@@ -5,27 +5,21 @@
-
+
-
+
-
+
-
+
@@ -74,22 +68,27 @@
placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
-
-
+
查询
- 导出产出钢卷
- 导出消耗钢卷
+ 导出产出钢卷
+ 导出消耗钢卷
列设置
- 保存产出报表
- 保存消耗报表
+ 保存产出报表
+ 保存消耗报表
@@ -465,12 +464,13 @@ export default {
},
async getList() {
this.loading = true;
-
+
// 所有报表类型都使用原始的 listPendingAction 方式获取数据
const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
// 获取两层数据
const lossIds = res.rows.filter(item => item.coilId).map(item => item.coilId);
const lossActionIds = res.rows.filter(item => item.actionId).map(item => item.actionId);
+ this.actionIds = lossActionIds.join(',')
// 使用new Set去重
const outIds = [...new Set(res.rows.filter(item => item.processedCoilIds).map(item => item.processedCoilIds))];
@@ -558,15 +558,10 @@ export default {
if (['day', 'month', 'year'].includes(this.reportType)) {
fileName = `materialCoil_${this.queryParams.date || ''}_${new Date().getTime()}.xlsx`;
}
- if (this.reportType === 'loss' || this.reportType === 'team') {
- this.download('wms/materialCoil/export', {
- actionIds: this.actionIds
- }, fileName)
- } else {
- this.download('wms/materialCoil/export', {
- coilIds: this.lossList.map(item => item.coilId).join(',')
- }, fileName)
- }
+
+ this.download('wms/materialCoil/export', {
+ actionIds: this.actionIds
+ }, fileName)
},
// 保存产出报表
saveOutputReport() {