From 26b2a4b21b3c2cd34e6781cf7876eae580a7e1ec Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 23 五月 2026 15:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro_鹤壁' into dev_NEW_pro_鹤壁

---
 src/pages/equipmentManagement/repair/add.vue |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index 73c4eba..39ab9a4 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -76,6 +76,13 @@
                    placeholder="璇疯緭鍏ョ淮淇汉"
                    clearable />
         </u-form-item>
+        <u-form-item label="楠屾敹浜�"
+                     prop="acceptanceName"
+                     border-bottom>
+          <u-input v-model="form.acceptanceName"
+                   placeholder="璇疯緭鍏ラ獙鏀朵汉"
+                   clearable />
+        </u-form-item>
         <u-form-item label="缁翠慨椤圭洰"
                      prop="machineryCategory"
                      border-bottom>
@@ -198,6 +205,8 @@
     repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡
     repairName: undefined, // 鎶ヤ慨浜�
     maintenanceName: undefined, // 缁翠慨浜�
+    acceptanceName: undefined, // 楠屾敹浜�
+    status: "0", // 鎶ヤ慨鐘舵��
     machineryCategory: undefined, // 缁翠慨椤圭洰
     remark: undefined, // 鏁呴殰鐜拌薄
     storageBlobDTOs: [], // 鍥剧墖闄勪欢
@@ -206,10 +215,11 @@
   // 鎶ヤ慨鐘舵�侀�夐」
   const repairStatusOptions = ref([
     { name: "寰呯淮淇�", value: "0" },
-    { name: "瀹岀粨", value: "1" },
-    { name: "澶辫触", value: "2" },
+    { name: "瀹屾垚", value: "1" },
+    { name: "缁翠慨澶辫触", value: "2" },
+    { name: "寰呴獙鏀�", value: "3" },
   ]);
-  const repairStatusText = ref("");
+  const repairStatusText = ref("寰呯淮淇�");
 
   // 鎵撳紑鎶ヤ慨鐘舵�侀�夋嫨鍣�
   const openRepairStatusPicker = () => {
@@ -253,12 +263,15 @@
           form.value.repairTime = dayjs(data.repairTime).format("YYYY-MM-DD");
           form.value.repairName = data.repairName;
           form.value.maintenanceName = data.maintenanceName;
+          form.value.acceptanceName = data.acceptanceName;
+          form.value.status = String(data.status ?? "0");
           form.value.machineryCategory = data.machineryCategory;
           form.value.remark = data.remark;
           form.value.storageBlobDTOs = data.storageBlobVOs || [];
           repairStatusText.value =
-            repairStatusOptions.value.find(item => item.value == data.status)
-              ?.name || "";
+            repairStatusOptions.value.find(
+              item => item.value == String(data.status)
+            )?.name || "";
           // 璁剧疆璁惧鍚嶇О鏄剧ず
           const device = deviceOptions.value.find(
             item => item.id === data.deviceLedgerId

--
Gitblit v1.9.3