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 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue index 4c0c2c1..6c787b6 100644 --- a/src/views/eam/repair/EamRepairOrderList.vue +++ b/src/views/eam/repair/EamRepairOrderList.vue @@ -64,9 +64,9 @@ <!--浣跨敤閮ㄩ棬--> <template slot="factoryOrgCode" slot-scope="text,record"> - {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}} + {{[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)"> @@ -168,7 +168,7 @@ }, { title: '浣跨敤閮ㄩ棬', - dataIndex: 'factoryOrgCode', + align: 'center', scopedSlots: { customRender: 'factoryOrgCode' }, fixed: 'left' }, -- Gitblit v1.9.3