From 66e852e985f72b9cc5930dc20c6be68be763426f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 11 Nov 2025 15:04:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=BB=9F=E4=B8=80=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E7=8A=B6=E6=80=81=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将各页面中的itemType字段替换为materialType，使用中文显示物料类型
- 在actflow页面添加待操作状态切换开关
- 移除废弃的warehouseId字段
---
 klp-ui/src/views/wms/coil/actflow.vue     | 12 ++++++++++++
 klp-ui/src/views/wms/coil/index.vue       |  3 ++-
 klp-ui/src/views/wms/coil/panels/base.vue |  8 +++++++-
 klp-ui/src/views/wms/coil/product.vue     |  5 +++--
 klp-ui/src/views/wms/coil/rubbish.vue     |  5 +++--
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index 0f6773ab..a2bad29d 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -15,6 +15,9 @@
             <el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="只看待操作" prop="actionStatus">
+          <el-switch @change="switchActionStatus" v-model="queryParams.actionSwitch"/>
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -363,6 +366,15 @@ export default {
         this.loading = false;
       });
     },
+    switchActionStatus(value) {
+      console.log(value)
+      if (!value) {
+        this.queryParams.actionStatus = null;
+      } else {
+        this.queryParams.actionStatus = 0;
+      }
+      this.getList()
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/klp-ui/src/views/wms/coil/index.vue b/klp-ui/src/views/wms/coil/index.vue
index 3c4d46ea..da51480b 100644
--- a/klp-ui/src/views/wms/coil/index.vue
+++ b/klp-ui/src/views/wms/coil/index.vue
@@ -14,7 +14,8 @@ export default {
       qrcode: true,
       querys: {
         dataType: 1,
-        itemType: 'raw_material'
+        // itemType: 'raw_material'
+        materialType: '原料'
       },
       labelType: '2',
       hideType: true
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 4cb29bd6..a3727dcc 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -73,6 +73,11 @@
       <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
       <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
       <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
+      <!-- <el-table-column label="物料类型" align="center" prop="itemType">
+        <template slot-scope="scope">
+          {{ scope.row.itemType  == 'raw_material' ? '原料' : '产品' }}
+        </template>
+      </el-table-column> -->
       <el-table-column label="物料类型" align="center" prop="materialType"/>
       <el-table-column label="产品类型" align="center" prop="itemName">
         <template slot-scope="scope">
@@ -450,7 +455,8 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        materialType: '原料',
       };
       this.resetForm("form");
     },
diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue
index 85defb1f..1b0f8033 100644
--- a/klp-ui/src/views/wms/coil/product.vue
+++ b/klp-ui/src/views/wms/coil/product.vue
@@ -13,8 +13,9 @@ export default {
     return {
       qrcode: false,
       querys: {
-        itemType: 'product',
-        dataType: 1
+        // itemType: 'product',
+        dataType: 1,
+        materialType: '产品'
       },
       labelType: '3',
       showStatus: true,
diff --git a/klp-ui/src/views/wms/coil/rubbish.vue b/klp-ui/src/views/wms/coil/rubbish.vue
index abbaf8d6..fea43c8c 100644
--- a/klp-ui/src/views/wms/coil/rubbish.vue
+++ b/klp-ui/src/views/wms/coil/rubbish.vue
@@ -14,8 +14,9 @@ export default {
       qrcode: false,
       querys: {
         // itemType: 'rubbish',
-        // dataType: 2
-        warehouseId: 111,
+        dataType: 1,
+        materialType: '废品'
+        // warehouseId: 111,
       },
       hideWarehouseQuery: true,
       labelType: '3',