From 63b212c51446c43ae3b945f623e244a520be8693 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Mar 2026 18:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/itemreceipt/ItemReceiptDetailList.vue  |  3 ++-
 .../mes/wm/itemreceipt/ItemReceiptForm.vue    | 24 +++++++++++++++----
 .../wm/itemreceipt/ItemReceiptLineList.vue    |  4 ++--
 src/views/mes/wm/itemreceipt/index.vue        | 10 ++++++++
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue b/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
index 0b711cd37..1de90264f 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
@@ -7,7 +7,7 @@
       <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="props.formType === 'stock'"
+        v-if="isStock"
         label="操作"
         align="center"
         width="120"
@@ -44,6 +44,7 @@ const message = useMessage() // 消息弹窗
 
 const loading = ref(false) // 列表的加载中
 const list = ref<WmItemReceiptDetailVO[]>([]) // 明细列表
+const isStock = computed(() => props.formType === 'stock') // 是否为上架模式
 
 /** 查询明细列表 */
 const getList = async () => {
diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
index 9473da89d..a14e06f5c 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
@@ -60,6 +60,15 @@
             <MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="采购订单号" prop="purchaseOrderCode">
+            <el-input
+              v-model="formData.purchaseOrderCode"
+              placeholder="请输入采购订单号"
+              :disabled="isHeaderReadonly"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -88,7 +97,7 @@
         保 存
       </el-button>
       <el-button
-        v-if="formType === 'update' && formData.status === MesWmItemReceiptStatusEnum.PREPARE"
+        v-if="isEditable && formData.status === MesWmItemReceiptStatusEnum.PREPARE"
         @click="handleSubmit"
         type="warning"
         :disabled="formLoading"
@@ -99,7 +108,7 @@
         执行上架
       </el-button>
       <el-button
-        v-if="formData.status === MesWmItemReceiptStatusEnum.APPROVED"
+        v-if="isFinish"
         @click="handleFinish"
         type="success"
         :disabled="formLoading"
@@ -129,7 +138,7 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
-const formType = ref<string>('create') // 表单的类型：create / update / stock / detail
+const formType = ref<string>('create') // 表单的类型：create / update / stock / finish / detail
 const formData = ref({
   id: undefined as number | undefined,
   code: undefined,
@@ -138,6 +147,7 @@ const formData = ref({
   vendorId: undefined,
   noticeId: undefined,
   iqcId: undefined,
+  purchaseOrderCode: undefined,
   receiptDate: undefined,
   remark: undefined
 })
@@ -149,13 +159,15 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
 const isStock = computed(() => formType.value === 'stock') // 是否为上架模式
-const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
-const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
+const isFinish = computed(() => formType.value === 'finish') // 是否为执行入库模式
+const isDetail = computed(() => ['detail', 'finish'].includes(formType.value)) // 是否为详情模式
+const isHeaderReadonly = computed(() => ['stock', 'detail', 'finish'].includes(formType.value)) // 是否只读
 const dialogTitle = computed(() => {
   const titles = {
     create: '新增采购入库单',
     update: '编辑采购入库单',
     stock: '执行上架',
+    finish: '执行入库',
     detail: '采购入库单详情'
   }
   return titles[formType.value] || formType.value
@@ -173,6 +185,7 @@ const generateCode = async () => {
 const handleNoticeChange = (notice: any) => {
   if (notice) {
     formData.value.vendorId = notice.vendorId
+    formData.value.purchaseOrderCode = notice.purchaseOrderCode
   }
 }
 
@@ -286,6 +299,7 @@ const resetForm = () => {
     vendorId: undefined,
     noticeId: undefined,
     iqcId: undefined,
+    purchaseOrderCode: undefined,
     receiptDate: undefined,
     remark: undefined
   }
diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
index fd3c625f9..f55baddc4 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
@@ -126,8 +126,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="批号" prop="lotNumber">
-            <el-input v-model="formData.lotNumber" placeholder="请输入批号" />
+          <el-form-item label="生产批号" prop="lotNumber">
+            <el-input v-model="formData.lotNumber" placeholder="请输入生产批号" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
diff --git a/src/views/mes/wm/itemreceipt/index.vue b/src/views/mes/wm/itemreceipt/index.vue
index e80083963..d5087fe8b 100644
--- a/src/views/mes/wm/itemreceipt/index.vue
+++ b/src/views/mes/wm/itemreceipt/index.vue
@@ -118,6 +118,16 @@
           >
             执行上架
           </el-button>
+          <!-- 待执行入库：执行入库、取消 -->
+          <el-button
+            link
+            type="success"
+            @click="openForm('finish', scope.row.id)"
+            v-hasPermi="['mes:wm-item-receipt:finish']"
+            v-if="scope.row.status === MesWmItemReceiptStatusEnum.APPROVED"
+          >
+            执行入库
+          </el-button>
           <el-button
             link
             type="danger"