From d5868d38cd7d46c52da971d7d0388d229495d729 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 一月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue | 108 +++++++++++++++++++++++++----------------------------
1 files changed, 51 insertions(+), 57 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
index c711d7c..4ba9d06 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
@@ -71,25 +71,25 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{ slots: { default: 'state' }, title: '鍩哄噯BOM', width: 110 },
{ slots: { default: 'state' }, title: '鏍囧噯BOM', width: 110 },
{ slots: { default: 'state' }, title: '瀹℃牳', width: 80 },
- {field: 'customerNumber', width: 120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'productNumber', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'productName',width: 120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'glassLength', width: 100,title: '鐜荤拑闀�', sortable: true,showOverflow:"ellipsis"},
- {field: 'glassWidth', width: 100,title: '鐜荤拑瀹�', sortable: true},
- {field: 'thickness',width: 100, title: '鍘氬害', sortable: true},
- {field: 'shape',width: 120, title: '褰㈢姸', sortable: true,showOverflow:"ellipsis"},
- {field: 'notes', width: 120,title: '澶囨敞', sortable: true},
- {field: 'productCreator',width: 120, title: '浜у搧鍒涘缓浜�', sortable: true},
- {field: 'BOMCreator',width: 120, title: 'BOM鍒涘缓浜�', sortable: true},
- {field: 'auditor',width: 120, title: '瀹℃牳鍛�', sortable: true}
- ],//琛ㄥご鎸夐挳
-
+ {field: '瀹㈡埛缂栧彿', width: 120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '瀹㈡埛鍚嶇О',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '浜у搧缂栧彿', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '浜у搧鍚嶇О',width: 120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '鐜荤拑闀�', width: 100,title: '鐜荤拑闀�', sortable: true,showOverflow:"ellipsis"},
+ {field: '鐜荤拑瀹�', width: 100,title: '鐜荤拑瀹�', sortable: true},
+ {field: '鍘氬害',width: 100, title: '鍘氬害', sortable: true},
+ {field: '褰㈢姸',width: 120, title: '褰㈢姸', sortable: true,showOverflow:"ellipsis"},
+ {field: '澶囨敞', width: 120,title: '澶囨敞', sortable: true},
+ {field: '浜у搧鍒涘缓浜�',width: 120, title: '浜у搧鍒涘缓浜�', sortable: true},
+ {field: 'BOM鍒涘缓浜�',width: 120, title: 'BOM鍒涘缓浜�', sortable: true},
+ {field: '瀹℃牳鍛�',width: 120, title: '瀹℃牳鍛�', sortable: true}
+ ],
+ //琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
@@ -102,52 +102,46 @@
},
data: [
{
- customerNumber: 'D123123',
- customerName: 'XXXX鍏徃',
- productNumber: '06040000022',
- productName:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- glassLength:'1440',
- glassWidth:'3660',
- thickness:'30',
- shape:'鏅舰',
- notes:'111',
- productCreator:'寮犱笁',
- BOMCreator:'鏉庡洓',
- auditor:'鐜嬩簲',
-
-
+ 瀹㈡埛缂栧彿: 'D123123',
+ 瀹㈡埛鍚嶇О: 'XXXX鍏徃',
+ 浜у搧缂栧彿: '06040000022',
+ 浜у搧鍚嶇О:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鐜荤拑闀�:'1440',
+ 鐜荤拑瀹�:'3660',
+ 鍘氬害:'30',
+ 褰㈢姸:'鏅舰',
+ 澶囨敞:'111',
+ 浜у搧鍒涘缓浜�:'寮犱笁',
+ BOM鍒涘缓浜�:'鏉庡洓',
+ 瀹℃牳鍛�:'鐜嬩簲',
},
{
- customerNumber: 'D123123',
- customerName: 'XXXX鍏徃',
- productNumber: '06040000022',
- productName:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- glassLength:'1440',
- glassWidth:'3660',
- thickness:'30',
- shape:'鏅舰',
- notes:'111',
- productCreator:'寮犱笁',
- BOMCreator:'鏉庡洓',
- auditor:'鐜嬩簲',
-
-
+ 瀹㈡埛缂栧彿: 'D123123',
+ 瀹㈡埛鍚嶇О: 'XXXX鍏徃',
+ 浜у搧缂栧彿: '06040000022',
+ 浜у搧鍚嶇О:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鐜荤拑闀�:'1440',
+ 鐜荤拑瀹�:'3660',
+ 鍘氬害:'30',
+ 褰㈢姸:'鏅舰',
+ 澶囨敞:'111',
+ 浜у搧鍒涘缓浜�:'寮犱笁',
+ BOM鍒涘缓浜�:'鏉庡洓',
+ 瀹℃牳鍛�:'鐜嬩簲',
},
{
- customerNumber: 'D123123',
- customerName: 'XXXX鍏徃',
- productNumber: '06040000022',
- productName:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- glassLength:'1440',
- glassWidth:'3660',
- thickness:'30',
- shape:'鏅舰',
- notes:'111',
- productCreator:'寮犱笁',
- BOMCreator:'鏉庡洓',
- auditor:'鐜嬩簲',
-
-
+ 瀹㈡埛缂栧彿: 'D123123',
+ 瀹㈡埛鍚嶇О: 'XXXX鍏徃',
+ 浜у搧缂栧彿: '06040000022',
+ 浜у搧鍚嶇О:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鐜荤拑闀�:'1440',
+ 鐜荤拑瀹�:'3660',
+ 鍘氬害:'30',
+ 褰㈢姸:'鏅舰',
+ 澶囨敞:'111',
+ 浜у搧鍒涘缓浜�:'寮犱笁',
+ BOM鍒涘缓浜�:'鏉庡洓',
+ 瀹℃牳鍛�:'鐜嬩簲',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
--
Gitblit v1.8.0