From 752030a34315629a07810faff9bcd6522c1ebf41 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index 7f28ac9..8c99c2a 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -78,25 +78,26 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
+ :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:secondMaintenance:edit')">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
+ <a @click="handleEdit(record)" v-if="isShowAuth('eam:thirdMaintenance:edit')">缂栬緫</a>
- <a-divider type="vertical" />
+ <a-divider type="vertical" v-if="isShowAuth('eam:thirdMaintenance:edit')" />
- <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
+ <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)" v-if="isShowAuth('eam:thirdMaintenance:collect')">
<a>棰嗗彇</a>
</a-popconfirm>
- <a-divider type="vertical" />
+ <a-divider type="vertical" v-if="isShowAuth('eam:thirdMaintenance:collect')" />
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
<a-menu slot="overlay">
- <a-menu-item>
+ <a-menu-item v-if="isShowAuth('eam:thirdMaintenance:abolish')">
<a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handlerAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
@@ -205,6 +206,16 @@
dataIndex: 'operator_dictText'
},
{
+ title: '绮惧害妫�楠屼汉',
+ align: 'center',
+ dataIndex: 'precisionChecker_dictText'
+ },
+ {
+ title: '绮惧害妫�楠屾椂闂�',
+ align: 'center',
+ dataIndex: 'precisionCheckTime'
+ },
+ {
title: '淇濆吇鐘舵��',
align: 'center',
dataIndex: 'maintenanceStatus_dictText'
@@ -215,6 +226,42 @@
dataIndex: 'creationMethod_dictText'
},
{
+ title: '鏈哄姩鍔炵‘璁�',
+ align: 'center',
+ dataIndex: 'confirmUser_dictText',
+ width: 60
+ },
+ {
+ title: '鏈哄姩鍔炵‘璁ゆ椂闂�',
+ align: 'center',
+ dataIndex: 'confirmTime',
+ width: 60
+ },
+ {
+ title: '鏈哄姩鍔炴剰瑙�',
+ align: 'center',
+ dataIndex: 'confirmComment',
+ width: 60
+ },
+ {
+ title: '纭棰嗗',
+ align: 'center',
+ dataIndex: 'confirmLeader_dictText',
+ width: 60
+ },
+ {
+ title: '棰嗗纭鏃堕棿',
+ align: 'center',
+ dataIndex: 'leaderConfirmTime',
+ width: 60
+ },
+ {
+ title: '棰嗗鎰忚',
+ align: 'center',
+ dataIndex: 'leaderConfirmComment',
+ width: 60
+ },
+ {
title: '澶囨敞',
align: 'center',
dataIndex: 'remark'
--
Gitblit v1.9.3