From 960eba0574dc3c34f0722fff368aa7c8a70d9f32 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 25 五月 2026 13:23:54 +0800
Subject: [PATCH] fix:报工投入调整
---
src/views/productionManagement/workOrder/components/ProductionRecordForm.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
index 444e470..ec649a6 100644
--- a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
+++ b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
@@ -41,10 +41,10 @@
const INPUT_WEIGHT_PARAM_ITEM = "鎶曞叆閲嶉噺/鏁伴噺";
-/** 鍙傛暟椤瑰睍绀哄悕锛堝吋瀹瑰簱鍐呮棫鍚嶃�屾姇鍏ラ噸閲忋�嶏級 */
+/** 鍙傛暟椤瑰睍绀哄悕 */
const displayParameterItem = (name) => {
const trimmed = String(name ?? "").trim();
- if (trimmed === "鎶曞叆閲嶉噺") return INPUT_WEIGHT_PARAM_ITEM;
+ if (trimmed === "鎶曞叆閲嶉噺/鏁伴噺") return INPUT_WEIGHT_PARAM_ITEM;
return trimmed;
};
@@ -82,13 +82,16 @@
const isInputWeightItem = (item) => {
const name = String(item?.parameterItem ?? "").trim();
- return (name === "鎶曞叆閲嶉噺" || name.includes(INPUT_WEIGHT_PARAM_ITEM)) &&
- normalizeUnit(item?.unit) === "kg";
+ const unit = normalizeUnit(item?.unit);
+ return name.includes(INPUT_WEIGHT_PARAM_ITEM) &&
+ (unit === "kg" || unit.startsWith("kg/"));
};
-const isBlankCoeffItem = (item) =>
- String(item?.parameterItem ?? "").includes("鐢熷澂绯绘暟") &&
- normalizeUnit(item?.unit) === "g";
+const isBlankCoeffItem = (item) => {
+ const unit = normalizeUnit(item?.unit);
+ return String(item?.parameterItem ?? "").includes("鐢熷澂绯绘暟") &&
+ (unit === "g" || unit.startsWith("g/"));
+};
/** 鎶曞叆閲嶉噺/鏁伴噺(KG) = 鏈鐢熶骇鏁伴噺 脳 鐢熷澂绯绘暟(g) / 1000 */
const syncFormingInputWeight = () => {
--
Gitblit v1.9.3