From 886748a39efb188d8008d41f2718eb78f3006ddd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/EamEquipmentLedger.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 725b672..8ce27e9 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -102,7 +102,7 @@
<!--浣跨敤閮ㄩ棬-->
<template slot="factoryOrgCode" slot-scope="text,record">
- {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
+ {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
</template>
<!--瀹夎浣嶇疆-->
@@ -220,7 +220,6 @@
},
{
title: '浣跨敤閮ㄩ棬',
- align: 'center',
dataIndex: 'factoryOrgCode',
scopedSlots: { customRender: 'factoryOrgCode' }
},
--
Gitblit v1.9.3