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/EamInspectionOrderList.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 9ad2c88..81f848c 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -86,7 +86,7 @@
<!--浣跨敤閮ㄩ棬-->
<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">
@@ -200,7 +200,7 @@
},
{
title: '浣跨敤閮ㄩ棬',
- dataIndex: 'factoryOrgCode',
+ align: 'center',
scopedSlots: { customRender: 'factoryOrgCode' },
fixed: 'left'
},
--
Gitblit v1.9.3