From 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 15:07:02 +0800
Subject: [PATCH] fix: 用河南鹤壁代码覆盖山西长治

---
 src/views/productionPlan/productionPlan/index.vue |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index f4127ae..fd56e89 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -56,7 +56,7 @@
                     style="width: 160px;"
                     @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="瑙勬牸鍨嬪彿:"
+        <el-form-item label="浜у搧瑙勬牸:"
                       prop="model">
           <el-input v-model="searchForm.model"
                     placeholder="璇疯緭鍏�"
@@ -121,7 +121,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col>
-            <el-form-item label="瑙勬牸鍨嬪彿">
+            <el-form-item label="浜у搧瑙勬牸">
               <div class="info-display">{{ mergeForm.model || '-' }}</div>
             </el-form-item>
           </el-col>
@@ -143,6 +143,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary"
+                     :loading="mergeSubmitLoading"
                      @click="handleMergeSubmit">纭畾涓嬪彂</el-button>
           <el-button @click="isShowNewModal = false">鍙栨秷</el-button>
         </span>
@@ -186,7 +187,7 @@
                           @change="handleProductChange"
                           style="width: 100%" />
         </el-form-item>
-        <el-form-item label="瑙勬牸鍨嬪彿"
+        <el-form-item label="浜у搧瑙勬牸"
                       prop="productModelId">
           <el-select v-model="form.productModelId"
                      @change="handleChangeSpecification"
@@ -321,7 +322,7 @@
       },
     },
     {
-      label: "瑙勬牸鍨嬪彿",
+      label: "浜у搧瑙勬牸",
       prop: "model",
       width: "150px",
       className: "spec-cell",
@@ -466,6 +467,7 @@
 
   // 鍚堝苟涓嬪彂寮圭獥鎺у埗
   const isShowNewModal = ref(false);
+  const mergeSubmitLoading = ref(false);
   // 鍚堝苟涓嬪彂琛ㄥ崟鏁版嵁
   const mergeForm = reactive({
     productName: "",
@@ -507,7 +509,7 @@
   const rules = reactive({
     productId: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
     productModelId: [
-      { required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" },
+      { required: true, message: "璇烽�夋嫨浜у搧瑙勬牸", trigger: "change" },
     ],
     qtyRequired: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }],
     requiredDate: [
@@ -686,17 +688,17 @@
       });
   };
 
-  // 閫変腑鐨勮鏍煎瀷鍙稩D
+  // 閫変腑鐨勪骇鍝佽鏍糏D
   const selectedProductModelId = ref("");
 
   // 琛ㄦ牸閫夋嫨鏁版嵁
   const handleSelectionChange = selection => {
     selectedRows.value = selection;
-    // 濡傛灉鏈夐�変腑鐨勮锛岃褰曠涓�涓�変腑琛岀殑瑙勬牸鍨嬪彿ID
+    // 濡傛灉鏈夐�変腑鐨勮锛岃褰曠涓�涓�変腑琛岀殑浜у搧瑙勬牸ID
     if (selection.length > 0) {
       selectedProductModelId.value = selection[0].productModelId;
     } else {
-      // 濡傛灉娌℃湁閫変腑鐨勮锛屾竻绌鸿鏍煎瀷鍙稩D
+      // 濡傛灉娌℃湁閫変腑鐨勮锛屾竻绌轰骇鍝佽鏍糏D
       selectedProductModelId.value = "";
     }
   };
@@ -717,7 +719,7 @@
     if (!selectedProductModelId.value) {
       return true;
     }
-    // 濡傛灉鏈夐�変腑鐨勮锛屽彧鏈夎鏍煎瀷鍙稩D鐩稿悓鐨勮鎵嶅彲閫夋嫨
+    // 濡傛灉鏈夐�変腑鐨勮锛屽彧鏈変骇鍝佽鏍糏D鐩稿悓鐨勮鎵嶅彲閫夋嫨
     return row.productModelId === selectedProductModelId.value;
   };
   // 鎷夊彇鏁版嵁鎸夐挳鎿嶄綔
@@ -778,6 +780,7 @@
     const payload = {
       ...mergeForm,
     };
+    mergeSubmitLoading.value = true;
     productionPlanCombine(payload)
       .then(res => {
         if (res.code === 200) {
@@ -793,6 +796,9 @@
       .catch(err => {
         console.error("鍚堝苟涓嬪彂寮傚父锛�", err);
         ElMessage.error("绯荤粺寮傚父锛屽悎骞朵笅鍙戝け璐�");
+      })
+      .finally(() => {
+        mergeSubmitLoading.value = false;
       });
     // 鍙互閫夋嫨鍒锋柊鍒楄〃鎴栧叾浠栨搷浣�
   };

--
Gitblit v1.9.3