From 8ae47d0d5f14f5e2f561ef8030794e1dd1878d18 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 16 三月 2026 18:00:57 +0800
Subject: [PATCH] 来料样式修改，工艺路线接口对接
---
src/views/productionManagement/processRoute/index.vue | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 30475fd..40ab129 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -171,9 +171,9 @@
{{ param.parameterType }}
</el-tag> -->
<span v-if="param.valueMode==1"
- class="param-value">鏍囧噯鍊硷細{{ param.standardValue }} {{ param.unit }}</span>
+ class="param-value">鏍囧噯鍊硷細{{ param.standardValue || "-" }} {{ param.unit }}</span>
<span v-else
- class="param-value">鏍囧噯鍊硷細{{ param.minValue }}-{{ param.maxValue }} {{ param.unit }}</span>
+ class="param-value">鏍囧噯鍊硷細{{ param.minValue || "-" }}-{{ param.maxValue || "-" }} {{ param.unit }}</span>
</div>
<div class="param-actions">
<el-button link
@@ -607,19 +607,19 @@
<span class="detail-text">{{ selectedParam.unit || '-' }}</span>
</el-form-item>
<el-form-item label="鏍囧噯鍊�"
- v-if="selectedParam.valueMode == '1'">
+ v-if="selectedParam.valueMode == '1' && selectedParam.paramType == '1'">
<el-input v-model="selectedParam.standardValue"
type="number"
placeholder="璇疯緭鍏ラ粯璁ゅ��" />
</el-form-item>
<el-form-item label="鏈�灏忓��"
- v-if="selectedParam.valueMode == '2'">
+ v-if="selectedParam.valueMode == '2' && selectedParam.paramType == '1'">
<el-input v-model="selectedParam.minValue"
type="number"
placeholder="璇疯緭鍏ユ渶灏忓��" />
</el-form-item>
<el-form-item label="鏈�澶у��"
- v-if="selectedParam.valueMode == '2'">
+ v-if="selectedParam.valueMode == '2' && selectedParam.paramType == '1'">
<el-input v-model="selectedParam.maxValue"
type="number"
placeholder="璇疯緭鍏ユ渶澶у��" />
@@ -665,22 +665,34 @@
{{ editParamForm.valueMode == '1' ? '鍗曞��' : '鍖洪棿' }}
</el-tag>
</el-form-item>
+ <el-form-item label="鍙傛暟绫诲瀷">
+ <el-tag size="small"
+ :type="getParamTypeTag(editParamForm.paramType)">
+ {{ getParamTypeText(editParamForm.paramType) }}
+ </el-tag>
+ </el-form-item>
+ <el-form-item label="鍙傛暟鏍煎紡">
+ <span class="detail-text">{{ editParamForm.paramFormat || '-' }}</span>
+ </el-form-item>
+ <el-form-item label="鍗曚綅">
+ <span class="detail-text">{{ editParamForm.unit || '-' }}</span>
+ </el-form-item>
<el-form-item label="鏍囧噯鍊�"
- v-if="editParamForm.valueMode == '1'"
+ v-if="editParamForm.valueMode == '1' && editParamForm.paramType == '1'"
prop="standardValue">
<el-input v-model="editParamForm.standardValue"
type="number"
placeholder="璇疯緭鍏ユ爣鍑嗗��" />
</el-form-item>
<el-form-item label="鏈�灏忓��"
- v-if="editParamForm.valueMode == '2'"
+ v-if="editParamForm.valueMode == '2' && editParamForm.paramType == '1'"
prop="minValue">
<el-input v-model="editParamForm.minValue"
type="number"
placeholder="璇疯緭鍏ユ渶灏忓��" />
</el-form-item>
<el-form-item label="鏈�澶у��"
- v-if="editParamForm.valueMode == '2'"
+ v-if="editParamForm.valueMode == '2' && editParamForm.paramType == '1'"
prop="maxValue">
<el-input v-model="editParamForm.maxValue"
type="number"
@@ -1466,6 +1478,9 @@
editParamForm.maxValue = param.maxValue;
editParamForm.sort = param.sort || 1;
editParamForm.isRequired = param.isRequired || 0;
+ editParamForm.paramType = param.parameterType || param.paramType;
+ editParamForm.paramFormat = param.parameterFormat || param.paramFormat;
+ editParamForm.unit = param.unit || param.unit;
editParamDialogVisible.value = true;
};
@@ -1515,10 +1530,6 @@
2: "info",
3: "warning",
4: "success",
- 鏁板�兼牸寮�: "primary",
- 鏂囨湰鏍煎紡: "info",
- 涓嬫媺閫夐」: "warning",
- 鏃堕棿鏍煎紡: "success",
};
return typeMap[type] || "default";
};
@@ -1529,10 +1540,6 @@
2: "鏂囨湰鏍煎紡",
3: "涓嬫媺閫夐」",
4: "鏃堕棿鏍煎紡",
- 鏁板�兼牸寮�: "鏁板�兼牸寮�",
- 鏂囨湰鏍煎紡: "鏂囨湰鏍煎紡",
- 涓嬫媺閫夐」: "涓嬫媺閫夐」",
- 鏃堕棿鏍煎紡: "鏃堕棿鏍煎紡",
};
return typeMap[type] || "鏈煡鍙傛暟绫诲瀷";
};
@@ -1627,13 +1634,18 @@
// return;
// }
+ // 鍒ゆ柇鍙傛暟绫诲瀷锛屽彧鏈夋暟鍊肩被鍨嬫墠浼犳爣鍑嗗�笺�佹渶澶у�煎拰鏈�灏忓��
+ const isNumericMode = selectedParam.value.valueMode === 1;
+
// 璋冪敤API鏂板鍙傛暟
addProcessRouteItemParam({
routeItemId: process.id,
paramId: selectedParam.value.id,
- standardValue: selectedParam.value.standardValue || "",
- minValue: selectedParam.value.minValue || 0,
- maxValue: selectedParam.value.maxValue || 0,
+ standardValue: isNumericMode
+ ? selectedParam.value.standardValue || ""
+ : "",
+ minValue: isNumericMode ? selectedParam.value.minValue || 0 : null,
+ maxValue: isNumericMode ? selectedParam.value.maxValue || 0 : null,
isRequired: selectedParam.value.isRequired || 0,
})
.then(res => {
@@ -1652,14 +1664,17 @@
const handleEditParamSubmit = () => {
editParamFormRef.value.validate(valid => {
if (valid) {
+ // 鍒ゆ柇鍙傛暟绫诲瀷锛屽彧鏈夋暟鍊肩被鍨嬫墠浼犳爣鍑嗗�笺�佹渶澶у�煎拰鏈�灏忓��
+ const isNumericMode = editParamForm.valueMode == 1;
+
// 璋冪敤API淇敼鍙傛暟
editProcessRouteItemParam({
id: editParamForm.id,
routeItemId: currentProcessId.value,
paramId: editParamForm.paramId,
- standardValue: editParamForm.standardValue || "",
- minValue: editParamForm.minValue || 0,
- maxValue: editParamForm.maxValue || 0,
+ standardValue: isNumericMode ? editParamForm.standardValue || "" : "",
+ minValue: isNumericMode ? editParamForm.minValue || 0 : null,
+ maxValue: isNumericMode ? editParamForm.maxValue || 0 : null,
isRequired: editParamForm.isRequired || 0,
})
.then(res => {
--
Gitblit v1.9.3