From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +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 | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..321555c 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
@@ -42,6 +42,10 @@
{
"label": t('orderBasicData.saleMan'),
"value": "saleMan"
+ },
+ {
+ "label": t('order.edgingType'),
+ "value": "edgingType"
}
]
},
@@ -154,7 +158,8 @@
{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'),filters: [{data: ''}],slots: { default: 'showNickname' ,filter: 'num1_filter'},filterMethod: filterChanged},
+ {field:'sort',title: t('processCard.sorting'),sortable: true,filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field:'createTime',title: t('basicData.creationTime')},
@@ -203,11 +208,8 @@
const getChildrenFunction = (flag) => {
if(flag){
- router.push({
- path:'/main/orderBasicData/searchBasicData',
- query:{random:Math.random()
- }
- })
+ dialogTableVisible.value=false
+ handleChange()
}
}
@@ -278,6 +280,11 @@
</el-popconfirm>
</template>
+ <template #showNickname="{ row,column, $panel }">
+ <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 +309,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>
@@ -312,7 +319,9 @@
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
- style="width: 30%;height:40% ">
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 30%;height:50% ">
<create-basic-data :rowIndex="rowIndex" @gaveParent='getChildrenFunction'/>
</el-dialog>
</div>
--
Gitblit v1.8.0