feat: 多页面新增功能与修复数据展示问题

1. 为PlanSheetList添加loading状态与容器绑定 2. 为拉矫报表系列页面新增仓库选项传递与参数绑定 3. 修复APS计划单表格字段映射路径错误 4. 优化wms报表模板接口调用参数与组件props定义 5. 完善crm订单详情提示信息与注释代码
2026-05-15 09:16:15 +08:00
parent 3d62ebf952
commit aa6fa77842
11 changed files with 71 additions and 40 deletions
--- a/klp-ui/src/views/wms/report/lajiao/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/lajiao/comprehensive.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'all',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/day.vue
+++ b/klp-ui/src/views/wms/report/lajiao/day.vue
@@ -3,6 +3,7 @@
    :actionType="actionType"
    :reportType="reportType"
    :productionLine="productionLine"
+    :warehouseOptions="warehouseOptions"
  />
 </template>

@@ -19,6 +20,13 @@ export default {
      actionType: 503,
      reportType: 'day',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/loss.vue
+++ b/klp-ui/src/views/wms/report/lajiao/loss.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'loss',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/month.vue
+++ b/klp-ui/src/views/wms/report/lajiao/month.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'month',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/out.vue
+++ b/klp-ui/src/views/wms/report/lajiao/out.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'out',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/team.vue
+++ b/klp-ui/src/views/wms/report/lajiao/team.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'team',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/year.vue
+++ b/klp-ui/src/views/wms/report/lajiao/year.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>

 <script>
@@ -19,6 +15,13 @@ export default {
      actionType: 503,
      reportType: 'year',
      productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
    }
  }
 }
--- a/klp-ui/src/views/wms/report/template/action.vue
+++ b/klp-ui/src/views/wms/report/template/action.vue
@@ -230,6 +230,10 @@ export default {
    reportType: {
      type: String,
      default: 'day', // day | month | year | all | team | out | loss
+    },
+    warehouseOptions: {
+      type: Array,
+      default: () => []
    }
  },
  components: {
@@ -480,8 +484,8 @@ export default {
      }

      const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }),
-        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '', selectType: 'raw_material' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', selectType: 'product' }),
      ]);

      // 根据 reportType 决定填充哪些数据