From 4a8fc4904ff7baab45728af9e8a7159949b9198f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Tue, 19 May 2026 16:42:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms-report):=20=E6=96=B0=E5=A2=9E=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  多个报表页面新增品质筛选下拉选择器
2.  统一添加coil_quality_status字典依赖
3.  替换部分旧的逻辑库位选择组件为warehouse-select
4.  调整部分表单字段的prop属性和代码格式
---
 klp-ui/src/views/wms/report/abnormal.vue       | 12 +++++++++---
 klp-ui/src/views/wms/report/delivery.vue       | 16 +++++++---------
 klp-ui/src/views/wms/report/receive.vue        | 18 ++++++++++++------
 .../src/views/wms/report/template/action.vue   | 17 ++++++++++++-----
 .../wms/report/template/comprehensive.vue      | 15 ++++++++++-----
 klp-ui/src/views/wms/report/template/day.vue   | 11 ++++++++++-
 klp-ui/src/views/wms/report/template/loss.vue  |  6 +++++-
 klp-ui/src/views/wms/report/template/mands.vue | 13 ++++++++++---
 klp-ui/src/views/wms/report/template/merge.vue |  6 +++++-
 klp-ui/src/views/wms/report/template/month.vue | 16 ++++++++++------
 klp-ui/src/views/wms/report/template/out.vue   | 12 ++++++++++--
 klp-ui/src/views/wms/report/template/team.vue  | 12 ++++++++++--
 klp-ui/src/views/wms/report/template/year.vue  | 12 ++++++++++--
 13 files changed, 120 insertions(+), 46 deletions(-)

diff --git a/klp-ui/src/views/wms/report/abnormal.vue b/klp-ui/src/views/wms/report/abnormal.vue
index f36081df..24d5a068 100644
--- a/klp-ui/src/views/wms/report/abnormal.vue
+++ b/klp-ui/src/views/wms/report/abnormal.vue
@@ -37,6 +37,10 @@
           <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
             :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
         <el-form-item>
           <!-- <el-button type="primary" @click="getList">查询</el-button> -->
           <el-dropdown split-button type="primary" @click="getList" @command="handleCommand">
@@ -99,14 +103,16 @@
       <el-tab-pane label="产出钢卷" name="output">
         <coil-table :data="outList" :columns="outputColumns" :loading="loading" height="calc(100vh - 360px)">
           <template slot="settings">
-            <el-button icon="el-icon-setting" @click="() => {settingVisible = true; activeColumnConfig = 'coil-report-output';}">列设置</el-button>
+            <el-button icon="el-icon-setting"
+              @click="() => { settingVisible = true; activeColumnConfig = 'coil-report-output'; }">列设置</el-button>
           </template>
         </coil-table>
       </el-tab-pane>
       <el-tab-pane label="投入钢卷" name="loss">
         <coil-table :data="lossList" :columns="lossColumns" :loading="loading" height="calc(100vh - 360px)">
           <template slot="settings">
-            <el-button icon="el-icon-setting" @click="() => {settingVisible = true; activeColumnConfig = 'coil-report-loss';}">列设置</el-button>
+            <el-button icon="el-icon-setting"
+              @click="() => { settingVisible = true; activeColumnConfig = 'coil-report-loss'; }">列设置</el-button>
           </template>
         </coil-table>
       </el-tab-pane>
