From eb6c8328231985b96ad11b38b38ae1ec926beb9a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 19 五月 2025 22:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index da7d7fa..9241046 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -154,7 +154,7 @@
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
{type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
{field:'basicName',title: t('orderBasicData.name'),filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod: filterChanged},
- {field:'nickname',title: t('orderBasicData.alias')},
+ {field:'nickname',title: t('orderBasicData.alias'),slots: { default: 'showNickname' }},
{field:'createTime',title: t('basicData.creationTime')},
@@ -278,6 +278,12 @@
</el-popconfirm>
</template>
+ <template #showNickname="{ row }">
+ <span v-if="row.basicCategory==='icon' && row.nickname!=null">picture</span>
+ <span v-else>{{row.nickname}}</span>
+
+ </template>
+
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
--
Gitblit v1.8.0