From ef3a764b19c2090ec456d8dc992ef8a6751ac314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 15 Nov 2025 16:04:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=BB=84=E4=BB=B6):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BA=A7=E5=93=81=E4=B8=8E=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BC=A0=E9=80=92=E5=AF=B9=E8=B1=A1=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3ID=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将ProductInfo和RawMaterialInfo组件从基于ID映射数据改为直接接收product/material对象
移除对vuex state的依赖和相关的计算属性
创建缓存版本组件ProductInfoCache和RawMaterialInfoCache
更新所有使用这些组件的视图文件以传递完整对象
---
 klp-oa/klp-ui/src/views/wms/coil/box.vue      |   4 +-
 .../views/wms/coil/panels/DrillDownTable.vue  |   4 +-
 .../klp-ui/src/views/wms/coil/panels/base.vue |   4 +-
 .../KLPService/ProductSelect/index.vue        |  32 ++---
 .../KLPService/Renderer/ProductInfo.vue       |  56 ++++-----
 .../KLPService/Renderer/ProductInfoCache.vue  | 119 ++++++++++++++++++
 .../KLPService/Renderer/RawMaterialInfo.vue   |  43 ++++---
 .../Renderer/RawMaterialInfoCache.vue         |  84 +++++++++++++
 klp-ui/src/views/wms/coil/box.vue             |   4 +-
 klp-ui/src/views/wms/coil/box2.vue            |   8 +-
 klp-ui/src/views/wms/coil/box3.vue            |   4 +-
 .../views/wms/coil/panels/DrillDownTable.vue  |   4 +-
 klp-ui/src/views/wms/coil/panels/base.vue     |   4 +-
 klp-ui/src/views/wms/stock/index.vue          |   4 +-
 .../components/MergeSourceSelector.vue        |   2 +-
 15 files changed, 291 insertions(+), 85 deletions(-)
 create mode 100644 klp-ui/src/components/KLPService/Renderer/ProductInfoCache.vue
 create mode 100644 klp-ui/src/components/KLPService/Renderer/RawMaterialInfoCache.vue

diff --git a/klp-oa/klp-ui/src/views/wms/coil/box.vue b/klp-oa/klp-ui/src/views/wms/coil/box.vue
index 41daba22..7223f5fd 100644
--- a/klp-oa/klp-ui/src/views/wms/coil/box.vue
+++ b/klp-oa/klp-ui/src/views/wms/coil/box.vue
@@ -64,12 +64,12 @@
           min-width="250"
         >
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
diff --git a/klp-oa/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue b/klp-oa/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
index d67f5381..060d1574 100644
--- a/klp-oa/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
+++ b/klp-oa/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
@@ -47,12 +47,12 @@
         </el-table-column>
         <el-table-column label="产品类型" align="center" min-width="250">
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
diff --git a/klp-oa/klp-ui/src/views/wms/coil/panels/base.vue b/klp-oa/klp-ui/src/views/wms/coil/panels/base.vue
index 470aef70..987ce9a8 100644
--- a/klp-oa/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-oa/klp-ui/src/views/wms/coil/panels/base.vue
@@ -81,12 +81,12 @@
       <el-table-column label="物料类型" align="center" prop="materialType"/>
       <el-table-column label="产品类型" align="center" prop="itemName">
         <template slot-scope="scope">
-          <ProductInfo v-if="scope.row.itemType == 'product'" :productId="scope.row.itemId">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product">
             <template slot-scope="{ product }">
               {{ product.productName }}({{ product.productCode }})
             </template>
           </ProductInfo>
-          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
             <template slot-scope="{ material }">
               {{ material.rawMaterialName }}({{ material.rawMaterialCode }})
             </template>
diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index 490cd422..3e4d87f9 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -6,7 +6,7 @@
         <el-button v-if="canAdd" @click="add" icon="el-icon-plus">未搜索到产品，点击添加</el-button>
         <div v-else style="padding: 10px;">未搜索到产品</div>
       </template>
-      <el-option v-for="item in productOptions" :key="item.productId"
+      <el-option v-for="item in productList" :key="item.productId"
         :label="getLabel(item)" :value="item.productId">
         <div> 
           <div class="option-label">
@@ -55,14 +55,15 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
-      <BomPanel v-if="activeStep === 1" :id="bomId" :itemId="itemId" :type="addForm.type" @addBom="handleBom" />
+      <!-- <BomPanel v-if="activeStep === 1" :id="bomId" :itemId="itemId" :type="addForm.type" @addBom="handleBom" /> -->
     </el-dialog>
   </span>
 </template>
 
 <script>
-import { listProductWithBom, addProduct } from '@/api/wms/product';
-import BomPanel from '../BomPanel/index.vue';
+// import { listProductWithBom, addProduct } from '@/api/wms/product';
+// import BomPanel from '../BomPanel/index.vue';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'ProductSelect',
@@ -82,12 +83,12 @@ export default {
       type: Boolean
     }
   },
