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/OrderBOM.vue | 147 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 53 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOM.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOM.vue
index d65d30b..56c0bb3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOM.vue
@@ -71,20 +71,21 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 70, slots: { default: 'button_slot' },fixed:"left"},
- { field: 'salesOrderNo',width: 130, title: '閿�鍞崟鍙�',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
- { field: 'customerName',width: 130, title: '瀹㈡埛鍚嶇О',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- { field: 'entryName',width: 130, title: '椤圭洰鍚嶇О',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
- { field: 'batch',width: 75, title: '鎵规',sortable: true, },
- {field: 'number',width: 83, title: '璁㈠崟鏁�', sortable: true, },
- {field: 'area',width: 100, title: '璁㈠崟闈㈢Н', sortable: true,showOverflow:"ellipsis" ,},
- {field: 'types',width: 110, title: '璁㈠崟绫诲瀷', sortable: true,},
- {field: 'salesman',width: 85, title: '涓氬姟鍛�', sortable: true},
- {field: 'orderBOMGenerationTime',width: 160,title: '宸ュ崟BOM鐢熸垚鏃堕棿', sortable: true,showOverflow:"ellipsis"},
- {field: 'orderBOMAuditTime',width: 160,title: '宸ュ崟BOM瀹℃牳鏃堕棿', sortable: true},
- ],//琛ㄥご鎸夐挳
+ { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ { field: '閿�鍞崟鍙�',width: 130, title: '閿�鍞崟鍙�',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+ { field: '瀹㈡埛鍚嶇О',width: 130, title: '瀹㈡埛鍚嶇О',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ { field: '椤圭洰鍚嶇О',width: 130, title: '椤圭洰鍚嶇О',sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+ { field: '鎵规',width: 75, title: '鎵规',sortable: true, },
+ {field: '璁㈠崟鏁�',width: 83, title: '璁㈠崟鏁�', sortable: true, },
+ {field: '璁㈠崟闈㈢Н',width: 100, title: '璁㈠崟闈㈢Н', sortable: true,showOverflow:"ellipsis" ,},
+ {field: '璁㈠崟绫诲瀷',width: 110, title: '璁㈠崟绫诲瀷', sortable: true,},
+ {field: '涓氬姟鍛�',width: 85, title: '涓氬姟鍛�', sortable: true},
+ {field: '宸ュ崟BOM鐢熸垚鏃堕棿',width: 160,title: '宸ュ崟BOM鐢熸垚鏃堕棿', sortable: true,showOverflow:"ellipsis"},
+ {field: '宸ュ崟BOM瀹℃牳鏃堕棿',width: 160,title: '宸ュ崟BOM瀹℃牳鏃堕棿', sortable: true},
+ ],
+ //琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
@@ -97,57 +98,97 @@
},
data: [
{
- salesOrderNo: 'NG23121201',
- customerName: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
- entryName: '澶ф澘闀�',
- batch: '1鎵逛竴',
- number:'1212',
- area:'442.21',
- types:'鍐呴儴',
- salesman:'XX',
- orderBOMGenerationTime:'2020-01-01',
- orderBOMAuditTime:'2020-01-02',
+ //閿�鍞崟鍙�
+ 閿�鍞崟鍙�: 'NG23121201',
+ //瀹㈡埛鍚嶇О
+ 瀹㈡埛鍚嶇О: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
+ //椤圭洰鍚嶇О
+ 椤圭洰鍚嶇О: '澶ф澘闀�',
+ //鎵规
+ 鎵规: '1鎵逛竴',
+ //璁㈠崟鏁�
+ 璁㈠崟鏁�:'1212',
+ //璁㈠崟闈㈢Н
+ 璁㈠崟闈㈢Н:'442.21',
+ //璁㈠崟绫诲瀷
+ 璁㈠崟绫诲瀷:'鍐呴儴',
+ //涓氬姟鍛�
+ 涓氬姟鍛�:'XX',
+ //宸ュ崟BOM鐢熸垚鏃堕棿
+ 宸ュ崟BOM鐢熸垚鏃堕棿:'2020-01-01',
+ //宸ュ崟BOM瀹℃牳鏃堕棿
+ 宸ュ崟BOM瀹℃牳鏃堕棿:'2020-01-02',
},
{
- salesOrderNo: 'NG23121201',
- customerName: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
- entryName: '澶ф澘闀�',
- batch: '1鎵逛竴',
- number:'1212',
- area:'442.21',
- types:'鍐呴儴',
- salesman:'XX',
- orderBOMGenerationTime:'2020-01-01',
- orderBOMAuditTime:'2020-01-02',
+ //閿�鍞崟鍙�
+ 閿�鍞崟鍙�: 'NG23121201',
+ //瀹㈡埛鍚嶇О
+ 瀹㈡埛鍚嶇О: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
+ //椤圭洰鍚嶇О
+ 椤圭洰鍚嶇О: '澶ф澘闀�',
+ //鎵规
+ 鎵规: '1鎵逛竴',
+ //璁㈠崟鏁�
+ 璁㈠崟鏁�:'1212',
+ //璁㈠崟闈㈢Н
+ 璁㈠崟闈㈢Н:'442.21',
+ //璁㈠崟绫诲瀷
+ 璁㈠崟绫诲瀷:'鍐呴儴',
+ //涓氬姟鍛�
+ 涓氬姟鍛�:'XX',
+ //宸ュ崟BOM鐢熸垚鏃堕棿
+ 宸ュ崟BOM鐢熸垚鏃堕棿:'2020-01-01',
+ //宸ュ崟BOM瀹℃牳鏃堕棿
+ 宸ュ崟BOM瀹℃牳鏃堕棿:'2020-01-02',
},
{
- salesOrderNo: 'NG23121201',
- customerName: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
- entryName: '澶ф澘闀�',
- batch: '1鎵逛竴',
- number:'1212',
- area:'442.21',
- types:'鍐呴儴',
- salesman:'XX',
- orderBOMGenerationTime:'2020-01-01',
- orderBOMAuditTime:'2020-01-02',
+ //閿�鍞崟鍙�
+ 閿�鍞崟鍙�: 'NG23121201',
+ //瀹㈡埛鍚嶇О
+ 瀹㈡埛鍚嶇О: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
+ //椤圭洰鍚嶇О
+ 椤圭洰鍚嶇О: '澶ф澘闀�',
+ //鎵规
+ 鎵规: '1鎵逛竴',
+ //璁㈠崟鏁�
+ 璁㈠崟鏁�:'1212',
+ //璁㈠崟闈㈢Н
+ 璁㈠崟闈㈢Н:'442.21',
+ //璁㈠崟绫诲瀷
+ 璁㈠崟绫诲瀷:'鍐呴儴',
+ //涓氬姟鍛�
+ 涓氬姟鍛�:'XX',
+ //宸ュ崟BOM鐢熸垚鏃堕棿
+ 宸ュ崟BOM鐢熸垚鏃堕棿:'2020-01-01',
+ //宸ュ崟BOM瀹℃牳鏃堕棿
+ 宸ュ崟BOM瀹℃牳鏃堕棿:'2020-01-02',
},
{
- salesOrderNo: 'NG23121201',
- customerName: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
- entryName: '澶ф澘闀�',
- batch: '1鎵逛竴',
- number:'1212',
- area:'442.21',
- types:'鍐呴儴',
- salesman:'XX',
- orderBOMGenerationTime:'2020-01-01',
- orderBOMAuditTime:'2020-01-02',
+ //閿�鍞崟鍙�
+ 閿�鍞崟鍙�: 'NG23121201',
+ //瀹㈡埛鍚嶇О
+ 瀹㈡埛鍚嶇О: '姹熼棬棣楄揪鐗圭幓绉戞妧鏈夐檺鍏徃',
+ //椤圭洰鍚嶇О
+ 椤圭洰鍚嶇О: '澶ф澘闀�',
+ //鎵规
+ 鎵规: '1鎵逛竴',
+ //璁㈠崟鏁�
+ 璁㈠崟鏁�:'1212',
+ //璁㈠崟闈㈢Н
+ 璁㈠崟闈㈢Н:'442.21',
+ //璁㈠崟绫诲瀷
+ 璁㈠崟绫诲瀷:'鍐呴儴',
+ //涓氬姟鍛�
+ 涓氬姟鍛�:'XX',
+ //宸ュ崟BOM鐢熸垚鏃堕棿
+ 宸ュ崟BOM鐢熸垚鏃堕棿:'2020-01-01',
+ //宸ュ崟BOM瀹℃牳鏃堕棿
+ 宸ュ崟BOM瀹℃牳鏃堕棿:'2020-01-02',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
+ let footList=['璁㈠崟鏁�','璁㈠崟闈㈢Н']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
--
Gitblit v1.8.0