From bc26fc90143306e858e8547cbe45da17eedd5931 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 05 三月 2025 09:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/EquipmentListOfAll.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 9239a35..490cde8 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -686,7 +686,6 @@
       <a-tab-pane
         tab="璁惧鏂囨。"
         key="1"
-        forceRender
       >
         <EquipmentDocumentList :mainId="selectedMainId" />
       </a-tab-pane>
@@ -713,28 +712,24 @@
       <a-tab-pane
         tab="澶囦欢"
         key="4"
-        forceRender
       >
         <EquipmentSpareParts :mainId="selectedMainId" />
       </a-tab-pane>
       <a-tab-pane
         tab="ABC鏍囪瘑鍙樻洿璁板綍"
         key="5"
-        forceRender
       >
         <equipment-update-ABC-list :mainId="selectedMainId" />
       </a-tab-pane>
       <a-tab-pane
         tab="璐ㄤ繚鏈熷彉鏇�"
         key="6"
-        forceRender
       >
         <equipment-update-warranty-list :mainId="selectedMainId" />
       </a-tab-pane>
       <a-tab-pane
         tab="鐐规鏍囧噯"
         key="7"
-        forceRender
       >
         <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
       </a-tab-pane>
@@ -742,23 +737,32 @@
       <a-tab-pane
         tab="浜屼繚鏍囧噯"
         key="8"
-        forceRender
       >
         <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
       </a-tab-pane>
       <a-tab-pane
         tab="涓変繚鏍囧噯"
         key="9"
-        forceRender
       >
         <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
       </a-tab-pane>
       <a-tab-pane
         tab="鐐规宸ュ崟"
         key="10"
-        forceRender
       >
         <daily-inspection-order-list-component :mainId="selectedMainId"></daily-inspection-order-list-component>
+      </a-tab-pane>
+      <a-tab-pane
+        tab="浜屼繚宸ュ崟"
+        key="11"
+      >
+        <daily-maintenance-order-list-component :mainId="selectedMainId"></daily-maintenance-order-list-component>
+      </a-tab-pane>
+      <a-tab-pane
+        tab="涓変繚宸ュ崟"
+        key="12"
+      >
+        <daily3-maintenance-order-list-component :mainId="selectedMainId"></daily3-maintenance-order-list-component>
       </a-tab-pane>
     </a-tabs>
     <equipment-modal
@@ -817,6 +821,8 @@
 import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
 import KeyEquipmentUpdateModel from './modules/equipmentNew/edit/KeyEquipmentUpdateModel.vue'
 import DailyInspectionOrderListComponent from './modules/equipmentNew/DailyInspectionOrderListComponent.vue'
+import DailyMaintenanceOrderListComponent from './modules/equipmentNew/DailyMaintenanceOrderListComponent.vue'
+import Daily3MaintenanceOrderListComponent from './modules/equipmentNew/Daily3MaintenanceOrderListComponent.vue'
 
 export default {
   name: "EquipmentList",
@@ -844,6 +850,8 @@
     KeyEquipmentUpdateModel,
     JEllipsis,
     DailyInspectionOrderListComponent,
+    DailyMaintenanceOrderListComponent,
+    Daily3MaintenanceOrderListComponent,
   },
   data() {
     return {

--
Gitblit v1.9.3