From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/EquipmentListOfAll.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 9239a35..de4d6d5 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -39,7 +39,7 @@
               :wrapperCol="wrapperCol"
             >
               <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
+                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                 placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
                 v-model="queryParam.equipmentCategoryId"
               />
@@ -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,44 @@
       <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-tab-pane
+        tab="缁翠慨宸ュ崟"
+        key="13"
+      >
+        <repair-order-list-component :mainId="selectedMainId"></repair-order-list-component>
+      </a-tab-pane>
+      <a-tab-pane
+        tab="鎶�鏈姸鎬侀壌瀹�"
+        key="14"
+      >
+        <equipment-calibration-order-component :mainId="selectedMainId"></equipment-calibration-order-component>
       </a-tab-pane>
     </a-tabs>
     <equipment-modal
@@ -817,6 +833,10 @@
 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'
+import RepairOrderListComponent from './modules/equipmentNew/RepairOrderListComponent.vue'
+import EquipmentCalibrationOrderComponent from './modules/equipmentNew/EquipmentCalibrationOrderComponent.vue'
 
 export default {
   name: "EquipmentList",
@@ -844,11 +864,21 @@
     KeyEquipmentUpdateModel,
     JEllipsis,
     DailyInspectionOrderListComponent,
+    DailyMaintenanceOrderListComponent,
+    Daily3MaintenanceOrderListComponent,
+    RepairOrderListComponent,
+    EquipmentCalibrationOrderComponent,
+  },
+  props: {
+    caytegoryParam: {
+      type: String,
+      default: 'all',
+      required: true,
+    },
   },
   data() {
     return {
       description: '璁惧鍙拌处绠＄悊椤甸潰',
-      caytegoryParam: 'all',
       // 琛ㄥご
       columns: [
         {
@@ -1267,7 +1297,10 @@
         this.ipagination.current = 1;
       }
       this.onClearSelected()
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
+      if(this.caytegoryParam !== 'all') {
+        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+      }
+      let params = this.getQueryParams();//鏌ヨ鏉′欢
       this.loading = true;
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
@@ -1410,6 +1443,11 @@
               }
             })
           }
+          else {
+            this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+          }
+        } else {
+          this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
         }
       })
     },

--
Gitblit v1.9.3