From d01fa9d49a8c8a723493aecb681d4e1f3e25fce5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 14:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
index 02261a1..d1954be 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
@@ -52,8 +52,8 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
// { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{title: '鎿嶄綔', width: '110', slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{field: 'supplierCode', width:'150', title: '渚涘簲鍟嗙紪鍙�', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
{field: 'supplierName', width: '150',title: '渚涘簲鍟嗗悕绉�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'agentProduct', width: '120',title: '浠ｇ悊浜у搧', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -71,10 +71,10 @@
{field: 'remark',width: '80', title: '澶囨敞', sortable: true},
],//琛ㄥご鎸夐挳
toolbarConfig: {
- buttons: [{
- 'name': '鏂板',
- 'code':'add'
- },],
+ // buttons: [{
+ // 'name': '鏂板',
+ // 'code':'add'
+ // },],
import: false,
export: true,
print: true,
@@ -183,11 +183,11 @@
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
+ <template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{item.title+': '}}</span>
+ <span>{{ row[item.field] }}</span>
</li>
</ul>
</template>
--
Gitblit v1.8.0