From 5ec150affc0fc777b2a645a888d377f65501e08b Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 05 九月 2025 10:06:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/eam/repair/EamRepairOrderList.vue | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue index d7946bc..6c787b6 100644 --- a/src/views/eam/repair/EamRepairOrderList.vue +++ b/src/views/eam/repair/EamRepairOrderList.vue @@ -61,6 +61,12 @@ :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" :scroll="{x:'max-content'}"> + + <!--浣跨敤閮ㄩ棬--> + <template slot="factoryOrgCode" slot-scope="text,record"> + {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}} + </template> + <span slot="action" slot-scope="text, record"> <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'"> <a-popconfirm v-if="record.claimStatus=='0' || record.claimStatus==null " title="纭畾鎻愪氦鍚�?" @confirm="() => handleClaim(record.id)"> @@ -161,6 +167,12 @@ fixed: 'left' }, { + title: '浣跨敤閮ㄩ棬', + align: 'center', + scopedSlots: { customRender: 'factoryOrgCode' }, + fixed: 'left' + }, + { title: '缁翠慨鐘舵��', align: 'center', dataIndex: 'repairStatus_dictText', -- Gitblit v1.9.3