From 23ad2619d81e9e45a7fb4715b4b850e94bd843e7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionPlan/productionPlan/index.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 9768093..9b39531 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -343,7 +343,7 @@
},
{
label: "宸蹭笅鍙戞暟閲�",
- prop: "assignedQuantity",
+ prop: "quantityIssued",
width: "120px",
className: "spec-cell",
// formatData: (cell, row) => (cell ? `${cell}${row.unit || "鏂�"}` : 0),
@@ -389,16 +389,18 @@
name: "涓嬪彂",
type: "text",
showHide: row => {
- return row.status == 0;
+ return row.status != 2;
},
clickFun: row => {
mergeForm.productName = row.productName || "";
mergeForm.model = row.model || "";
- mergeForm.totalAssignedQuantity = Number(row.qtyRequired || 0);
+ mergeForm.totalAssignedQuantity =
+ Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
mergeForm.planCompleteTime = row.requiredDate || "";
mergeForm.productId = row.productId || "";
mergeForm.ids = [row.id];
- sumAssignedQuantity.value = Number(row.qtyRequired || 0);
+ sumAssignedQuantity.value =
+ Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
isShowNewModal.value = true;
},
},
@@ -618,9 +620,9 @@
};
}
summary[category].totalAssignedQuantity += Number(
- (
- Number(row.qtyRequired || 0) - Number(row.assignedQuantity || 0)
- ).toFixed(4)
+ (Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0)).toFixed(
+ 4
+ )
);
});
@@ -667,8 +669,12 @@
// 鍒ゆ柇琛屾槸鍚﹀彲閫夋嫨
const isSelectable = row => {
+ // 濡傛灉鏄凡涓嬪彂鐘舵�侊紝绂佹鍕鹃��
+ if (row.status == 2) {
+ return false;
+ }
// 璁＄畻鍓╀綑鏁伴噺
- const remainingQty = (row.qtyRequired || 0) - (row.assignedQuantity || 0);
+ const remainingQty = (row.qtyRequired || 0) - (row.quantityIssued || 0);
// 濡傛灉鍓╀綑鏁伴噺灏忎簬绛変簬0锛岀姝㈤�夋嫨
if (remainingQty <= 0) {
return false;
@@ -696,7 +702,7 @@
// 璁＄畻鎬诲埗閫犳暟閲� (榛樿qtyRequired鐨勫拰)
const totalAssignedQuantity = selectedRows.value.reduce((sum, row) => {
- return sum + Number(row.qtyRequired || 0);
+ return sum + Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
}, 0);
sumAssignedQuantity.value = totalAssignedQuantity;
console.log(totalAssignedQuantity);
--
Gitblit v1.9.3