From 49536baf0b03a8876a596bd7fce06c5fc7a02a3d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 26 Jan 2026 10:57:17 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-26=20=E6=A0=87=E7=AD=BE=E5=8F=91?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/print/PoPartPrint.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/print/PoPartPrint.vue b/src/views/modules/print/PoPartPrint.vue
index a026508..54cbae2 100644
--- a/src/views/modules/print/PoPartPrint.vue
+++ b/src/views/modules/print/PoPartPrint.vue
@@ -147,7 +147,7 @@
         width="100"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="addOrUpdateHandle(scope.row)">生成标签</a>
+          <el-link style="cursor: pointer" @click="addOrUpdateHandle(scope.row)">生成标签</el-link>
         </template>
       </el-table-column>
       <el-table-column
@@ -532,7 +532,8 @@ export default {
         batchNo: '',
         rollCount: '1',
         rollQty: '',
-        tailRollQty: '0'
+        tailRollQty: '0',
+        batchFlag: 'N' // 批次管理标志
       },
       columnArray1: [
         {
@@ -1204,7 +1205,8 @@ export default {
             rollCount: '1',
             rollQty: row.rollQty,
             expirationWarningDay: outData.expirationWarningDay,
-            tailRollQty: '0'
+            tailRollQty: '0',
+            batchFlag: outData.batchFlag || 'N' // 批次管理标志
           }
           if(this.addModelData.exceedInRatio==""||this.addModelData.exceedInRatio==null){
             this.addModelData.exceedInRatio=0
@@ -1219,9 +1221,6 @@ export default {
     },
 
     submitData() {
-      // 验证必填字段
-
-
       if (!this.addModelData.productionDate||this.addModelData.productionDate==='') {
         this.$message.error('请选择生产日期');
         return;
@@ -1234,6 +1233,11 @@ export default {
         this.$message.error('请输入每张数量');
         return;
       }
+      // 如果物料启用批次管理，则批次号必填
+      if (this.addModelData.batchFlag === 'Y' && (!this.addModelData.batchNo || this.addModelData.batchNo.trim() === '')) {
+        this.$message.error('该物料启用批次管理，批次号必填');
+        return;
+      }
       if ( this.addModelData.nowRollQty>Number(this.addModelData.remainingIssuableQty)+((Number(this.addModelData.exceedInRatio)*Number(this.addModelData.orderQty))/100)) {
         this.$message.error('本次发行数量大于剩余可发行数量和超入数量');
         return;
@@ -1251,10 +1255,9 @@ export default {
         }
       })
     },
+
     submitDataNoClose() {
       // 验证必填字段
-
-
       if (!this.addModelData.productionDate||this.addModelData.productionDate==='') {
         this.$message.error('请选择生产日期');
         return;
@@ -1267,6 +1270,11 @@ export default {
         this.$message.error('请输入每张数量');
         return;
       }
+      // 如果物料启用批次管理，则批次号必填
+      if (this.addModelData.batchFlag === 'Y' && (!this.addModelData.batchNo || this.addModelData.batchNo.trim() === '')) {
+        this.$message.error('该物料启用批次管理，批次号必填');
+        return;
+      }
       if ( this.addModelData.nowRollQty>Number(this.addModelData.remainingIssuableQty)+((Number(this.addModelData.exceedInRatio)*Number(this.addModelData.orderQty))/100)) {
         this.$message.error('本次发行数量大于剩余可发行数量和超入数量');
         return;