From c7ac44a1004dcf791fe7282368f1f657e035c961 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 11:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/components/ProcessParamListDialog.vue | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/components/ProcessParamListDialog.vue b/src/components/ProcessParamListDialog.vue
index 77e717f..38e892d 100644
--- a/src/components/ProcessParamListDialog.vue
+++ b/src/components/ProcessParamListDialog.vue
@@ -16,7 +16,7 @@
<Plus />
</el-icon>鏂板
</el-button>
- <el-button v-if="editable"
+ <!-- <el-button v-if="editable"
type="primary"
link
size="small"
@@ -24,7 +24,7 @@
<el-icon>
<Refresh />
</el-icon>鍚屾宸ュ簭鍙傛暟
- </el-button>
+ </el-button> -->
</div>
</div>
<div class="params-list">
@@ -144,9 +144,8 @@
</div>
</div>
<template #footer>
+ <el-button type="primary" @click="handleParamSelectSubmit">纭畾</el-button>
<el-button @click="selectParamDialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary"
- @click="handleParamSelectSubmit">纭畾</el-button>
</template>
</el-dialog>
<!-- 缂栬緫鍙傛暟瀵硅瘽妗� -->
@@ -179,9 +178,8 @@
</el-form-item>
</el-form>
<template #footer>
+ <el-button type="primary" @click="handleEditParamSubmit">纭畾</el-button>
<el-button @click="editParamDialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary"
- @click="handleEditParamSubmit">纭畾</el-button>
</template>
</el-dialog>
</el-dialog>
@@ -380,9 +378,6 @@
paramId: selectedParam.value.id,
standardValue: selectedParam.value.standardValue || "",
isRequired: selectedParam.value.isRequired || 0,
- technologyOperationId: props.process.id,
- technologyOperationParamId: selectedParam.value.id,
- technologyRoutingOperationId: Number(props.routeId),
})
.then(res => {
if (res.code === 200) {
@@ -432,6 +427,7 @@
id: editParamForm.value.id,
standardValue: editParamForm.value.standardValue || "",
isRequired: editParamForm.value.isRequired || 0,
+ // productionOrderRoutingOperationId: props.process.id,
})
.then(res => {
if (res.code === 200) {
--
Gitblit v1.9.3