From 1ac6944303a5b7a77518fa26b96324855f6c6acb Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 06 五月 2026 15:31:15 +0800
Subject: [PATCH] 领料补料退料逻辑变更限制
---
src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue | 11 ++++-------
src/views/productionManagement/productionOrder/index.vue | 4 ++--
src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue | 6 ++++++
3 files changed, 12 insertions(+), 9 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 ||
diff --git a/src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue b/src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue
index 67e44f1..4f052ed 100644
--- a/src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue
+++ b/src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue
@@ -19,9 +19,15 @@
<el-table-column label="璁￠噺鍗曚綅"
prop="unit"
width="100" />
+ <el-table-column label="闇�姹傛暟閲�"
+ prop="demandedQuantity"
+ width="100" />
<el-table-column label="棰嗙敤鏁伴噺"
prop="pickQuantity"
width="100" />
+ <el-table-column label="宸茶ˉ鏁伴噺"
+ prop="feedingQty"
+ width="100" />
<el-table-column label="琛ユ枡鏁伴噺"
min-width="150">
<template #default="{ row }">
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index c37358b..8d44b85 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -402,7 +402,7 @@
name: "棰嗘枡",
type: "text",
color: "#5EC7AB",
- showHide: row => !row.endOrder,
+ showHide: row => !row.endOrder && !row.returned,
clickFun: row => {
openMaterialDialog(row);
},
@@ -411,7 +411,7 @@
name: "琛ユ枡",
type: "text",
color: "#5EC7AB",
- showHide: row => !row.endOrder,
+ showHide: row => !row.endOrder && !row.returned,
clickFun: row => {
openMaterialSupplementDialog(row);
},
--
Gitblit v1.9.3