From d78815179b7d49509e6637d547ca8bbd525f7fcf Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 07 九月 2026 11:45:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/productionPlan/productionPlan/index.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index fd56e89..44297e9 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -21,7 +21,7 @@
style="width: 160px;"
@keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="闇�姹傛棩鏈熻寖鍥�:"
+ <el-form-item label="浜よ揣鏃ユ湡鑼冨洿:"
prop="dateRange">
<el-date-picker v-model="searchForm.dateRange"
type="daterange"
@@ -212,13 +212,13 @@
<el-input v-model="form.unit"
placeholder="璇疯緭鍏ュ崟浣�" />
</el-form-item>
- <el-form-item label="闇�姹傛棩鏈�"
+ <el-form-item label="鍙戣揣鏃ユ湡"
prop="requiredDate">
<el-date-picker v-model="form.requiredDate"
type="date"
value-format="YYYY-MM-DD"
style="width: 100%"
- placeholder="璇烽�夋嫨闇�姹傛棩鏈�" />
+ placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡" />
</el-form-item>
<el-form-item label="鎵胯鏃ユ湡"
prop="promisedDeliveryDate">
@@ -371,7 +371,7 @@
// formatData: (cell, row) => (cell ? `${cell}${row.unit || "鏂�"}` : 0),
},
{
- label: "闇�姹傛棩鏈�",
+ label: "鍙戣揣鏃ユ湡",
prop: "requiredDate",
width: "160px",
className: "date-cell",
@@ -513,7 +513,7 @@
],
qtyRequired: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }],
requiredDate: [
- { required: true, message: "璇烽�夋嫨闇�姹傛棩鏈�", trigger: "change" },
+ { required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" },
],
});
@@ -530,8 +530,7 @@
});
};
const onBlur = value => {
- // 闄愬埗鍥涗綅灏忔暟
- mergeForm.totalAssignedQuantity = Number(value.toFixed(4));
+ mergeForm.totalAssignedQuantity = Number(Number(value).toFixed(10));
};
const fetchProductOptions = () => {
@@ -656,9 +655,9 @@
};
}
summary[category].totalAssignedQuantity += Number(
- (Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0)).toFixed(
- 4
- )
+ (
+ Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0)
+ ).toFixed(10)
);
});
@@ -739,13 +738,14 @@
// 璁$畻鎬诲埗閫犳暟閲� (榛樿qtyRequired鐨勫拰)
const totalAssignedQuantity = selectedRows.value.reduce((sum, row) => {
return sum + Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
- }, 0);
- sumAssignedQuantity.value = totalAssignedQuantity;
- console.log(totalAssignedQuantity);
+ }, 0); // 閬垮厤娴偣鏁扮簿搴﹂棶棰橈紙濡� 37.800000000000004锛�
+ const fixedTotal = Number(totalAssignedQuantity.toFixed(10));
+ sumAssignedQuantity.value = fixedTotal;
+ console.log(fixedTotal);
// 璁剧疆琛ㄥ崟鏁版嵁
mergeForm.productName = productName;
mergeForm.model = firstRow.model || "";
- mergeForm.totalAssignedQuantity = totalAssignedQuantity;
+ mergeForm.totalAssignedQuantity = fixedTotal;
mergeForm.planCompleteTime = firstRow.requiredDate || "";
mergeForm.productId = firstRow.productId || "";
mergeForm.ids = selectedRows.value.map(row => row.id);
--
Gitblit v1.9.3