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 |   49 ++++++++++++++-----------------------------------
 1 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/components/ProcessParamListDialog.vue b/src/components/ProcessParamListDialog.vue
index 8ea5856..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">
@@ -128,8 +128,7 @@
             <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"
                         placeholder="璇疯緭鍏ラ粯璁ゅ��" />
             </el-form-item>
@@ -145,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>
     <!-- 缂栬緫鍙傛暟瀵硅瘽妗� -->
@@ -174,17 +172,14 @@
           <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>
       <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>
@@ -272,7 +267,7 @@
     unit: "",
   });
   const editParamRules = ref({
-    standardValue: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗗��", trigger: "blur" }],
+    // standardValue: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗗��", trigger: "blur" }],
   });
   const editParamFormRef = ref(null);
 
@@ -374,20 +369,14 @@
       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 || ""
-          : "",
+        standardValue: selectedParam.value.standardValue || "",
         isRequired: selectedParam.value.isRequired || 0,
       })
         .then(res => {
@@ -409,9 +398,7 @@
       addProcessRouteItemParam({
         technologyRoutingOperationId: props.process.id,
         paramId: selectedParam.value.id,
-        standardValue: isNumericMode
-          ? selectedParam.value.standardValue || ""
-          : "",
+        standardValue: selectedParam.value.standardValue || "",
         isRequired: selectedParam.value.isRequired || 0,
       })
         .then(res => {
@@ -435,18 +422,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 || ""
-              : "",
+            standardValue: editParamForm.value.standardValue || "",
             isRequired: editParamForm.value.isRequired || 0,
+            // productionOrderRoutingOperationId: props.process.id,
           })
             .then(res => {
               if (res.code === 200) {
@@ -467,9 +448,7 @@
             id: editParamForm.value.id,
             technologyRoutingOperationId: props.process.id,
             paramId: editParamForm.value.paramId,
-            standardValue: isNumericMode
-              ? editParamForm.value.standardValue || ""
-              : "",
+            standardValue: editParamForm.value.standardValue || "",
             isRequired: editParamForm.value.isRequired || 0,
           })
             .then(res => {

--
Gitblit v1.9.3