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/maintenance/EamThirdMaintenanceChangeList.vue | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue index b03ad95..5865d08 100644 --- a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue +++ b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue @@ -40,6 +40,12 @@ <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange"> + + <!--浣跨敤閮ㄩ棬--> + <template slot="factoryCode" slot-scope="text,record"> + {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}} + </template> + <span slot="action" slot-scope="text, record"> <template v-if="record.changeStatus=='WAIT_SUBMIT'"> <a @click="handleEdit(record)">缂栬緫</a> @@ -131,6 +137,12 @@ fixed: 'left' }, { + title: '浣跨敤閮ㄩ棬', + align: 'center', + scopedSlots: { customRender: 'factoryCode' }, + fixed: 'left' + }, + { title: '鍙樻洿鐘舵��', align: 'center', dataIndex: 'changeStatus_dictText', -- Gitblit v1.9.3