From 11fc602abfc00455ae7302d3c185dcec18e7780e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 11:17:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/repair/EamRepairOrderList.vue | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index b31d079..2ddc3ed 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -61,7 +61,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
:scroll="{x:'max-content'}">
<span slot="action" slot-scope="text, record">
- <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE'">
+ <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'">
<a @click="handleFillIn(record)">濉姤</a>
<a-divider type="vertical"/>
<a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
@@ -70,6 +70,23 @@
</template>
<a v-else @click="handleDetail(record)">璇︽儏</a>
+ </span>
+
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="faultPhenomenon" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultReason" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultAnalysis" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultProcess" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultPrevent" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
</span>
</a-table>
</div>
@@ -149,7 +166,16 @@
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'repairCode',
- fixed: 'left'
+ },
+ {
+ title: '鏁呴殰绫诲瀷',
+ align: 'center',
+ dataIndex: 'faultType_dictText',
+ },
+ {
+ title: '鎶ヤ慨浜�',
+ align: 'center',
+ dataIndex: 'reportPerson',
},
{
title: '缁翠慨寮�濮嬫椂闂�',
@@ -175,24 +201,34 @@
width: 200
},
{
+ title: '鏁呴殰鐜拌薄',
+ align: 'center',
+ dataIndex: 'faultPhenomenon',
+ scopedSlots: {customRender: 'faultPhenomenon'},
+ },
+ {
title: '鏁呴殰鍘熷洜',
align: 'center',
- dataIndex: 'faultReason'
+ dataIndex: 'faultReason',
+ scopedSlots: {customRender: 'faultReason'},
},
{
title: '鏁呴殰鍒嗘瀽',
align: 'center',
- dataIndex: 'faultAnalysis'
+ dataIndex: 'faultAnalysis',
+ scopedSlots: {customRender: 'faultAnalysis'},
},
{
title: '鎺掓晠杩囩▼',
align: 'center',
- dataIndex: 'faultProcess'
+ dataIndex: 'faultProcess',
+ scopedSlots: {customRender: 'faultProcess'},
},
{
title: '棰勯槻鎺柦',
align: 'center',
- dataIndex: 'faultPrevent'
+ dataIndex: 'faultPrevent',
+ scopedSlots: {customRender: 'faultPrevent'},
},
{
title: '鎿嶄綔宸�',
--
Gitblit v1.9.3