From b8ab235624031dc838f7584e19697f3e87e20e24 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 17:32:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue b/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
index 991f2a1..210dbba 100644
--- a/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
+++ b/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
@@ -49,11 +49,8 @@
</template>
</el-table-column>
<!-- 鎵瑰彿澶氶�� -->
- <el-table-column min-width="200">
- <template #header>
- <span style="color: #f56c6c; margin-right: 4px;">*</span>
- <span>鎵瑰彿</span>
- </template>
+ <el-table-column min-width="200"
+ label="鎵瑰彿">
<template #default="{ row }">
<el-select v-model="row.batchNo"
multiple
@@ -313,8 +310,8 @@
item =>
!item.operationName ||
!item.materialName ||
- !item.batchNo ||
- item.batchNo.length === 0 ||
+ (Number(item.pickQty) > 0 &&
+ (!item.batchNo || item.batchNo.length === 0)) ||
item.demandedQuantity === null ||
item.demandedQuantity === undefined ||
item.pickQty === null ||
--
Gitblit v1.9.3