From 302ca050527bac3b57c5756be2822bc4e5e26c37 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 9 Apr 2026 21:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(item-receipt):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增采购入库单编码和采购订单号字段，优化相关服务和控制器以支持批量获取入库单信息，提升数据处理能力。
---
 src/views/mes/md/vendor/MdVendorForm.vue      |  4 +-
 .../mes/md/vendor/VendorItemReceiptList.vue   | 37 +++++++------------
 .../mes/pro/workorder/WorkOrderItemList.vue   |  6 +++
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/views/mes/md/vendor/MdVendorForm.vue b/src/views/mes/md/vendor/MdVendorForm.vue
index 093b35bce..a9fa426d4 100644
--- a/src/views/mes/md/vendor/MdVendorForm.vue
+++ b/src/views/mes/md/vendor/MdVendorForm.vue
@@ -158,11 +158,11 @@
       </el-row>
     </el-form>
     <!-- 编辑/详情时显示关联数据 tab -->
-    <el-tabs v-if="formType !== 'create' && formData.id" v-model="activeTab" class="mt-10px">
+    <el-tabs v-if="formData.id" v-model="activeTab" class="mt-10px">
       <el-tab-pane label="物料清单" name="itemReceiptLine" lazy>
         <VendorItemReceiptLineList :vendorId="formData.id" />
       </el-tab-pane>
-      <el-tab-pane label="采购入库" name="itemReceipt" lazy>
+      <el-tab-pane label="采购记录" name="itemReceipt" lazy>
         <VendorItemReceiptList :vendorId="formData.id" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/mes/md/vendor/VendorItemReceiptList.vue b/src/views/mes/md/vendor/VendorItemReceiptList.vue
index ee31973f2..b70294501 100644
--- a/src/views/mes/md/vendor/VendorItemReceiptList.vue
+++ b/src/views/mes/md/vendor/VendorItemReceiptList.vue
@@ -1,27 +1,20 @@
 <template>
   <div class="overflow-hidden">
-    <!-- 供应商详情-采购记录 tab（复用 getItemReceiptPage 分页接口） -->
+    <!-- 供应商详情-采购记录 tab -->
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="入库单编号" align="center" prop="code" min-width="160">
+      <el-table-column label="入库单编号" align="center" prop="receiptCode" min-width="160">
         <template #default="scope">
-          <el-button link type="primary" @click="handleDetail(scope.row.id)">
-            {{ scope.row.code }}
+          <el-button link type="primary" @click="handleDetail(scope.row.receiptId)">
+            {{ scope.row.receiptCode }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="入库单名称" align="center" prop="name" min-width="150" />
-      <el-table-column
-        label="入库日期"
-        align="center"
-        prop="receiptDate"
-        :formatter="dateFormatter2"
-        width="180px"
-      />
-      <el-table-column label="单据状态" align="center" prop="status" min-width="100">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column label="采购订单号" align="center" prop="purchaseOrderCode" min-width="150" />
+      <el-table-column label="物料编码" align="center" prop="itemCode" width="140" />
+      <el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
+      <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
+      <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
+      <el-table-column label="入库数量" align="center" prop="receivedQuantity" width="100" />
     </el-table>
     <Pagination
       :total="total"
@@ -36,9 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter2 } from '@/utils/formatTime'
-import { DICT_TYPE } from '@/utils/dict'
-import { WmItemReceiptApi } from '@/api/mes/wm/itemreceipt'
+import { WmItemReceiptLineApi } from '@/api/mes/wm/itemreceipt/line'
 import ItemReceiptForm from '@/views/mes/wm/itemreceipt/ItemReceiptForm.vue'
 
 defineOptions({ name: 'VendorItemReceiptList' })
@@ -61,7 +52,7 @@ const getList = async () => {
   if (!queryParams.vendorId) return
   loading.value = true
   try {
-    const data = await WmItemReceiptApi.getItemReceiptPage(queryParams)
+    const data = await WmItemReceiptLineApi.getItemReceiptLinePage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -71,8 +62,8 @@ const getList = async () => {
 
 /** 查看详情 */
 const formRef = ref()
-const handleDetail = (id: number) => {
-  formRef.value.open('detail', id)
+const handleDetail = (receiptId: number) => {
+  formRef.value.open('detail', receiptId)
 }
 
 /** 监听 vendorId 变化，自动加载 */
diff --git a/src/views/mes/pro/workorder/WorkOrderItemList.vue b/src/views/mes/pro/workorder/WorkOrderItemList.vue
index 7a439d056..77b1ba7b4 100644
--- a/src/views/mes/pro/workorder/WorkOrderItemList.vue
+++ b/src/views/mes/pro/workorder/WorkOrderItemList.vue
@@ -5,12 +5,18 @@
     <el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
     <el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
     <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
+    <el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
+      <template #default="scope">
+        <dict-tag :type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT" :value="scope.row.itemOrProduct" />
+      </template>
+    </el-table-column>
     <el-table-column label="需求数量" align="center" prop="quantity" width="120" />
   </el-table>
 </template>
 
 <script setup lang="ts">
 import { ProWorkOrderBomApi } from '@/api/mes/pro/workorder/bom'
+import { DICT_TYPE } from '@/utils/dict'
 
 defineOptions({ name: 'WorkOrderItemList' })