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/SelectAddProcess.vue | 178 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 2f4321c..756c9eb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -62,18 +62,19 @@
},//琛ㄥご鍙傛暟
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"},
- {field: 'salesOrderNo', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'customerName', title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'entryName', title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'batch', title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'originalFilmRequired', title: '鍘熺墖瑕佹眰', sortable: true,showOverflow:"ellipsis"},
- {field: 'trademark', title: '鍟嗘爣閫夐」', sortable: true},
- {field: 'salesman', title: '涓氬姟鍛�', sortable: true},
- {field: 'processRequirements', title: '鍔犲伐瑕佹眰', sortable: true,showOverflow:"ellipsis"},
- {field: 'shipTo', title: '閫佽揣鍦板潃', sortable: true},
- {field: 'deliveryDate', title: '浜よ揣鏃ユ湡', sortable: true}
+ { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '瀹㈡埛鍚嶇О', 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},
+ {field: '鍔犲伐瑕佹眰', title: '鍔犲伐瑕佹眰', sortable: true,showOverflow:"ellipsis"},
+ {field: '閫佽揣鍦板潃', title: '閫佽揣鍦板潃', sortable: true},
+ {field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -88,96 +89,95 @@
},
data: [
{
- salesOrderNo: 'NG231201',
- customerName:"鎱曞鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231202',
- customerName:"澶ц崚寤烘潗鏈夐檺鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231203',
- customerName:"寤虹瓚宸ョ▼闆嗗洟鏈夐檺鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231204',
- customerName:"鎱曞鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231205',
- customerName:"鎱曞鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231206',
- customerName:"鎱曞鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
{
- salesOrderNo: 'NG231207',
- customerName:"鎱曞鍏徃",
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '23鎵�',
- originalFilmRequired: '2022/5/24XFPO202205202',
- trademark:'鍖楃幓鍟嗘爣',
- orderType: '鏅�氳鍗�',
- salesman: 'XXX',
- processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
- shipTo:'宸ュ湴',
- deliveryDate:'2024-01-12'
-
+ 閿�鍞崟鍙�: 'NG231201',
+ 瀹㈡埛鍚嶇О:"鎱曞鍏徃",
+ 椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
+ 鎵规: '23鎵�',
+ 鍘熺墖瑕佹眰: '2022/5/24XFPO202205202',
+ 鍟嗘爣閫夐」:'鍖楃幓鍟嗘爣',
+ 璁㈠崟绫诲瀷: '鏅�氳鍗�',
+ 涓氬姟鍛�: 'XXX',
+ 鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+ 閫佽揣鍦板潃:'宸ュ湴',
+ 浜よ揣鏃ユ湡:'2024-01-12'
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
--
Gitblit v1.8.0