@@ -147,7 +153,7 @@ export default {
     ColumnsSetting,
     TimeRangePicker
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index fd892589..d3fb6ba6 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -3,14 +3,8 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="时间范围" prop="timeRange">
-          <time-range-picker
-            v-model="queryParams"
-            start-key="byExportTimeStart"
-            end-key="byExportTimeEnd"
-            :default-start-time="defaultStartTime"
-            :default-end-time="defaultEndTime"
-            @quick-select="handleQuery"
-          />
+          <time-range-picker v-model="queryParams" start-key="byExportTimeStart" end-key="byExportTimeEnd"
+            :default-start-time="defaultStartTime" :default-end-time="defaultEndTime" @quick-select="handleQuery" />
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
           <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
@@ -40,6 +34,10 @@
           <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
             :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="品质" prop="endTime">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
         <el-form-item prop="endTime">
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button type="primary" @click="exportData">导出</el-button>
@@ -93,7 +91,7 @@ export default {
     CoilTable,
     TimeRangePicker,
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index eb7b3006..4d48bf4b 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -20,26 +20,32 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="endTime">
+        <el-form-item label="逻辑库位" prop="warehouseId">
           <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
             style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
-        <el-form-item label="产品名称" prop="endTime">
+        <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="规格" prop="endTime">
+        <el-form-item label="规格" prop="itemSpecification">
           <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="材质" prop="endTime">
+        <el-form-item label="材质" prop="itemMaterial">
           <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
             placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="厂家" prop="endTime">
+        <el-form-item label="厂家" prop="itemManufacturer">
           <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
             :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
+
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
+        
         <el-form-item label="收货计划" prop="planId">
           <el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
             :remote-method="remoteMethod">
@@ -115,7 +121,7 @@ export default {
     HierarchicalPivot,
     CrossTable,
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue
index e010e378..38bc67ba 100644
--- a/klp-ui/src/views/wms/report/template/action.vue
+++ b/klp-ui/src/views/wms/report/template/action.vue
@@ -71,12 +71,19 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer"
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
-        <!-- 逻辑库位仅在 team, day, month, year, all 类型时显示 -->
-        <el-form-item v-if="['team', 'day', 'month', 'year', 'all'].includes(reportType)" label="逻辑库位"
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
+        <!-- <el-form-item v-if="['team', 'day', 'month', 'year', 'all'].includes(reportType)" label="逻辑库位"
           prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -219,7 +226,7 @@ export default {
   name: 'MergeTemplate',
   props: {
     actionType: {
-      type: Number,
+      type: [Number, String],
       required: true
     },
     productionLine: {
@@ -246,7 +253,7 @@ export default {
     ColumnsSetting,
     TimeRangePicker
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
@@ -466,7 +473,7 @@ export default {
       this.loading = true;
 
       // 所有报表类型都使用原始的 listPendingAction 方式获取数据
-      const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
+      const res = await listPendingAction({ ...this.queryParams, actionTypes: 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);
diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue
index d2b61d38..1a0abdd6 100644
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -2,8 +2,6 @@
   <div class="app-container" v-loading="loading">
     <!-- 对日期的筛选另起一行 -->
     <div style="margin-bottom: 10px;">
-      <!-- 单选按钮，用于切换视图，可以使用日视图、月视图、年视图、自定义, 默认使用自定义日期 -->
-      <!-- 日视图时选择一天, 月视图时选择一个月, 年视图时选择一年, 自定义时选择自定义时间范围 -->
       <el-radio-group v-model="viewType" @change="handleViewTypeChange">
         <el-radio-button label="day">日视图</el-radio-button>
         <el-radio-button label="month">月视图</el-radio-button>
@@ -42,10 +40,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="warehouseIds">
+        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -63,6 +65,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dictType="coil_manufacturer"
             placeholder="请选择厂家" clearable multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -86,7 +92,6 @@
       <el-descriptions-item label="数量差值">{{ summary.countDiff }}<span v-if="viewType === 'day' && yesterdaySummary.countDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.countDiff }})</span></el-descriptions-item>
       <el-descriptions-item label="总重差值">{{ summary.weightDiff }}<span v-if="viewType === 'day' && yesterdaySummary.weightDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.weightDiff }})</span></el-descriptions-item>
       <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t<span v-if="viewType === 'day' && yesterdaySummary.avgWeightDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.avgWeightDiff }}t)</span></el-descriptions-item>
-      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->
 
       <!-- 成品率 -->
       <el-descriptions-item label="成品率">{{ summary.passRate }}<span v-if="viewType === 'day' && yesterdaySummary.passRate" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.passRate }})</span></el-descriptions-item>
@@ -216,7 +221,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/day.vue b/klp-ui/src/views/wms/report/template/day.vue
index c9843b98..d123de91 100644
--- a/klp-ui/src/views/wms/report/template/day.vue
+++ b/klp-ui/src/views/wms/report/template/day.vue
@@ -14,10 +14,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="warehouseIds">
+        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -35,6 +39,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button> <!-- 统一改为handleQuery -->
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -153,6 +161,7 @@ export default {
     CoilTable,
     SplitSummary,
   },
+  dicts: ['coil_quality_status'],
   props: {
     actionTypes: {
       type: Array,
diff --git a/klp-ui/src/views/wms/report/template/loss.vue b/klp-ui/src/views/wms/report/template/loss.vue
index f7601cc3..7f3bba64 100644
--- a/klp-ui/src/views/wms/report/template/loss.vue
+++ b/klp-ui/src/views/wms/report/template/loss.vue
@@ -40,6 +40,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
           placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item prop="endTime">
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button type="primary" @click="exportData">导出</el-button>
@@ -111,7 +115,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['coil_material', 'coil_manufacturer'],
+  dicts: ['coil_quality_status'],
   data() {
     // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/mands.vue b/klp-ui/src/views/wms/report/template/mands.vue
index ce4a55f9..15e11a3c 100644
--- a/klp-ui/src/views/wms/report/template/mands.vue
+++ b/klp-ui/src/views/wms/report/template/mands.vue
@@ -42,10 +42,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="warehouseIds">
+        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -63,6 +67,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dictType="coil_manufacturer"
             placeholder="请选择厂家" clearable multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable multiple />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -163,7 +171,6 @@
 </template>
 
 <script>
-import { listCoilWithIds } from "@/api/wms/coil";
 import {
   listPendingAction,
 } from '@/api/wms/pendingAction';
@@ -216,7 +223,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/merge.vue b/klp-ui/src/views/wms/report/template/merge.vue
index f770b22c..a40ffe18 100644
--- a/klp-ui/src/views/wms/report/template/merge.vue
+++ b/klp-ui/src/views/wms/report/template/merge.vue
@@ -34,6 +34,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -147,7 +151,7 @@ export default {
     CoilTable,
     ColumnsSetting
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/month.vue b/klp-ui/src/views/wms/report/template/month.vue
index 874adc5b..6a0ddca2 100644
--- a/klp-ui/src/views/wms/report/template/month.vue
+++ b/klp-ui/src/views/wms/report/template/month.vue
@@ -14,10 +14,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="warehouseIds">
+        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -35,6 +39,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -134,10 +142,6 @@
 </template>
 
 <script>
-import { listCoilWithIds } from "@/api/wms/coil";
-import {
-  listPendingAction,
-} from '@/api/wms/pendingAction';
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -187,7 +191,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/out.vue b/klp-ui/src/views/wms/report/template/out.vue
index ba029829..923251e3 100644
--- a/klp-ui/src/views/wms/report/template/out.vue
+++ b/klp-ui/src/views/wms/report/template/out.vue
@@ -20,10 +20,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="endTime">
+        <!-- <el-form-item label="逻辑库位" prop="endTime">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="endTime">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -41,6 +45,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item prop="endTime">
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出</el-button>
@@ -110,7 +118,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
     const addZero = (num) => num.toString().padStart(2, '0')
diff --git a/klp-ui/src/views/wms/report/template/team.vue b/klp-ui/src/views/wms/report/template/team.vue
index d870b633..f2f7500b 100644
--- a/klp-ui/src/views/wms/report/template/team.vue
+++ b/klp-ui/src/views/wms/report/template/team.vue
@@ -24,10 +24,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位">
+        <!-- <el-form-item label="逻辑库位">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -45,6 +49,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -187,7 +195,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     const addZero = (num) => num.toString().padStart(2, '0');
     const now = new Date();
diff --git a/klp-ui/src/views/wms/report/template/year.vue b/klp-ui/src/views/wms/report/template/year.vue
index 9dee9c39..eadee235 100644
--- a/klp-ui/src/views/wms/report/template/year.vue
+++ b/klp-ui/src/views/wms/report/template/year.vue
@@ -14,10 +14,14 @@
           <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="逻辑库位" prop="warehouseIds">
+        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
           <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
             <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="逻辑库位" prop="warehouseId">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
         </el-form-item>
         <el-form-item label="产品名称" prop="itemName">
           <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
@@ -35,6 +39,10 @@
           <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
             placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
+        <el-form-item label="品质" prop="qualityStatusCsv">
+          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+            placeholder="请选择品质" clearable @keyup.enter.native="handleQuery" multiple />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
           <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
@@ -169,7 +177,7 @@ export default {
       default: '',
     },
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
     // 获取当前日期（默认选中当天）
     const now = new Date()