From d9fcfe35d13a11f1ef3475d18eadd2b990431eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 25 Nov 2025 14:41:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增wms/coil/ship.vue发货页面
- 在product.vue中添加status查询参数
- 更新real.vue中状态标签的显示条件
- 修改do.vue面板中的物料信息显示字段，替换厚度/宽度为材质/表面处理等字段
---
 klp-ui/src/views/wms/coil/panels/do.vue | 46 ++++++++++++++++---------
 klp-ui/src/views/wms/coil/product.vue   |  4 +--
 klp-ui/src/views/wms/coil/ship.vue      | 26 ++++++++++++++
 klp-ui/src/views/wms/warehouse/real.vue |  2 +-
 4 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 klp-ui/src/views/wms/coil/ship.vue

diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 0eebb444..f18a26a8 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -10,7 +10,7 @@
               <el-tab-pane v-for="(tab, index) in tabs" :key="tab.value" :label="tab.label"
                 :name="tab.value"></el-tab-pane>
             </el-tabs>
-             <h3 class="section-title" v-else>待领物料列表</h3>
+            <h3 class="section-title" v-else>待领物料列表</h3>
             <el-button size="mini" icon="el-icon-refresh" @click="getMaterialCoil">刷新</el-button>
           </div>
 
@@ -59,17 +59,22 @@
                             <span class="param-label">规格：</span>
                             <span class="param-value">{{ item.rawMaterial.specification }}</span>
                           </div>
-                          <div class="param-row" v-if="item.rawMaterial.steelGrade">
-                            <span class="param-label">钢种：</span>
-                            <span class="param-value">{{ item.rawMaterial.steelGrade }}</span>
+                           <div class="param-row" v-if="item.rawMaterial.material">
+                            <span class="param-label">材质：</span>
+                            <span class="param-value">{{ item.rawMaterial.material }}</span>
                           </div>
-                          <div class="param-row" v-if="item.rawMaterial.thickness">
-                            <span class="param-label">厚度：</span>
-                            <span class="param-value">{{ item.rawMaterial.thickness }}mm</span>
+
+                          <div class="param-row" v-if="item.rawMaterial.surfaceTreatment">
+                            <span class="param-label">表面处理：</span>
+                            <span class="param-value">{{ item.rawMaterial.surfaceTreatment }}</span>
                           </div>
-                          <div class="param-row" v-if="item.rawMaterial.width">
-                            <span class="param-label">宽度：</span>
-                            <span class="param-value">{{ item.rawMaterial.width }}mm</span>
+                          <div class="param-row" v-if="item.rawMaterial.zincLayer">
+                            <span class="param-label">锌层：</span>
+                            <span class="param-value">{{ item.rawMaterial.zincLayer }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.rawMaterial.manufacturer">
+                            <span class="param-label">厂家：</span>
+                            <span class="param-value">{{ item.rawMaterial.manufacturer }}</span>
                           </div>
                         </div>
                         <div class="param-item" v-else-if="item.itemType === 'product' && item.product">
@@ -81,13 +86,22 @@
                             <span class="param-label">规格：</span>
                             <span class="param-value">{{ item.product.specification }}</span>
                           </div>
-                          <div class="param-row" v-if="item.product.thickness">
-                            <span class="param-label">厚度：</span>
-                            <span class="param-value">{{ item.product.thickness }}mm</span>
+                          <div class="param-row" v-if="item.product.material">
+                            <span class="param-label">材质：</span>
+                            <span class="param-value">{{ item.product.material }}</span>
                           </div>
-                          <div class="param-row" v-if="item.product.width">
-                            <span class="param-label">宽度：</span>
-                            <span class="param-value">{{ item.product.width }}mm</span>
+
+                          <div class="param-row" v-if="item.product.surfaceTreatment">
+                            <span class="param-label">表面处理：</span>
+                            <span class="param-value">{{ item.product.surfaceTreatment }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.zincLayer">
+                            <span class="param-label">锌层：</span>
+                            <span class="param-value">{{ item.product.zincLayer }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.product.manufacturer">
+                            <span class="param-label">厂家：</span>
+                            <span class="param-value">{{ item.product.manufacturer }}</span>
                           </div>
                         </div>
                         <div class="param-divider"></div>
diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue
index ed6ed298..eeb865aa 100644
--- a/klp-ui/src/views/wms/coil/product.vue
+++ b/klp-ui/src/views/wms/coil/product.vue
@@ -13,9 +13,9 @@ export default {
     return {
       qrcode: false,
       querys: {
-        // itemType: 'product',
         dataType: 1,
-        materialType: '成品'
+        materialType: '成品',
+        status: 0
       },
       labelType: '3',
       showStatus: true,
diff --git a/klp-ui/src/views/wms/coil/ship.vue b/klp-ui/src/views/wms/coil/ship.vue
new file mode 100644
index 00000000..b9501d77
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/ship.vue
@@ -0,0 +1,26 @@
+<template>
+  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" />
+</template>
+
+<script>
+import BasePage from './panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        dataType: 1,
+        materialType: '成品',
+        status: 1
+      },
+      labelType: '3',
+      showStatus: false,
+      hideType: false,
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/warehouse/real.vue b/klp-ui/src/views/wms/warehouse/real.vue
index dc120044..fea25fb1 100644
--- a/klp-ui/src/views/wms/warehouse/real.vue
+++ b/klp-ui/src/views/wms/warehouse/real.vue
@@ -81,7 +81,7 @@
       <el-table-column label="排序号" prop="sortNo" width="100" align="center" />
       <el-table-column label="状态" width="120" align="center">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isEnabled === 1 ? 'success' : 'info'" effect="plain">
+          <el-tag v-if="scope.row.level === 3" :type="scope.row.isEnabled === 1 ? 'success' : 'info'" effect="plain">
             {{ scope.row.isEnabled === 1 ? '未占用' : '已占用' }}
           </el-tag>
         </template>