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/processCard/PrintFlowCard.vue | 151 +++++++++++++++++++++++++-------------------------
1 files changed, 76 insertions(+), 75 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 57419a8..7f5d48c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -63,20 +63,21 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- // {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'productionOrderNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'entryName',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'sliceMarking',width: 90, title: '鐗囨爣璁�', sortable: true,showOverflow:"ellipsis"},
- {field: 'marking',width: 80, title: '鏍囪', sortable: true},
- {field: 'pieces',width: 80, title: '鐗囨暟', sortable: true},
- {field: 'area',width: 80, title: '闈㈢Н', sortable: true,showOverflow:"ellipsis"},
- {field: 'productName',width: 120, title: '浜у搧鍚嶇О', sortable: true},
- {field: 'floorNumber',width: 120, title: '妤煎眰缂栧彿', sortable: true},
- {field: 'divider', width: 120,title: '鍒嗘灦鍛�', sortable: true},
- {field: 'splittingTime',width: 120, title: '鍒嗘灦鏃堕棿', sortable: true},
- {field: 'notes',width: 120, title: '澶囨敞', sortable: true}
+ {field: '閿�鍞崟鍙�',width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '鐢熶骇璁㈠崟鍙�',width: 140, title: '鐢熶骇璁㈠崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '娴佺▼鍗″彿',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '瀹㈡埛鍚嶇О',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '椤圭洰鍚嶇О',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '鐗囨爣璁�',width: 90, title: '鐗囨爣璁�', sortable: true,showOverflow:"ellipsis"},
+ {field: '鏍囪',width: 80, title: '鏍囪', sortable: true},
+ {field: '鐗囨暟',width: 80, title: '鐗囨暟', sortable: true},
+ {field: '闈㈢Н',width: 80, title: '闈㈢Н', sortable: true,showOverflow:"ellipsis"},
+ {field: '浜у搧鍚嶇О',width: 120, title: '浜у搧鍚嶇О', sortable: true},
+ {field: '鍗曠墖鍚嶇О',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
+ {field: '妤煎眰缂栧彿',width: 120, title: '妤煎眰缂栧彿', sortable: true},
+ {field: '鍒嗘灦鍛�', width: 120,title: '鍒嗘灦鍛�', sortable: true},
+ {field: '鍒嗘灦鏃堕棿',width: 120, title: '鍒嗘灦鏃堕棿', sortable: true},
+ {field: '澶囨敞',width: 120, title: '澶囨敞', sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -106,77 +107,77 @@
},
data: [
{
- salesOrderNo: 'NG231201',
- productionOrderNo:'NG231201A',
- processCard: 'NG231201A01',
- customerName:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- entryName:'閾堕殕骞垮満',
- sliceMarking:'(澶�)',
- marking:'1',
- pieces:'16',
- area:'24.14',
- productName: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- singlePieceName: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- floorNumber: '16-BSGB05',
- divider: '鏅舰',
- splittingTime: '2023-01-11',
- notes: '',
+ 閿�鍞崟鍙�: 'NG231201',
+ 鐢熶骇璁㈠崟鍙�:'NG231201A',
+ 娴佺▼鍗″彿: 'NG231201A01',
+ 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
+ 椤圭洰鍚嶇О:'閾堕殕骞垮満',
+ 鐗囨爣璁�:'(澶�)',
+ 鏍囪:'1',
+ 鐗囨暟:'16',
+ 闈㈢Н:'24.14',
+ 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
+ 妤煎眰缂栧彿: '16-BSGB05',
+ 鍒嗘灦鍛�: '寮犱笁',
+ 鍒嗘灦鏃堕棿: '2023-01-11',
+ 澶囨敞: '',
},
{
- salesOrderNo: 'NG231201',
- productionOrderNo:'NG231201A',
- processCard: 'NG231201A01',
- customerName:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- entryName:'閾堕殕骞垮満',
- sliceMarking:'(鍐�)',
- marking:'2',
- pieces:'16',
- area:'24.14',
- productName: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- singlePieceName: '10mm瓒呯櫧骞抽挗(鍐�)',
- floorNumber: '16-BSGB05',
- divider: '鏅舰',
- splittingTime: '2023-01-11',
- notes: '',
+ 閿�鍞崟鍙�: 'NG231201',
+ 鐢熶骇璁㈠崟鍙�:'NG231201A',
+ 娴佺▼鍗″彿: 'NG231201A01',
+ 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
+ 椤圭洰鍚嶇О:'閾堕殕骞垮満',
+ 鐗囨爣璁�:'(澶�)',
+ 鏍囪:'1',
+ 鐗囨暟:'16',
+ 闈㈢Н:'24.14',
+ 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
+ 妤煎眰缂栧彿: '16-BSGB05',
+ 鍒嗘灦鍛�: '寮犱笁',
+ 鍒嗘灦鏃堕棿: '2023-01-11',
+ 澶囨敞: '',
},
{
- salesOrderNo: 'NG231201',
- productionOrderNo:'NG231201A',
- processCard: 'NG231201A02',
- customerName:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- entryName:'閾堕殕骞垮満',
- sliceMarking:'(澶�)',
- marking:'1',
- pieces:'6',
- area:'24.14',
- productName: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- singlePieceName: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- floorNumber: '16-BSGB05',
- divider: '鏅舰',
- splittingTime: '2023-01-11',
- notes: '',
+ 閿�鍞崟鍙�: 'NG231201',
+ 鐢熶骇璁㈠崟鍙�:'NG231201A',
+ 娴佺▼鍗″彿: 'NG231201A01',
+ 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
+ 椤圭洰鍚嶇О:'閾堕殕骞垮満',
+ 鐗囨爣璁�:'(澶�)',
+ 鏍囪:'1',
+ 鐗囨暟:'16',
+ 闈㈢Н:'24.14',
+ 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
+ 妤煎眰缂栧彿: '16-BSGB05',
+ 鍒嗘灦鍛�: '寮犱笁',
+ 鍒嗘灦鏃堕棿: '2023-01-11',
+ 澶囨敞: '',
},
{
- salesOrderNo: 'NG231201',
- productionOrderNo:'NG231201A',
- processCard: 'NG231201A02',
- customerName:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- entryName:'閾堕殕骞垮満',
- sliceMarking:'(鍐�)',
- marking:'2',
- pieces:'6',
- area:'24.14',
- productName: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- singlePieceName: '10mm瓒呯櫧骞抽挗(鍐�)',
- floorNumber: '16-BSGB05',
- divider: '鏅舰',
- splittingTime: '2023-01-11',
- notes: '',
+ 閿�鍞崟鍙�: 'NG231201',
+ 鐢熶骇璁㈠崟鍙�:'NG231201A',
+ 娴佺▼鍗″彿: 'NG231201A01',
+ 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
+ 椤圭洰鍚嶇О:'閾堕殕骞垮満',
+ 鐗囨爣璁�:'(澶�)',
+ 鏍囪:'1',
+ 鐗囨暟:'16',
+ 闈㈢Н:'24.14',
+ 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
+ 妤煎眰缂栧彿: '16-BSGB05',
+ 鍒嗘灦鍛�: '寮犱笁',
+ 鍒嗘灦鏃堕棿: '2023-01-11',
+ 澶囨敞: '',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['pieces','area']
+ let footList=['鐗囨暟','闈㈢Н']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
--
Gitblit v1.8.0