From 8fb51e669650aafa89ab3743a73df0bb045fd42d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 27 十一月 2023 11:34:20 +0800
Subject: [PATCH] 修改

---
 src/views/eam/EquipmentListOfTester.vue |   62 ++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index df70aef..8dee022 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="5">
+          <a-col :span="6">
             <a-form-item
             label="璁惧鎵�灞炲垎绫�" 
             :labelCol="labelCol"
@@ -18,7 +18,7 @@
             </a-form-item>
           </a-col>
           <a-col
-          :span="5"
+          :span="6"
           >
             <a-form-item 
             :labelCol="labelCol"
@@ -32,7 +32,7 @@
             </a-form-item>
           </a-col>
           <a-col
-          :span="5"
+          :span="6"
           >
             <a-form-item 
             :labelCol="labelCol"
@@ -45,7 +45,7 @@
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="5">
+          <a-col :span="6">
             <a-form-item
               label="鍨嬪彿"
               :labelCol="labelCol"
@@ -56,24 +56,8 @@
                 placeholder="璇疯緭鍏ュ瀷鍙�"
             ></a-input>
             </a-form-item>
-          </a-col>
-          <a-col :span="4">
-          <span
-              style="float: left;overflow: hidden;"
-              class="table-page-search-submitButtons"
-            >
-              <a
-                @click="handleToggleSearch"
-                style="margin-left: 8px"
-              >
-                {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
-              </a>
-            </span>
-          </a-col>
-         
+          </a-col>    
         </a-row>
-        <template v-if="toggleSearchStatus">
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item
@@ -220,7 +204,6 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        </template>
       </a-form>
     </div>
     <!-- 鏌ヨ鍖哄煙-END -->
@@ -450,8 +433,14 @@
       <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
         <equipment-update-warranty-list :mainId="selectedMainId" />
       </a-tab-pane>
-      <a-tab-pane tab="淇濆吇鐐规鏍囧噯" key="7" forceRender>
-       <standard-of-maintenance :mainId="selectedMainId"/>
+      <a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
+        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
+      </a-tab-pane>
+      <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-tabs>
     <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
@@ -479,12 +468,15 @@
   import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
   import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
   import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
   import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
+  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
   import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
   import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
   import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
+  import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
+  import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
+  import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
   export default {
     name: "EquipmentList",
     mixins:[JeecgListMixin,mixinDevice],
@@ -505,6 +497,9 @@
         EquipmentSparePartsModal,
         StandardOfInspection,
         StandardOfMaintenance,
+        DailyMaintenanceList,
+        SecondMaintenanceList,
+        ThirdMaintenanceList,
     },
     data () {
       return {
@@ -578,10 +573,25 @@
           dataIndex: 'specificEquipment_dictText',
         },
         {
+          title: '鎶�鏈姸鎬�',
+          align: "center",
+          dataIndex: 'technologyStatus_dictText',
+        },
+        {
           title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
           align: "center",
           dataIndex: 'technologyStatusVerificationType_dictText',
         },
+        {
+          title: '鐢熶骇绾跨紪鍙�',
+          align: "center",
+          dataIndex: 'lineId_dictText',
+        },
+        {
+          title: '涓昏澶�?',
+          align: "center",
+          dataIndex: 'isMeta_dictText',
+        },
         // {
         //   title: '宸ュ尯',
         //   align: "center",

--
Gitblit v1.9.3