-  components: {
-    BomPanel
-  },
+  // components: {
+  //   BomPanel
+  // },
   data() {
     return {
-      productOptions: [],
+      // productOptions: [],
       selected: this.value,
       addForm: {
         productCode: undefined,
@@ -136,15 +137,18 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters(['productList']),
+  },
   created() {
-    this.getProductOptions();
+    // this.getProductOptions();
   },
   methods: {
-    getProductOptions() {
-      listProductWithBom({ pageNum: 1, pageSize: 1000 }).then(res => {
-        this.productOptions = res.rows || [];
-      });
-    },
+    // getProductOptions() {
+    //   listProductWithBom({ pageNum: 1, pageSize: 1000 }).then(res => {
+    //     this.productOptions = res.rows || [];
+    //   });
+    // },
     getLabel(item) {
       // 产品名称[规格](参数)，如果有则写，没有则省略
       const sku = this.getSku(item);
diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
index 0dc0d915..2482898f 100644
--- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
@@ -47,47 +47,47 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import BomInfo from './BomInfo.vue';
+// import { mapState } from 'vuex';
+// import BomInfo from './BomInfo.vue';
 
 export default {
   name: 'ProductInfo',
-  components: {
-    BomInfo
-  },
+  // components: {
+  //   BomInfo
+  // },
   props: {
-    productId: {
-      type: [String, Number],
+    product: {
+      type: Object,
       required: true
     },
   },
-  mounted() {
-    console.log(this.productId, this.productMap);
-  },
+  // mounted() {
+    // console.log(this.productId, this.productMap);
+  // },
   data() {
     return {
       showDetail: false,
       // product: {},
     };
   },
-  computed: {
-    ...mapState({
-      productMap: state => state.category.productMap
-    }),
-    product() {
-      // 检查 productMap 是否已加载
-      if (!this.productMap || Object.keys(this.productMap).length === 0) {
-        return {};
-      }
-      if (!this.productId) {
-        return {};
-      }
-      return this.productMap[this.productId.toString()] || {};
-    },
-    loading() {
-      return !this.productMap || Object.keys(this.productMap).length === 0
-    }
-  },
+  // computed: {
+  //   ...mapState({
+  //     productMap: state => state.category.productMap
+  //   }),
+  //   product() {
+  //     // 检查 productMap 是否已加载
+  //     if (!this.productMap || Object.keys(this.productMap).length === 0) {
+  //       return {};
+  //     }
+  //     if (!this.productId) {
+  //       return {};
+  //     }
+  //     return this.productMap[this.productId.toString()] || {};
+  //   },
+  //   loading() {
+  //     return !this.productMap || Object.keys(this.productMap).length === 0
+  //   }
+  // },
   methods: {
     clickHandle() {
       this.showDetail = true;
diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfoCache.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfoCache.vue
new file mode 100644
index 00000000..d0f81d26
--- /dev/null
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfoCache.vue
@@ -0,0 +1,119 @@
+<template>
+  <div v-loading="loading" loading-text="加载中...">
+    <span class="product-name" @click.stop="clickHandle">
+      <slot name="default" :product="product">
+        {{ product && product.productName ? product.productName : '--' }}
+      </slot>
+    </span>
+    <el-dialog 
+      :visible="showDetail" 
+      @close="showDetail = false" 
+      :title="product && product.productName ? product.productName : '--' " 
+      width="500px"
+      append-to-body
+    >
+      <el-descriptions :column="1" border>
+        <el-descriptions-item label="产品名称">
+          {{ product.productName || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="产品编码">
+          {{ product.productCode || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="规格">
+          {{ product.specification || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="材质">
+          {{ product.material || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="表面处理">
+          {{ product.surfaceTreatment || '--' }}
+        </el-descriptions-item>
+        <!-- 锌层 -->
+        <el-descriptions-item label="锌层">
+          {{ product.zincLayer || '--' }}
+        </el-descriptions-item>
+        <!-- 厂家 -->
+        <el-descriptions-item label="厂家">
+          {{ product.manufacturer || '--' }}
+        </el-descriptions-item>
+
+      </el-descriptions>
+      <!-- <BomInfo :bomId="product.bomId" /> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import BomInfo from './BomInfo.vue';
+
+export default {
+  name: 'ProductInfo',
+  components: {
+    BomInfo
+  },
+  props: {
+    productId: {
+      type: [String, Number],
+      required: true
+    },
+  },
+  mounted() {
+    console.log(this.productId, this.productMap);
+  },
+  data() {
+    return {
+      showDetail: false,
+      // product: {},
+    };
+  },
+  computed: {
+    ...mapState({
+      productMap: state => state.category.productMap
+    }),
+    product() {
+      // 检查 productMap 是否已加载
+      if (!this.productMap || Object.keys(this.productMap).length === 0) {
+        return {};
+      }
+      if (!this.productId) {
+        return {};
+      }
+      return this.productMap[this.productId.toString()] || {};
+    },
+    loading() {
+      return !this.productMap || Object.keys(this.productMap).length === 0
+    }
+  },
+  methods: {
+    clickHandle() {
+      this.showDetail = true;
+    }
+  },
+  // watch: {
+  //   productId: {
+  //     handler(newVal) {
+  //       if (!newVal) {
+  //         this.product = {};
+  //       }
+  //       const res = this.productMap[newVal.toString()] ? this.productMap[newVal.toString()] : {};
+  //       this.product = res;
+  //     },
+  //     immediate: true
+  //   }
+  // }
+};
+</script>
+
+<style scoped>
+.product-name {
+  color: #1890ff;
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+/* 可选：调整描述列表的外边距 */
+:deep(.el-descriptions) {
+  margin-top: -10px;
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
index 68d38183..50c2d94f 100644
--- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" loading-text="加载中...">
+  <div>
     <!-- 作用域插槽 -->
     <span class="material-name" @click.stop="showDetail = true">
       <slot name="default" :material="material">
@@ -34,7 +34,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
 import BomInfo from './BomInfo.vue';
 
 export default {
@@ -43,8 +42,8 @@ export default {
     BomInfo
   },
   props: {
-    materialId: {
-      type: [String, Number],
+    material: {
+      type: Object,
       required: true
     }
   },
@@ -54,24 +53,24 @@ export default {
       // material: {},
     };
   },
-  computed: {
-    ...mapState({
-      materialMap: state => state.category.rawMaterialMap // 假设vuex中为material模块
-    }),
-    material() {
-      // 检查 materialMap 是否已加载
-      if (!this.materialMap || Object.keys(this.materialMap).length === 0) {
-        return {};
-      }
-      if (!this.materialId) {
-        return {};
-      }
-      return this.materialMap[this.materialId.toString()] || {};
-    },
-    loading() {
-      return !this.materialMap || Object.keys(this.materialMap).length === 0
-    }
-  },
+  // computed: {
+  //   ...mapState({
+  //     materialMap: state => state.category.rawMaterialMap // 假设vuex中为material模块
+  //   }),
+  //   material() {
+  //     // 检查 materialMap 是否已加载
+  //     if (!this.materialMap || Object.keys(this.materialMap).length === 0) {
+  //       return {};
+  //     }
+  //     if (!this.materialId) {
+  //       return {};
+  //     }
+  //     return this.materialMap[this.materialId.toString()] || {};
+  //   },
+  //   loading() {
+  //     return !this.materialMap || Object.keys(this.materialMap).length === 0
+  //   }
+  // },
   // watch: {
   //   materialId: {
   //     handler: function (newVal) {
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfoCache.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfoCache.vue
new file mode 100644
index 00000000..2e9be2ef
--- /dev/null
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfoCache.vue
@@ -0,0 +1,84 @@
+<template>
+  <div v-loading="loading" loading-text="加载中...">
+    <!-- 作用域插槽 -->
+    <span class="material-name" @click.stop="showDetail = true">
+      <slot name="default" :material="material">
+        {{ material.rawMaterialName ? material.rawMaterialName : '-' }}
+      </slot>
+    </span>
+    <el-dialog :visible="showDetail" @close="showDetail = false" :title="material.rawMaterialName" width="600px"
+      append-to-body>
+      <el-descriptions :column="1" border>
+        <!-- <el-descriptions-item label="原材料ID">{{ material.rawMaterialId }}</el-descriptions-item> -->
+        <el-descriptions-item label="原材料名称">{{ material.rawMaterialName }}</el-descriptions-item>
+        <el-descriptions-item label="原材料编码">{{ material.rawMaterialCode }}</el-descriptions-item>
+        <el-descriptions-item label="规格">{{ material.specification }}</el-descriptions-item>
+        <el-descriptions-item label="材质">
+          {{ material.material || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="表面处理">
+          {{ material.surfaceTreatment || '--' }}
+        </el-descriptions-item>
+        <!-- 锌层 -->
+        <el-descriptions-item label="锌层">
+          {{ material.zincLayer || '--' }}
+        </el-descriptions-item>
+        <!-- 厂家 -->
+        <el-descriptions-item label="厂家">
+          {{ material.manufacturer || '--' }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <!-- <BomInfo :bomId="material.bomId" /> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import BomInfo from './BomInfo.vue';
+
+export default {
+  name: 'RawMaterialInfo',
+  components: {
+    BomInfo
+  },
+  props: {
+    materialId: {
+      type: [String, Number],
+      required: true
+    }
+  },
+  data() {
+    return {
+      showDetail: false,
+      // material: {},
+    };
+  },
+  computed: {
+    ...mapState({
+      materialMap: state => state.category.rawMaterialMap // 假设vuex中为material模块
+    }),
+    material() {
+      // 检查 materialMap 是否已加载
+      if (!this.materialMap || Object.keys(this.materialMap).length === 0) {
+        return {};
+      }
+      if (!this.materialId) {
+        return {};
+      }
+      return this.materialMap[this.materialId.toString()] || {};
+    },
+    loading() {
+      return !this.materialMap || Object.keys(this.materialMap).length === 0
+    }
+  },
+}
+</script>
+
+<style scoped>
+.material-name {
+  color: #1890ff;
+  cursor: pointer;
+  text-decoration: underline;
+}
+</style>
diff --git a/klp-ui/src/views/wms/coil/box.vue b/klp-ui/src/views/wms/coil/box.vue
index 41daba22..7223f5fd 100644
--- a/klp-ui/src/views/wms/coil/box.vue
+++ b/klp-ui/src/views/wms/coil/box.vue
@@ -64,12 +64,12 @@
           min-width="250"
         >
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
diff --git a/klp-ui/src/views/wms/coil/box2.vue b/klp-ui/src/views/wms/coil/box2.vue
index 5d38944a..54cbc7e4 100644
--- a/klp-ui/src/views/wms/coil/box2.vue
+++ b/klp-ui/src/views/wms/coil/box2.vue
@@ -45,12 +45,12 @@
         <!-- 物料ID/名称列：仅物料统计时有效 -->
         <el-table-column v-if="queryParams.statType === '1'" label="物料信息" align="center" min-width="250">
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
@@ -104,12 +104,12 @@
               </el-table-column>
               <el-table-column label="产品类型" align="center" min-width="250">
                 <template slot-scope="scope">
-                  <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+                  <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
                     <template #default="{ product }">
                       {{ product.itemName || '未知' }}({{ product.itemCode || '无编码' }})
                     </template>
                   </ProductInfo>
-                  <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+                  <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
                     <template #default="{ material }">
                       {{ material.itemName || '未知' }}({{ material.itemCode || '无编码' }})
                     </template>
diff --git a/klp-ui/src/views/wms/coil/box3.vue b/klp-ui/src/views/wms/coil/box3.vue
index 0b6d563d..ce5a8fad 100644
--- a/klp-ui/src/views/wms/coil/box3.vue
+++ b/klp-ui/src/views/wms/coil/box3.vue
@@ -64,12 +64,12 @@
           min-width="250"
         >
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
diff --git a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
index d67f5381..060d1574 100644
--- a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
+++ b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
@@ -47,12 +47,12 @@
         </el-table-column>
         <el-table-column label="产品类型" align="center" min-width="250">
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
               </template>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index f6884f95..3e86e918 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -84,12 +84,12 @@
       <el-table-column label="物料类型" align="center" prop="materialType" />
       <el-table-column label="产品类型" align="center" prop="itemName">
         <template slot-scope="scope">
-          <ProductInfo v-if="scope.row.itemType == 'product'" :productId="scope.row.itemId">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product">
             <template slot-scope="{ product }">
               {{ product.productName }}[{{ product.specification }}]
             </template>
           </ProductInfo>
-          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
             <template slot-scope="{ material }">
               {{ material.rawMaterialName }}[{{ material.specification }}]
             </template>
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index a89f3bc2..2cb41a43 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -38,12 +38,12 @@
         </el-table-column>
         <el-table-column label="产品类型" align="center" prop="itemName">
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :product="scope.row.product">
               <template #default="{ product }">
                 {{ product.productName }}({{ product.productCode }})
               </template>
             </ProductInfo>
-            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
               <template #default="{ material }">
                 {{ material.rawMaterialName }}({{ material.rawMaterialCode }})
               </template>
diff --git a/klp-ui/src/views/wms/work/schedulePlan/components/MergeSourceSelector.vue b/klp-ui/src/views/wms/work/schedulePlan/components/MergeSourceSelector.vue
index 32afc985..100c69d4 100644
--- a/klp-ui/src/views/wms/work/schedulePlan/components/MergeSourceSelector.vue
+++ b/klp-ui/src/views/wms/work/schedulePlan/components/MergeSourceSelector.vue
@@ -4,7 +4,7 @@
     <div v-if="selectedTasks.length > 0" class="selected-tasks">
       <div v-for="task in selectedTasks" :key="task.taskId" class="selected-task-item">
         <div class="task-info">
-          <ProductInfo :productId="task.productId" />
+          <ProductInfo :product="task.product" />
           <CraftInfo :craftId="task.processId" />
           <span class="task-quantity">数量: {{ task.taskQuantity }}</span>
         </div>