Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/report/template/action.vue

@@ -321,8 +321,8 @@ export default {
       queryParams: {
         startTime: start,
         endTime: end,
-        byCreateTimeStart: start,
-        byCreateTimeEnd: end,
+        // byCreateTimeStart: start,
+        // byCreateTimeEnd: end,
         enterCoilNo: '',
         currentCoilNo: '',
         warehouseId: '',
@@ -465,9 +465,9 @@ export default {
       // 所有报表类型都使用原始的 listPendingAction 方式获取数据
       const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
       // 获取两层数据
-      const lossIds = res.rows.map(item => item.coilId);
+      const lossIds = res.rows.filter(item => item.coilId).map(item => item.coilId);
       // 使用new Set去重
-      const outIds = [...new Set(res.rows.map(item => item.processedCoilIds))];
+      const outIds = [...new Set(res.rows.filter(item => item.processedCoilIds).map(item => item.processedCoilIds))];
 
       if (lossIds.length === 0 || outIds.length === 0) {
         this.$message({