From 69a87f1a00c2937f269592e481ca1a9cc4dd98e9 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期二, 06 一月 2026 17:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_HXSJ' into dev_HXSJ

---
 src/views/equipmentManagement/repair/Form/RepairForm.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentManagement/repair/Form/RepairForm.vue b/src/views/equipmentManagement/repair/Form/RepairForm.vue
index 1fadde4..6697906 100644
--- a/src/views/equipmentManagement/repair/Form/RepairForm.vue
+++ b/src/views/equipmentManagement/repair/Form/RepairForm.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="璁惧鍚嶇О">
-          <el-select v-model="form.deviceLedgerId" @change="setDeviceModel">
+          <el-select v-model="form.deviceLedgerId" @change="setDeviceModel" filterable>
             <el-option
               v-for="(item, index) in deviceOptions"
               :key="index"
@@ -40,6 +40,19 @@
           <el-input v-model="form.repairName" placeholder="璇疯緭鍏ユ姤淇汉" />
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row v-if="id">
+      <el-col :span="12">
+        <el-form-item label="鎶ヤ慨鐘舵��">
+          <el-select v-model="form.status">
+            <el-option label="寰呯淮淇�" :value="0"></el-option>
+            <el-option label="瀹岀粨" :value="1"></el-option>
+            <el-option label="澶辫触" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="24">
         <el-form-item label="鏁呴殰鐜拌薄">
           <el-input
@@ -55,9 +68,12 @@
 </template>
 
 <script setup>
+import dayjs from "dayjs";
 import useFormData from "@/hooks/useFormData";
 import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
 import useUserStore from "@/store/modules/user";
+
+const { id } = defineProps(["id"])
 
 defineOptions({
   name: "璁惧鎶ヤ慨琛ㄥ崟",
@@ -75,9 +91,10 @@
   deviceLedgerId: undefined, // 璁惧Id
   deviceName: undefined, // 璁惧鍚嶇О
   deviceModel: undefined, // 瑙勬牸鍨嬪彿
-  repairTime: undefined, // 鎶ヤ慨鏃ユ湡
+  repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡锛岄粯璁ゅ綋澶�
   repairName: userStore.nickName, // 鎶ヤ慨浜�
   remark: undefined, // 鏁呴殰鐜拌薄
+  status: 0, // 鎶ヤ慨鐘舵��
 });
 
 const setDeviceModel = (id) => {
@@ -96,6 +113,7 @@
   form.repairTime = data.repairTime;
   form.repairName = data.repairName;
   form.remark = data.remark;
+  form.status = data.status;
 };
 
 // onMounted(() => {

--
Gitblit v1.9.3