From a21d5193f75261d35f3cf4f1ff1f258137861344 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 1 Apr 2026 00:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=E5=8F=8A?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=8D=95=E7=BC=96=E7=A0=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/outsourcereceipt/OutsourceReceiptDetailList.vue | 10 ++++++----
 .../wm/outsourcereceipt/OutsourceReceiptLineList.vue   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue
index 395791289..f6e40c1b1 100644
--- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue
+++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="pl-60px pr-20px py-10px">
     <el-button
-      v-if="isUpdate"
+      v-if="isUpdate || isStock"
       type="primary"
       plain
       size="small"
@@ -12,10 +12,11 @@
       <Icon icon="ep:plus" class="mr-5px" /> 添加明细
     </el-button>
     <el-table v-loading="loading" :data="list" border size="small">
-      <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
-      <el-table-column label="库位名称" align="center" prop="locationName" min-width="100" />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" min-width="100" />
+      <el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
+      <el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
       <el-table-column label="数量" align="center" prop="quantity" width="100" />
-      <el-table-column v-if="isUpdate" label="操作" align="center" width="120" fixed="right">
+      <el-table-column v-if="isUpdate || isStock" label="操作" align="center" width="120" fixed="right">
         <template #default="scope">
           <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
             编辑
@@ -48,6 +49,7 @@ const { t } = useI18n()
 const message = useMessage()
 
 const isUpdate = computed(() => ['create', 'update'].includes(props.formType))
+const isStock = computed(() => props.formType === 'stock')
 
 const loading = ref(false)
 const list = ref<WmOutsourceReceiptDetailVO[]>([])
diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
index ea1620841..f1383c60b 100644
--- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
+++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
@@ -30,7 +30,7 @@
       <el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
       <el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
-      <el-table-column label="单位" align="center" prop="unitName" width="80" />
+      <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="入库数量" align="center" prop="quantity" width="100" />
       <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column label="是否检验" align="center" prop="iqcCheckFlag" width="100">