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/SelectProcessCard.vue | 176 +++++++++++++++++++++++++++-------------------------------
1 files changed, 82 insertions(+), 94 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 574deb0..f298d8b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -62,18 +62,18 @@
},//琛ㄥご鍙傛暟
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', 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: 'productID', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'entryName', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
- {field: 'total', title: '鎬绘暟閲�', sortable: true},
- {field: 'TotalArea', title: '鎬婚潰绉�', sortable: true},
- {field: 'Cases', title: '鍒嗙', sortable: true,showOverflow:"ellipsis"},
- {field: 'divider', title: '鍒嗘灦鍛�', sortable: true},
- {field: 'processRequirements', title: '鍔犲伐瑕佹眰', sortable: true}
+ { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '娴佺▼鍗″彿', width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '浜у搧缂栧彿', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
+ {field: '鎬绘暟閲�', title: '鎬绘暟閲�', sortable: true},
+ {field: '鎬婚潰绉�', title: '鎬婚潰绉�', sortable: true},
+ {field: '鍒嗙鏁�', title: '鍒嗙鏁�', sortable: true,showOverflow:"ellipsis"},
+ {field: '鍒嗘灦鍛�', title: '鍒嗘灦鍛�', sortable: true},
+ {field: '鍔犲伐瑕佹眰', title: '鍔犲伐瑕佹眰', sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -88,105 +88,93 @@
},
data: [
{
- salesOrderNo: 'NG231201',
- productionOrderNo: 'NG231201A01 ',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231201',
- productionOrderNo: 'NG231201B01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231202',
- productionOrderNo: 'NG231202A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231203',
- productionOrderNo: 'NG231203A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231204',
- productionOrderNo: 'NG231204A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231205',
- productionOrderNo: 'NG231205A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
{
- salesOrderNo: 'NG231206',
- productionOrderNo: 'NG231206A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- },
- {
- salesOrderNo: 'NG231207',
- productionOrderNo: 'NG231207A01',
- productID: '9001010203000008',
- productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- Cases: '3',
- divider: 'xxx',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閿�鍞崟鍙�: 'NG231201',
+ 娴佺▼鍗″彿: 'NG231201A01 ',
+ 浜у搧缂栧彿: '9001010203000008',
+ 浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎬绘暟閲�: '169',
+ 鎬婚潰绉�: '175.31',
+ 鍒嗙鏁�: '3',
+ 鍒嗘灦鍛�: 'xxx',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['total','TotalArea','Cases']
+ let footList=['鎬绘暟閲�','鎬婚潰绉�','鍒嗙鏁�']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
--
Gitblit v1.8.0