From 3bc1885d6f06d58ad04737665a91d878478a03f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Sun, 8 Dec 2024 13:19:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E5=A4=A7=E5=B1=8F=E3=80=911208?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/WmsLargeScreen/public/config.js | 12 +- .../src/views/logisticsTimeBoard.vue | 107 ++++++++++++------ 2 files changed, 81 insertions(+), 38 deletions(-) diff --git a/fe/WmsLargeScreen/public/config.js b/fe/WmsLargeScreen/public/config.js index 39a3c531b..c9d8279a8 100644 --- a/fe/WmsLargeScreen/public/config.js +++ b/fe/WmsLargeScreen/public/config.js @@ -1 +1,11 @@ -window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60087' \ No newline at end of file +window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60087' + +// 20241208临时更改 +window.SITE_CONFIG['suppliersTemp'] = [ + '海南钜懿','上海福宇龙','江苏日盈','电桥','浙江祥晋','富维视镜','安徽金莎', + '巴斯夫','华为','法雷奥市光','超力','吉林捷森','西诺塑料','美凯威奇','宏光-G', + '中镭科技','宏腾科技','长和化工','长春双阳兴龙','上海霍富','科世得润','宏光', + '吉林泰格','新众成','富维高新','鑫茂','龙方科技','珠海上富','苏州旭光','博世汽车', + 'PPG','五华实业', +] + \ No newline at end of file diff --git a/fe/WmsLargeScreen/src/views/logisticsTimeBoard.vue b/fe/WmsLargeScreen/src/views/logisticsTimeBoard.vue index 436bddb4d..30ae068bd 100644 --- a/fe/WmsLargeScreen/src/views/logisticsTimeBoard.vue +++ b/fe/WmsLargeScreen/src/views/logisticsTimeBoard.vue @@ -59,7 +59,8 @@ export default { oddRowBGC: 'rgba(10, 29, 50, 0.9)' }, config: {}, - currentServerDate:localStorage.getItem('currentServerDate') + currentServerDate:localStorage.getItem('currentServerDate'), + suppliersTemp:window.SITE_CONFIG['suppliersTemp'] } }, created() { @@ -233,20 +234,22 @@ export default { axiosUtil.ajax_get('/api/dashboard/asn-time-window/asn-time-window',_data).then(res => { // let _res = [ // { - // "supplierShortName": "GYSDM1012333", - // "timeSpan": "00:00", - // "planArriveDate": "2022-11-16T00:00:00", - // "receiptTime": "", - // "receiptStatus": null, - // "isDelay": true + // "supplierShortName": "GYSDM10166666666", + // "timeSpan": "12:00", + // "planArriveDate": "2022-11-16T12:00:00", + // "receiptTime": "2022-11-16T06:53:00", + // "receiptStatus": "null", + // "isDelay": false, + // supplierShortName:'宏光' // }, // { // "supplierShortName": "GYSDM10166666666", - // "timeSpan": "6:00", - // "planArriveDate": "2022-11-16T06:00:00", + // "timeSpan": "12:00", + // "planArriveDate": "2022-11-16T12:00:00", // "receiptTime": "2022-11-16T06:53:00", // "receiptStatus": "null", - // "isDelay": true + // "isDelay": false, + // supplierShortName:'宏光-G' // }, // { // "supplierShortName": "GYSDM10166666666", @@ -254,7 +257,8 @@ export default { // "planArriveDate": "2022-11-16T12:00:00", // "receiptTime": "2022-11-16T06:53:00", // "receiptStatus": "null", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'博世汽车' // }, // { // "supplierShortName": "GYSDM1012333111", @@ -262,7 +266,8 @@ export default { // "planArriveDate": "2022-11-16T06:00:00", // "receiptTime": "2022-11-16T06:53:00", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'海南钜懿' // }, // { // "supplierShortName": "GYSDM1012333111", @@ -270,7 +275,8 @@ export default { // "planArriveDate": "2022-11-16T08:00:00", // "receiptTime": "2022-11-16T06:53:00", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'上海福宇龙' // }, // { // "supplierShortName": "GYSDM101233322222", @@ -278,7 +284,8 @@ export default { // "planArriveDate": "2022-11-16T12:00:00", // "receiptTime": "2022-11-16T06:53:00", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'江苏日盈' // }, // { // "supplierShortName": "龙方科技", @@ -286,7 +293,8 @@ export default { // "planArriveDate": "2022-11-16T23:00:00", // "receiptTime": "2022-11-16T20:53:28.8267232", // "receiptStatus": "提前", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'电桥' // }, // { // "supplierShortName": "一汽恒威", @@ -294,7 +302,8 @@ export default { // "planArriveDate": "2022-11-16T03:30:00", // "receiptTime": "2022-11-16T07:20:28.8267232", // "receiptStatus": "延后", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'浙江祥晋' // }, // { // "supplierShortName": "重庆睿信汽车零部件", @@ -302,7 +311,8 @@ export default { // "planArriveDate": "2022-11-16T07:30:12", // "receiptTime": "2022-11-16T07:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'富维视镜' // }, // { // "supplierShortName": "上海埃姆", @@ -310,7 +320,8 @@ export default { // "planArriveDate": "2022-11-16T02:30:12", // "receiptTime": "2022-11-16T02:10:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'安徽金莎' // }, // { // "supplierShortName": "上海磊拓", @@ -318,7 +329,8 @@ export default { // "planArriveDate": "2022-11-16T23:30:12", // "receiptTime": "2022-11-16T07:22:53.2669088", // "receiptStatus": "延后", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'巴斯夫' // }, // { // "supplierShortName": "逸韩机械科技", @@ -326,7 +338,8 @@ export default { // "planArriveDate": "2022-11-16T06:30:12", // "receiptTime": "2022-11-16T02:22:53.2669088", // "receiptStatus": "提前", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'华为' // }, // { // "supplierShortName": "江苏泛亚微透", @@ -334,7 +347,8 @@ export default { // "planArriveDate": "2022-11-16T20:00:12", // "receiptTime": "2022-11-16T20:53:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'法雷奥市光' // }, // { // "supplierShortName": "埃维尔汽车部件", @@ -342,7 +356,8 @@ export default { // "planArriveDate": "2022-11-16T21:30:12", // "receiptTime": "2022-11-16T21:10:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'超力' // }, // { // "supplierShortName": "上海耀春汽车零件", @@ -350,7 +365,8 @@ export default { // "planArriveDate": "2022-11-16T05:30:12", // "receiptTime": "2022-11-16T04:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'吉林捷森' // }, // { // "supplierShortName": "江苏力崛模塑", @@ -358,7 +374,8 @@ export default { // "planArriveDate": "2022-11-16T01:00:12", // "receiptTime": "2022-11-16T07:36:53.2669088", // "receiptStatus": "延后", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'西诺塑料' // }, // { // "supplierShortName": "宝适汽车部件（太仓）", @@ -366,7 +383,8 @@ export default { // "planArriveDate": "2022-11-16T15:00:12", // "receiptTime": "", // "receiptStatus": "提前", - // "isDelay": true + // "isDelay": true, + // supplierShortName:'美凯威奇' // }, // { // "supplierShortName": "浙江华远汽车", @@ -374,7 +392,8 @@ export default { // "planArriveDate": "2022-11-16T04:00:12", // "receiptTime": "2022-11-16T05:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'中镭科技' // }, // { // "supplierShortName": "广州信强汽车配件", @@ -382,7 +401,8 @@ export default { // "planArriveDate": "2022-11-16T22:30:12", // "receiptTime": "2022-11-16T07:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'宏腾科技' // }, // { // "supplierShortName": "上海通领汽车科技", @@ -390,7 +410,8 @@ export default { // "planArriveDate": "2022-11-16T05:00:12", // "receiptTime": "2022-11-16T01:22:53.2669088", // "receiptStatus": "提前", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'长和化工' // }, // { // "supplierShortName": "高士线业（深圳）", @@ -398,7 +419,8 @@ export default { // "planArriveDate": "2022-11-16T12:30:12", // "receiptTime": "2022-11-16T13:08:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'长春双阳兴龙' // }, // { // "supplierShortName": "埃维尔汽12", @@ -406,7 +428,8 @@ export default { // "planArriveDate": "2022-11-16T12:00:12", // "receiptTime": "2022-11-16T14:22:53.2669088", // "receiptStatus": "延期", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'上海霍富' // }, // { // "supplierShortName": "埃维尔汽13", @@ -414,7 +437,8 @@ export default { // "planArriveDate": "2022-11-16T12:12:12", // "receiptTime": "2022-11-16T14:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'龙方科技' // }, // { // "supplierShortName": "埃维尔汽14", @@ -422,7 +446,8 @@ export default { // "planArriveDate": "2022-11-16T12:12:12", // "receiptTime": "2022-11-16T14:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'珠海上富' // }, // { // "supplierShortName": "埃维尔汽15", @@ -430,7 +455,8 @@ export default { // "planArriveDate": "2022-11-16T12:12:12", // "receiptTime": "2022-11-16T14:22:53.2669088", // "receiptStatus": "准时", - // "isDelay": false + // "isDelay": false, + // supplierShortName:'五华实业' // } // ]; // let _res = [ @@ -597,10 +623,17 @@ export default { // ]; this.dataLoading = false - if(res.length <= 0){ - return - } - this.initPageData(res) + if(res.length <= 0){ return } + // 20241208 + let resTemp = [] + res.forEach(item=>{ + if(this.suppliersTemp.includes(item.supplierShortName)){ + resTemp.push(item) + } + }) + if(resTemp.length <= 0){ return } + this.initPageData(resTemp) + // 20241208 let rows = this.initTableData(); this.initConfig(rows) }).catch(error => {