From a8441611deb2a51bb16a0f85e83a2750840c18f4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 09 七月 2025 16:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamMaintenanceStandardList.vue | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index e04390f..f437afa 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -90,19 +90,10 @@
<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
</div>
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- :customRow='clickThenSelect'
- @change="handleTableChange">
+ <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+ :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
+ @change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">鍗囩増</a>
@@ -125,14 +116,33 @@
</span>
</a-table>
- <a-tabs defaultActiveKey="1">
- <a-tab-pane tab='淇濆吇鏍囧噯鏄庣粏椤�' key="1">
- <div class="table-operator" style="margin:-16px">
- <eam-maintenance-standard-detail-list ref="standardDetailRef" :standardId="standardId"
- :pageSelectionRow="selectionRows[0]"/>
- </div>
- </a-tab-pane>
+ <a-tabs defaultActiveKey="1" v-if="selectionRows.length===1">
+ <template v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='POINT_INSPECTION'">
+ <a-tab-pane tab="鏃ョ偣妫�" key="1">
+ <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]"
+ filterKey="DAY_INSPECTION"/>
+ </a-tab-pane>
+ <a-tab-pane tab="鍛ㄧ偣妫�" key="2" forceRender>
+ <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]"
+ filterKey="WEEK_INSPECTION"/>
+ </a-tab-pane>
+ </template>
+ <template v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='SECOND_MAINTENANCE'">
+ <a-tab-pane tab="鎿嶄綔宸�" key="1">
+ <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]"
+ filterKey="OPERATOR_MAINTENANCE"/>
+ </a-tab-pane>
+ <a-tab-pane tab="缁翠慨宸�" key="2" forceRender>
+ <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]"
+ filterKey="REPAIRER_MAINTENANCE"/>
+ </a-tab-pane>
+ </template>
+
+ <a-tab-pane tab="涓変繚" key="1" v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='THIRD_MAINTENANCE'">
+ <eam-maintenance-standard-detail-list :standardId="standardId"
+ :pageSelectionRow="selectionRows[0]"/>
+ </a-tab-pane>
</a-tabs>
</div>
<!-- table鍖哄煙-end -->
@@ -243,9 +253,8 @@
secondMaintenanceImportExcel: '/eam/maintenanceStandard/importSecondMaintenanceStandard',
thirdMaintenanceImportExcel: '/eam/maintenanceStandard/importThirdMaintenanceStandard',
inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/鐐规鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- weekMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鍛ㄤ繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/浜屼繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/涓変繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx'
+ secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/浜屼繚鏍囧噯瀵煎叆妯℃澘_v1.0.docx',
+ thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/涓変繚鏍囧噯瀵煎叆妯℃澘_v1.0.docx'
},
standardId: '-1'
}
--
Gitblit v1.9.3