From 3b577bb9493c389c5a3f0dca4538ddbf41fb1387 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 29 四月 2026 11:17:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/components/ProcessParamListDialog.vue | 122 ++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 67 deletions(-)
diff --git a/src/components/ProcessParamListDialog.vue b/src/components/ProcessParamListDialog.vue
index c835f29..898abb0 100644
--- a/src/components/ProcessParamListDialog.vue
+++ b/src/components/ProcessParamListDialog.vue
@@ -6,15 +6,26 @@
<div class="param-list-container">
<div class="params-header">
<span>鍙傛暟鍒楄〃</span>
- <el-button v-if="editable"
- type="primary"
- link
- size="small"
- @click="handleAddParam">
- <el-icon>
- <Plus />
- </el-icon>鏂板
- </el-button>
+ <div>
+ <el-button v-if="editable"
+ type="primary"
+ link
+ size="small"
+ @click="handleAddParam">
+ <el-icon>
+ <Plus />
+ </el-icon>鏂板
+ </el-button>
+ <!-- <el-button v-if="editable"
+ type="primary"
+ link
+ size="small"
+ @click="getsyncProcessParamItem">
+ <el-icon>
+ <Refresh />
+ </el-icon>鍚屾宸ュ簭鍙傛暟
+ </el-button> -->
+ </div>
</div>
<div class="params-list">
<div v-for="param in paramList"
@@ -87,8 +98,8 @@
<!-- 鍒嗛〉鎺т欢 -->
<div class="pagination-container"
style="margin-top: 10px;">
- <el-pagination v-model:current-page="paramPage.current"
- v-model:page-size="paramPage.size"
+ <el-pagination :current-page="paramPage.current"
+ :page-size="paramPage.size"
:page-sizes="[10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper"
:total="paramPage.total"
@@ -117,20 +128,13 @@
<el-form-item label="鍗曚綅">
<span class="detail-text">{{ selectedParam.unit || '-' }}</span>
</el-form-item>
- <el-form-item label="鏍囧噯鍊�"
- v-if="selectedParam.paramType == '1'">
+ <el-form-item label="鏍囧噯鍊�">
<el-input v-model="selectedParam.standardValue"
- type="number"
placeholder="璇疯緭鍏ラ粯璁ゅ��" />
</el-form-item>
- <el-form-item label="鎺掑簭">
- <el-input v-model="selectedParam.sort"
- type="number"
- placeholder="璇疯緭鍏ユ帓搴�" />
- </el-form-item>
<el-form-item label="鏄惁蹇呭～">
- <el-switch :active-value="true"
- :inactive-value="false"
+ <el-switch :active-value="1"
+ :inactive-value="0"
v-model="selectedParam.isRequired" />
</el-form-item>
</el-form>
@@ -169,10 +173,8 @@
<span class="detail-text">{{ editParamForm.unit || '-' }}</span>
</el-form-item>
<el-form-item label="鏍囧噯鍊�"
- v-if="editParamForm.paramType == '1'"
prop="standardValue">
<el-input v-model="editParamForm.standardValue"
- type="number"
placeholder="璇疯緭鍏ユ爣鍑嗗��" />
</el-form-item>
</el-form>
@@ -261,14 +263,13 @@
paramId: null,
paramName: "",
standardValue: null,
- sort: 1,
- isRequired: false,
+ isRequired: 0,
paramType: null,
paramFormat: "",
unit: "",
});
const editParamRules = ref({
- standardValue: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗗��", trigger: "blur" }],
+ // standardValue: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗗��", trigger: "blur" }],
});
const editParamFormRef = ref(null);
@@ -276,7 +277,7 @@
const handleAddParam = () => {
selectedParam.value = null;
paramSearchKeyword.value = "";
- paramPage.current = 1;
+ paramPage.value.current = 1;
// 鑾峰彇鍙�夊弬鏁板垪琛�
getBaseParamListData();
selectParamDialogVisible.value = true;
@@ -290,8 +291,7 @@
paramId: param.paramId,
paramName: param.parameterName || param.paramName,
standardValue: param.standardValue,
- sort: param.sort || 1,
- isRequired: param.isRequired || false,
+ isRequired: param.isRequired || 0,
paramType: param.parameterType || param.paramType,
paramFormat: param.parameterFormat || param.paramFormat,
unit: param.unit || param.unit,
@@ -332,17 +332,22 @@
})
.catch(() => {});
};
+ const getsyncProcessParamItem = () => {
+ emit("getsyncProcessParamItem");
+ };
// 鑾峰彇鍙�夊弬鏁板垪琛�
const getBaseParamListData = () => {
+ console.log(paramPage, "paramPage.size");
+
getBaseParamList({
paramName: paramSearchKeyword.value,
- current: paramPage.current,
- size: paramPage.size,
+ current: paramPage.value.current,
+ size: paramPage.value.size,
}).then(res => {
if (res.code === 200) {
filteredParamList.value = res.data?.records || [];
- paramPage.total = res.data?.total || 0;
+ paramPage.value.total = res.data.total || 0;
} else {
ElMessage.error(res.msg || "鏌ヨ澶辫触");
}
@@ -366,22 +371,15 @@
return;
}
- // 鍒ゆ柇鍙傛暟绫诲瀷锛屽彧鏈夋暟鍊肩被鍨嬫墠浼犳爣鍑嗗�笺�佹渶澶у�煎拰鏈�灏忓��
- const isNumericMode = selectedParam.value.paramType == 1;
- console.log(isNumericMode, "isNumericMode");
// 璋冪敤API鏂板鍙傛暟
if (props.pageType === "order") {
addProcessRouteItemParamOrder({
- orderId: Number(props.orderId),
- // processId: props.process.id,
- routeItemId: props.process.id,
- // routeItemId: Number(props.routeId),
+ productionOrderId: Number(props.orderId),
+ productionOrderRoutingOperationId: props.process.id,
+ technologyRoutingOperationParamId: props.process.id,
paramId: selectedParam.value.id,
- standardValue: isNumericMode
- ? selectedParam.value.standardValue || ""
- : "",
- isRequired: selectedParam.value.isRequired || false,
- sort: selectedParam.value.sort || 1,
+ standardValue: selectedParam.value.standardValue || "",
+ isRequired: selectedParam.value.isRequired || 0,
})
.then(res => {
if (res.code === 200) {
@@ -397,14 +395,13 @@
console.error("娣诲姞鍙傛暟澶辫触锛�", err);
});
} else {
+ console.log(selectedParam.value, "selectedParam");
+
addProcessRouteItemParam({
- routeItemId: props.process.id,
+ technologyRoutingOperationId: props.process.id,
paramId: selectedParam.value.id,
- standardValue: isNumericMode
- ? selectedParam.value.standardValue || ""
- : "",
- isRequired: selectedParam.value.isRequired || false,
- sort: selectedParam.value.sort || 1,
+ standardValue: selectedParam.value.standardValue || "",
+ isRequired: selectedParam.value.isRequired || 0,
})
.then(res => {
if (res.code === 200) {
@@ -427,18 +424,12 @@
if (!editParamFormRef.value) return;
editParamFormRef.value.validate(valid => {
if (valid) {
- // 鍒ゆ柇鍙傛暟绫诲瀷锛屽彧鏈夋暟鍊肩被鍨嬫墠浼犳爣鍑嗗�笺�佹渶澶у�煎拰鏈�灏忓��
- const isNumericMode = editParamForm.value.paramType == 1;
- console.log(isNumericMode, "isNumericMode");
if (props.pageType === "order") {
editProcessRouteItemParamOrder({
id: editParamForm.value.id,
- // routeItemId: props.process.id,
- // paramId: editParamForm.value.paramId,
- standardValue: isNumericMode
- ? editParamForm.value.standardValue || ""
- : "",
- isRequired: editParamForm.value.isRequired || false,
+ standardValue: editParamForm.value.standardValue || "",
+ isRequired: editParamForm.value.isRequired || 0,
+ // productionOrderRoutingOperationId: props.process.id,
})
.then(res => {
if (res.code === 200) {
@@ -457,12 +448,10 @@
// 璋冪敤API淇敼鍙傛暟
editProcessRouteItemParam({
id: editParamForm.value.id,
- routeItemId: props.process.id,
+ technologyRoutingOperationId: props.process.id,
paramId: editParamForm.value.paramId,
- standardValue: isNumericMode
- ? editParamForm.value.standardValue || ""
- : "",
- isRequired: editParamForm.value.isRequired || false,
+ standardValue: editParamForm.value.standardValue || "",
+ isRequired: editParamForm.value.isRequired || 0,
})
.then(res => {
if (res.code === 200) {
@@ -513,7 +502,7 @@
editParamDialogVisible.value = false;
selectedParam.value = null;
paramSearchKeyword.value = "";
- paramPage.current = 1;
+ paramPage.value.current = 1;
filteredParamList.value = [];
editParamForm.value = {
id: null,
@@ -521,8 +510,7 @@
paramId: null,
paramName: "",
standardValue: null,
- sort: 1,
- isRequired: false,
+ isRequired: 0,
paramType: null,
paramFormat: "",
unit: "",
--
Gitblit v1.9.3