From bd88e8063c13c0fca3ca006ec7f9667d7c505473 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 31 八月 2026 13:30:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_豹鸣' into dev_天津_豹鸣

---
 src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
index 0fcccb2..5619d67 100644
--- a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
@@ -35,6 +35,11 @@
                   placeholder="璇疯緭鍏ヤ繚鍏荤粨鏋�"
                   type="text" />
       </el-form-item>
+      <el-form-item label="杩愯鐘跺喌">
+        <el-input v-model="form.runningStatus"
+                  placeholder="璇疯緭鍏ヨ繍琛岀姸鍐�"
+                  type="text" />
+      </el-form-item>
       <el-form-item label="璁惧澶囦欢">
         <el-select v-model="form.sparePartsIds"
                    :loading="loadingSparePartOptions"
@@ -104,6 +109,7 @@
     maintenanceActuallyName: undefined, // 瀹為檯淇濆吇浜�
     maintenanceActuallyTime: undefined, // 瀹為檯淇濆吇鏃ユ湡
     maintenanceResult: undefined, // 淇濆吇缁撴灉
+    runningStatus: undefined, // 杩愯鐘跺喌
     status: 0, // 淇濆吇鐘舵��
     sparePartsIds: [],
     storageBlobDTOs: [],
@@ -126,6 +132,7 @@
       ? dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss")
       : dayjs().format("YYYY-MM-DD HH:mm:ss");
     form.maintenanceResult = data.maintenanceResult;
+    form.runningStatus = data.runningStatus;
     form.status = 1; // 榛樿鐘舵�佷负瀹岀粨
     // multiple 閫夋嫨鍣ㄨ姹傛暟缁勶紱鍚庣甯歌繑鍥� "1,2,3"
     if (Array.isArray(data?.sparePartsIds)) {

--
Gitblit v1.9.3