From 1b5efc00f6d4ab6915773a8aa277f61aa8c7d4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 15 Jan 2026 17:33:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E9=80=89=E6=8B=A9=E5=99=A8=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8A=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 统一钢卷选择器的selectType为'product'并添加status过滤
- 修复materialType与selectType的映射关系
- 移除分页组件的rangeMode条件限制
- 更新部分字段显示名称
---
 klp-ui/src/components/CoilSelector/index.vue   | 3 ++-
 klp-ui/src/views/wms/coil/do/ship.vue          | 4 +++-
 klp-ui/src/views/wms/coil/panels/base.vue      | 2 +-
 klp-ui/src/views/wms/delivery/mycoil/index.vue | 9 +++++----
 klp-ui/src/views/wms/delivery/permi/index.vue  | 4 ++++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index eb6ad4fa..5acd7105 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -161,7 +161,8 @@ export default {
         pageSize: 10,
         currentCoilNo: null,
         grade: null,
-        selectType: 'raw_material',
+        selectType: 'product',
+        status: 0, // 不包含已发货的钢卷
         dataType: 1 // 只查询当前数据，不查询历史数据
       },
       columns: defaultColumns,
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index b9149517..0ba03768 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -220,7 +220,9 @@ export default {
       // 钢卷选择器筛选参数
       coilFilters: {
         dataType: 1,
-        materialType: '成品'
+        materialType: '成品',
+        selectType: 'product',
+        status: 0,
       },
       coilSelectorVisible: false,
       loading: false,
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 60d980be..870aead8 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -633,7 +633,7 @@ export default {
         endTime: this.queryParams.updateTime?.[1],
       }
       // 如果没有设置itemType，则设置为raw_material
-      query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material';
+      query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product';
       listMaterialCoil(query).then(response => {
         if (this.querys.warehouseId != 111) {
           // 排除掉111仓库的
diff --git a/klp-ui/src/views/wms/delivery/mycoil/index.vue b/klp-ui/src/views/wms/delivery/mycoil/index.vue
index 8eaf8c3e..1dd45857 100644
--- a/klp-ui/src/views/wms/delivery/mycoil/index.vue
+++ b/klp-ui/src/views/wms/delivery/mycoil/index.vue
@@ -36,7 +36,7 @@
     </el-table>
 
     <!-- 分页 -->
-    <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
@@ -68,8 +68,9 @@ export default {
         currentCoilNo: null,
         grade: null,
         materialType: '成品',
-        selectType: 'raw_material',
-        dataType: 1 // 只查询当前数据，不查询历史数据
+        selectType: 'product',
+        dataType: 1,  // 只查询当前数据，不查询历史数据
+        // status: 0     // 只查询未发货的数据
       },
       columns: [
         {
@@ -122,7 +123,7 @@ export default {
           width: '100'
         },
         {
-          label: '库区',
+          label: '逻辑库区',
           align: 'center',
           prop: 'warehouseName',
           width: '120',
diff --git a/klp-ui/src/views/wms/delivery/permi/index.vue b/klp-ui/src/views/wms/delivery/permi/index.vue
index 76a52652..b2ff2470 100644
--- a/klp-ui/src/views/wms/delivery/permi/index.vue
+++ b/klp-ui/src/views/wms/delivery/permi/index.vue
@@ -223,6 +223,8 @@ export default {
       queryParamsWithSalesId: {
         selectType: 'product',
         materialType: '成品',
+        dataType: 1,
+        status: 0,
         saleId: undefined,
         pageNum: 1,
         pageSize: 10
@@ -231,6 +233,8 @@ export default {
       queryParamsWithUnAssignedId: {
         selectType: 'product',
         materialType: '成品',
+        dataType: 1,
+        status: 0,
         saleId: -1,
         pageNum: 1,
         pageSize: 10