From 92fecf8ce81eb08e387ec7717b95cae272014a4f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 10 Sep 2025 15:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=90=88=E6=A0=BC=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/recv/qualifiedStorage.vue |  7 ++++---
 src/views/modules/recv/recv.vue             | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/recv/qualifiedStorage.vue b/src/views/modules/recv/qualifiedStorage.vue
index 783c65e..87ec17b 100644
--- a/src/views/modules/recv/qualifiedStorage.vue
+++ b/src/views/modules/recv/qualifiedStorage.vue
@@ -10,7 +10,7 @@
         <!-- Step 1: 扫描或查询检验合格单据 -->
         <div v-if="processFlag === 1">
           <div class="scan-box" style="margin: 2px;">
-            <el-input clearable v-model="scanCode" placeholder="扫描入库单条码或输入单号"
+            <el-input clearable v-model="scanCode" placeholder="扫描入库单条码或采购单条码"
                       @keyup.enter.native="searchQualifiedList" ref="scanCodeRef" />
           </div>
 <!--          <div class="filter-box" style="margin: 2px;">
@@ -221,7 +221,8 @@ export default {
         inboundDate: '',
         operatorName: '',
         inboundRemark: ''
-      }
+      },
+      site:localStorage.getItem('site')
     };
   },
   methods: {
@@ -239,7 +240,7 @@ export default {
     // 查询检验合格单据
     searchQualifiedList() {
       const params = {
-        site: '1' // 默认站点
+        site: this.site
       };
       if (this.scanCode) {
         params.transNo = this.scanCode;
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index 57affca..238b722 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -159,6 +159,12 @@ export default {
       });
     },
     recvLine(row) {
+      if (row.poStatus === 'Stopped' || row.poStatus === 'Closed' || row.poStatus === 'Cancelled' || row.poStatus === 'Planned') {
+        return this.$message.warning("该采购订单状态为"+row.poStatus+"，无法接收");
+      }
+      if (row.status === 'Stopped' || row.status === 'Closed' || row.status === 'Cancelled') {
+        return this.$message.warning("该采购订单行状态为"+row.status+"，无法接收");
+      }
       this.recvItem = {
         ...row,
         poNo: row.poNumber || this.scanCode,
@@ -217,12 +223,8 @@ export default {
         needPallet: item.needPallet || 'N',
         workshopFlag: item.workshopFlag || 'N',
         cuttingFlag: item.cuttingFlag || 'N',
-
         // 日期字段
         manufactureDate: item.manufactureDate,
-        // 注意：失效日期由服务端自动计算，不需要传递
-        // expiredDate: item.expiringDate,
-
         // 处理单元列表
         handlingUnitList: item.needHandlingUnit === 'Y' ? this.handlingUnit.map(hu => ({
           perQty: hu.qty,