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 ++++++++++-------
src/views/productionManagement/productionReporting/components/Detail.vue | 2 +-
src/views/productionManagement/workOrder/index.vue | 16 ++++++++--------
src/views/productionManagement/productionRecords/index.vue | 4 ++--
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/views/productionManagement/productionRecords/index.vue b/src/views/productionManagement/productionRecords/index.vue
index a2536fe..3468aaa 100644
--- a/src/views/productionManagement/productionRecords/index.vue
+++ b/src/views/productionManagement/productionRecords/index.vue
@@ -83,10 +83,10 @@
const { proxy } = getCurrentInstance();
const { parameter_tyep } = proxy.useDict("parameter_tyep");
-/** 绯荤粺鍐呯疆鍙傛暟銆屾姇鍏ラ噸閲�/鏁伴噺銆嶏紝涓嶅彲缂栬緫銆佸垹闄わ紙鍏煎鏃у悕銆屾姇鍏ラ噸閲忋�嶏級 */
+/** 绯荤粺鍐呯疆鍙傛暟銆屾姇鍏ラ噸閲�/鏁伴噺銆嶏紝涓嶅彲缂栬緫銆佸垹闄� */
const isLockedParam = (row) => {
const name = String(row?.parameterItem ?? "").trim();
- return name === "鎶曞叆閲嶉噺/鏁伴噺" || name === "鎶曞叆閲嶉噺";
+ return name === "鎶曞叆閲嶉噺/鏁伴噺";
};
const tableColumn = ref([
diff --git a/src/views/productionManagement/productionReporting/components/Detail.vue b/src/views/productionManagement/productionReporting/components/Detail.vue
index 98a53f0..5582d08 100644
--- a/src/views/productionManagement/productionReporting/components/Detail.vue
+++ b/src/views/productionManagement/productionReporting/components/Detail.vue
@@ -71,7 +71,7 @@
<el-descriptions-item
v-for="item in (otherData.rows || [])"
:key="item.parameterItem"
- :label="item.parameterItem === '鎶曞叆閲嶉噺' ? '鎶曞叆閲嶉噺/鏁伴噺' : item.parameterItem"
+ :label="item.parameterItem"
>
{{ item.value || '-' }}
</el-descriptions-item>
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 = () => {
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 7e31c8d..069a75c 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -595,9 +595,9 @@
return;
}
reportForm.quantity = intValue;
- return;
+ } else {
+ reportForm.quantity = num;
}
- reportForm.quantity = num;
if (isFormingProcess.value) {
nextTick(() => {
productionRecordFormRef.value?.syncInputWeight?.();
@@ -900,12 +900,12 @@
return;
}
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
+ // if (quantity > reportForm.planQuantity) {
+ // ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // });
+ // return;
+ // }
const submitData = {
...reportForm,
--
Gitblit v1.9.3