From 3d8ad35a3dc1c30a59184fd63b83015260dbb717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 18 Nov 2025 11:45:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E5=92=8C=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将发货操作的成功提示从"入库成功"改为"发货成功"
- 在操作流程页面添加入库和发货操作的类型显示
- 修改库存页面产品信息的显示格式，使用方括号显示规格信息
- 完善库存数据映射，确保产品信息完整显示
---
 klp-ui/src/views/wms/coil/actflow.vue |  2 ++
 klp-ui/src/views/wms/coil/do/ship.vue |  2 +-
 klp-ui/src/views/wms/stock/index.vue  | 32 ++++++++++++++++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index 1eeb49d5..3ff8f09f 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -77,6 +77,8 @@
         <template slot-scope="scope">
              <span v-if="scope.row.actionType===5">移库操作已在移动端完成</span>
              <span v-else-if="scope.row.actionType===4">发货操作已在移动端完成</span>
+             <span v-else-if="scope.row.actionType===401">入库操作</span>
+             <span v-else-if="scope.row.actionType===402">发货操作</span>
           <dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType "></dict-tag>
         </template>
       </el-table-column>
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index c35e61e9..a7be6d18 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -327,7 +327,7 @@ export default {
               remark: this.form.remark,
               actionStatus: 2,
             }).then(res => {
-              this.$modal.msgSuccess("入库成功");
+              this.$modal.msgSuccess("发货成功");
               this.getList()
             })
           }).finally(() => {
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index 7c1e562f..61f55f37 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -40,12 +40,12 @@
           <template slot-scope="scope">
             <ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :product="scope.row.product">
               <template #default="{ product }">
-                {{ product.productName }}({{ product.productCode }})
+                {{ product.productName }}[{{ product.specification }}]
               </template>
             </ProductInfo>
             <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
-                {{ material.rawMaterialName }}({{ material.rawMaterialCode }})
+                {{ material.rawMaterialName }}[{{ material.specification }}]
               </template>
             </RawMaterialInfo>
           </template>
@@ -207,7 +207,33 @@ export default {
       this.loading = true;
       if (this.warehouseType === 'real') {
         getStockByActual(this.queryParams).then(response => {
-          this.stockList = response.rows;
+          this.stockList = response.rows.map(item => {
+            const itemType = item.itemType
+            if (itemType === 'raw_material') {
+              item.rawMaterial = {
+                rawMaterialId: item.itemId,
+                rawMaterialName: item.itemName,
+                rawMaterialCode: item.itemCode,
+                specification: item.specification,
+                material: item.material,
+                surfaceTreatment: item.surfaceTreatment,
+                zincLayer: item.zincLayer,
+                manufacturer: item.manufacturer,
+              }
+            } else if (itemType === 'product') {
+              item.product = {
+                productId: item.itemId,
+                productName: item.itemName,
+                productCode: item.itemCode,
+                specification: item.specification,
+                material: item.material,
+                surfaceTreatment: item.surfaceTreatment,
+                zincLayer: item.zincLayer,
+                manufacturer: item.manufacturer,
+              }
+            }
+            return item
+          });
           this.total = response.total;
           this.loading = false;
         });