From b6831163ebaefff36901a100faae6dcf538b1215 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 03 九月 2025 13:12:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 6921c96..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">
@@ -302,7 +308,7 @@
</el-col>
</template>
<template #add>
- <el-button @click="add" type="primary" style="margin-right: 3px">鏂板</el-button>
+ <el-button @click="add" type="primary" style="margin-right: 3px">{{$t('basicData.insert')}}</el-button>
</template>
--
Gitblit v1.8.0