From 9a8caa93b53fb009ccac2c293b1157d97675a3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 26 Jan 2024 15:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=83=E9=A9=B0=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E3=80=91=E5=A7=94=E5=A4=96=E7=9B=B8=E5=85=B3=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PC/IAC_LargeScreen/public/config.js | 2 +- PC/IAC_LargeScreen/src/styles/index.css | 3 + PC/IAC_LargeScreen/src/styles/index.less | 3 + PC/IAC_LargeScreen/src/utils/dateUtil.js | 8 + PC/IAC_LargeScreen/src/utils/util.js | 4 +- PC/IAC_LargeScreen/src/views/reserveBoard.vue | 48 +- .../src/views/shippingBoard.vue | 518 +++++++++++++----- PC/IAC_LargeScreen/src/views/stockBoard.vue | 35 +- PC/IAC_LargeScreen/vue.config.js | 2 +- .../src/components/reportPageHeader/index.vue | 16 +- .../src/router/index.js | 19 + .../src/views/report/outsourcingOutReport.vue | 50 ++ .../views/report/outsourcingReturnReport.vue | 50 ++ .../src/views/report/procureHasPOReport.vue | 5 +- 14 files changed, 578 insertions(+), 185 deletions(-) create mode 100644 PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue create mode 100644 PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue diff --git a/PC/IAC_LargeScreen/public/config.js b/PC/IAC_LargeScreen/public/config.js index 39a3c53..3a19e6b 100644 --- a/PC/IAC_LargeScreen/public/config.js +++ b/PC/IAC_LargeScreen/public/config.js @@ -1 +1 @@ -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:10095' \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/styles/index.css b/PC/IAC_LargeScreen/src/styles/index.css index 1f127cd..8fe82b3 100644 --- a/PC/IAC_LargeScreen/src/styles/index.css +++ b/PC/IAC_LargeScreen/src/styles/index.css @@ -184,3 +184,6 @@ .statusBlockItem_normal { background: #28b119; } +.statusBlockItem_white { + background: #6150e7; +} diff --git a/PC/IAC_LargeScreen/src/styles/index.less b/PC/IAC_LargeScreen/src/styles/index.less index 221ac09..af7caea 100644 --- a/PC/IAC_LargeScreen/src/styles/index.less +++ b/PC/IAC_LargeScreen/src/styles/index.less @@ -209,4 +209,7 @@ } .statusBlockItem_normal{ background:#28b119 +} +.statusBlockItem_white{ + background: #6150e7; } \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/utils/dateUtil.js b/PC/IAC_LargeScreen/src/utils/dateUtil.js index 53e0cc2..6c52093 100644 --- a/PC/IAC_LargeScreen/src/utils/dateUtil.js +++ b/PC/IAC_LargeScreen/src/utils/dateUtil.js @@ -60,9 +60,17 @@ var getServerTime = function (callback){ }) } +var formatTimeStrToStr = function (timeStr) { + if (timeStr.lastIndexOf('.') == -1) { + return timeStr.replace('T',' ').substring(0,timeStr.length) + } + return timeStr.replace('T',' ').substring(0,timeStr.lastIndexOf('.')) +} + export default { getAgoDay: getAgoDay, // 获取当前天前几天 getnowDay: getnowDay, // 获取当前时间 yyyy-dd-mm getnowTime: getnowTime, // 获取当前时间 hh:mm:ss getServerTime:getServerTime,// 获取服务器时间 走接口 + formatTimeStrToStr:formatTimeStrToStr,//2022-08-31T09:45:51.9340433 转 2022-08-31 09:45:51 } \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/utils/util.js b/PC/IAC_LargeScreen/src/utils/util.js index fc36416..2873471 100644 --- a/PC/IAC_LargeScreen/src/utils/util.js +++ b/PC/IAC_LargeScreen/src/utils/util.js @@ -5,6 +5,8 @@ var addEventResizeFlesh = function(){ }) } export default { - waitTime:20000,//滚屏列表刷新等待间隔配置项 + // waitTime:30000,//滚屏列表-滚屏间隔 半分钟 + waitTime:300000,//滚屏列表-滚屏间隔 5分钟 + fleshTime:1800000,//滚屏列表-刷新间隔 半小时 addEventResizeFlesh:addEventResizeFlesh, } \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/views/reserveBoard.vue b/PC/IAC_LargeScreen/src/views/reserveBoard.vue index ae3e51d..98bdc2b 100644 --- a/PC/IAC_LargeScreen/src/views/reserveBoard.vue +++ b/PC/IAC_LargeScreen/src/views/reserveBoard.vue @@ -24,12 +24,12 @@ export default { dataLoading: true, // config默认项 configDefult:{ - header:['供应商', '供应商代码', '到货单号', '到货日期', '到货时间窗口','提醒','状态' ], - waitTime: util.waitTime,//每页停留20秒d + header:['供应商', '供应商代码', '到货单号', '到货日期', '到货时间窗口','收货口','状态' ], + waitTime: util.waitTime, carousel: 'page', // index: true, // indexHeader: '序号', - columnWidth: [350], + // columnWidth: [350], align: ['left','center','center','center','center','center','center',], hoverPause: false, // 鼠标悬浮时，不停止轮播 rowNum: 10, @@ -44,10 +44,11 @@ export default { created() { this.initConfig() this.getList() + //刷新数据 clearInterval(this.intervalId) this.intervalId = setInterval(() => { this.getList() - }, 60000)//一分钟刷新数据 + }, util.fleshTime) util.addEventResizeFlesh() }, destroyed() { @@ -81,10 +82,11 @@ export default { this.dataLoading = true this.initConfig() // axiosUtil.ajax_get('/api/dashboard/plan-and-actual/plan-actual-list').then(res => { + axiosUtil.ajax_post('/api/wms/store/board/purchase-receipt-board').then(res => { this.dataLoading = false - // if(res.length <= 0){ - // return - // } + if(res.length <= 0){ + return + } let rows = [] // 假数据 let _res = [ @@ -278,28 +280,29 @@ export default { "status":'准时' }, ] - _res.forEach(item=>{ + res.forEach(item=>{ let _item = [] - _item[0] = item.supplier;//供应商 + _item[0] = item.supplierName;//供应商 _item[1] = item.supplierCode;//供应商代码 - _item[2] = item.arrivalNumber;//到货单号 - _item[3] = item.arrivalTime;//到货日期 - _item[4] = item.timeSlot;//到货窗口时间 - _item[5] = item.remind;//提醒 - _item[6] = item.status;//状态 - if(item.status == '延迟'){ - _item[6] = `${item.status}`;//状态 + _item[2] = item.asnNumber;//到货单号 + _item[3] = item.arrivalDate;//到货日期 + _item[4] = item.timeWindow;//到货窗口时间 + _item[5] = item.dockCode;//发货口 + if(item.status == 'red'){ + _item[6] = `延迟`;//状态 + }else if(item.status == 'green'){ + _item[6] = `收货中`;//状态 }else{ - _item[6] = `${item.status}`;//状态 + _item[6] = `未到收货时间`;//状态 } rows.push(_item) }) this.initConfig(rows) // this_.$refs['reserveBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 - // }).catch(error => { - // this.dataLoading = false - // console.log(error) - // }) + }).catch(error => { + this.dataLoading = false + console.log(error) + }) }, } } @@ -321,5 +324,8 @@ export default { margin: 2rem; height: calc(100vh - 10rem); } + .dv-scroll-board .rows .ceil{ + padding:0 !important + } } \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/views/shippingBoard.vue b/PC/IAC_LargeScreen/src/views/shippingBoard.vue index 4821334..3ac3f0e 100644 --- a/PC/IAC_LargeScreen/src/views/shippingBoard.vue +++ b/PC/IAC_LargeScreen/src/views/shippingBoard.vue @@ -21,15 +21,17 @@ export default { components:{boardHeader}, data () { return { + intervalId:null, + // intervalIdChangeBg:null, dataLoading: true, // config默认项 configDefult:{ - header:['客户', '客户渎职', '计划发运单号', '计划发运日期', '计划发运时间','提醒','状态' ], - waitTime: util.waitTime,//每页停留20秒d + header:['客户', '客户地址', '计划发运单号', '计划发运日期', '计划发运时间','发货口','状态' ], + waitTime: util.waitTime, carousel: 'page', // index: true, // indexHeader: '序号', - // columnWidth: [200], + // columnWidth: [200,500], align: ['center','left','center','center','center','center','center',], hoverPause: false, // 鼠标悬浮时，不停止轮播 rowNum: 10, @@ -38,20 +40,28 @@ export default { evenRowBGC: 'rgba(0, 44, 81, 0.9)', oddRowBGC: 'rgba(10, 29, 50, 0.9)' }, - config: {} + config: {}, + // currentRowsCopy:null,//当前数据暂存，用于更新背景色处理 } }, created() { this.initConfig() this.getList() clearInterval(this.intervalId) - this.intervalId = setInterval(() => { + this.intervalId = setInterval(() => { this.getList() - }, 60000)//一分钟刷新数据 + }, util.fleshTime) util.addEventResizeFlesh() + // 用于更新背景色处理 + // clearInterval(this.intervalIdChangeBg) + // this.intervalIdChangeBg = setInterval(() => { + // this.initConfig(this.initRow(this.currentRowsCopy),new Date().getTime()) + // }, 10000) + }, destroyed() { clearInterval(this.intervalId) + clearInterval(this.intervalIdChangeBg) }, methods: { init(){ @@ -77,175 +87,400 @@ export default { evenRowBGC: this.configDefult.evenRowBGC } }, + initRow(data,time){ + let rows = [] + console.log(66666,data) + data.forEach(item=>{ + let _item = [] + // todo:状态确定 + // util.formatTimeStrToStr() + let _plan = new Date(item.deliverPlanDate).getTime() + let _now = time + console.log(9999,item.deliverPlanDate) + let _plan_sub = item.deliverPlanDate.indexOf("T") + let _plan_date = item.deliverPlanDate.slice(0,_plan_sub) || '' + let _plan_time = item.deliverPlanDate.slice(_plan_sub + 1) || '' + // 发货时间前一小时整行变更颜色 + if(Number(_plan) - Number(_now) <= 3600000 && Number(_now) <= Number(_plan)){ + _item[0] = `
${item.customerCode || ''}
`;//客户 + _item[1] = `
${item.customerAdrss || ''}
`;//客户地址 + _item[2] = `
${item.deliverRequestNumber || ''}
`;//计划发运单号 + _item[3] = `
${_plan_date}
`;//计划发运日期 + _item[4] = `
${_plan_time}
`;//计划发运时间 + _item[5] = `
${item.dockCode || ''}
`;//发货口 + if(item.status == 'red'){ + _item[6] = `
延迟
`;//状态 + }else if(item.status == 'green'){ + _item[6] = `
正在发货
`;//状态 + } + else{ + _item[6] = `
等待发货
`;//状态 + } + }else{ + _item[0] = item.customerCode || '';//客户 + _item[1] = item.customerAdrss || '';//客户地址 + _item[2] = item.deliverRequestNumber || '';//计划发运单号 + _item[3] = _plan_date || '';//计划发运日期 + _item[4] = _plan_time || '';//计划发运时间 + _item[5] = item.dockCode || '';//发货口 + if(item.status == 'red'){ + _item[6] = `延迟`;//状态 + }else if(item.status == 'green'){ + _item[6] = `正在发货`;//状态 + } + else{ + _item[6] = `等待发货`;//状态 + } + } + rows.push(_item) + }) + return rows + }, async getList(){ this.dataLoading = true this.initConfig() - // axiosUtil.ajax_get('/api/dashboard/plan-and-actual/plan-actual-list').then(res => { + axiosUtil.ajax_post('/api/wms/store/board/deliver-board').then(res => { this.dataLoading = false - // if(res.length <= 0){ - // return - // } - let rows = [] + if(res.length <= 0){ + return + } // 假数据 let _res = [ { - "customer": "IACCOTDA", - "customerAddressCode": "北美Topper库位", - "number": "DLP202311230001", - "planDate": '2023-12-25', - "planTime": '16:50:14', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "1北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "1北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240009", + "deliverPlanDate": "2024-01-25T17:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "2北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "2北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240010", + "deliverPlanDate": "2024-01-25T20:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "3北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "3北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240011", + "deliverPlanDate": "2024-01-26T02:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "4北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "4北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240012", + "deliverPlanDate": "2024-01-26T06:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "5北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "5北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240005", + "deliverPlanDate": "2024-01-26T15:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000055", + "customerName": "6北京奔驰大兴工厂", + "customerAdrssCode": "BBACDX01", + "customerAdrss": "6北京市大兴区博兴路8号", + "deliverRequestNumber": "DLP202401240013", + "deliverPlanDate": "2024-01-26T13:15:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + },{ + "customerCode": "10000059", + "customerName": "7北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "7北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240009", + "deliverPlanDate": "2024-01-25T17:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "IACCOTDA", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202312200001", - "planDate": '2023-12-20', - "planTime": '09:10:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "8北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "8北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240010", + "deliverPlanDate": "2024-01-25T20:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000054", - "customerAddressCode": "Hongxiang", - "number": "DLP202311240002", - "planDate": '2023-11-24', - "planTime": '10:11:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "9北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "9北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240011", + "deliverPlanDate": "2024-01-26T02:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000059", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202311230001", - "planDate": '2023-11-23', - "planTime": '16:04:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "10北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "10北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240012", + "deliverPlanDate": "2024-01-26T06:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000058", - "customerAddressCode": "Hongxiang", - "number": "DLP202311060003", - "planDate": '2023-11-19', - "planTime": '02:00:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "11北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "11北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240005", + "deliverPlanDate": "2024-01-26T15:50:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "IACCOTDA", - "customerAddressCode": "北美Topper库位", - "number": "DLP202311230001", - "planDate": '2023-12-25', - "planTime": '16:50:14', - "remind":"", - "status":'延迟' + "customerCode": "10000055", + "customerName": "北京奔驰大兴工厂", + "customerAdrssCode": "BBACDX01", + "customerAdrss": "北京市大兴区博兴路8号", + "deliverRequestNumber": "DLP202401240013", + "deliverPlanDate": "2024-01-26T13:15:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + },{ + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240009", + "deliverPlanDate": "2024-01-25T17:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "IACCOTDA", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202312200001", - "planDate": '2023-12-20', - "planTime": '09:10:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240010", + "deliverPlanDate": "2024-01-25T20:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000054", - "customerAddressCode": "Hongxiang", - "number": "DLP202311240002", - "planDate": '2023-11-24', - "planTime": '10:11:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240011", + "deliverPlanDate": "2024-01-26T02:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000059", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202311230001", - "planDate": '2023-11-23', - "planTime": '16:04:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240012", + "deliverPlanDate": "2024-01-26T06:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000058", - "customerAddressCode": "Hongxiang", - "number": "DLP202311060003", - "planDate": '2023-11-19', - "planTime": '02:00:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240005", + "deliverPlanDate": "2024-01-26T08:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "IACCOTDA", - "customerAddressCode": "北美Topper库位", - "number": "DLP202311230001", - "planDate": '2023-12-25', - "planTime": '16:50:14', - "remind":"", - "status":'延迟' + "customerCode": "10000055", + "customerName": "北京奔驰大兴工厂", + "customerAdrssCode": "BBACDX01", + "customerAdrss": "北京市大兴区博兴路8号", + "deliverRequestNumber": "DLP202401240013", + "deliverPlanDate": "2024-01-26T13:15:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + },{ + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240009", + "deliverPlanDate": "2024-01-25T17:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "IACCOTDA", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202312200001", - "planDate": '2023-12-20', - "planTime": '09:10:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240010", + "deliverPlanDate": "2024-01-25T20:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000054", - "customerAddressCode": "Hongxiang", - "number": "DLP202311240002", - "planDate": '2023-11-24', - "planTime": '10:11:00', - "remind":"", - "status":'准时' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240011", + "deliverPlanDate": "2024-01-26T02:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000059", - "customerAddressCode": "上海起帆恺瑞国际物流有限公司", - "number": "DLP202311230001", - "planDate": '2023-11-23', - "planTime": '16:04:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240012", + "deliverPlanDate": "2024-01-26T06:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, { - "customer": "10000058", - "customerAddressCode": "Hongxiang", - "number": "DLP202311060003", - "planDate": '2023-11-19', - "planTime": '02:00:00', - "remind":"", - "status":'延迟' + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240005", + "deliverPlanDate": "2024-01-26T08:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000055", + "customerName": "北京奔驰大兴工厂", + "customerAdrssCode": "BBACDX01", + "customerAdrss": "北京市大兴区博兴路8号", + "deliverRequestNumber": "DLP202401240013", + "deliverPlanDate": "2024-01-26T13:15:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + },{ + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240009", + "deliverPlanDate": "2024-01-25T17:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240010", + "deliverPlanDate": "2024-01-25T20:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240011", + "deliverPlanDate": "2024-01-26T02:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240012", + "deliverPlanDate": "2024-01-26T06:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000059", + "customerName": "北京瀛海延锋工厂", + "customerAdrssCode": "YanfYH", + "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号", + "deliverRequestNumber": "DLP202401240005", + "deliverPlanDate": "2024-01-26T08:00:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null + }, + { + "customerCode": "10000055", + "customerName": "北京奔驰大兴工厂", + "customerAdrssCode": "BBACDX01", + "customerAdrss": "北京市大兴区博兴路8号", + "deliverRequestNumber": "DLP202401240013", + "deliverPlanDate": "2024-01-26T13:15:00", + "deliverPlanTime": null, + "status": "red", + "dockCode": null }, ] - _res.forEach(item=>{ - let _item = [] - _item[0] = item.customer;//客户 - _item[1] = item.customerAddressCode;//客户地址 - _item[2] = item.number;//计划发运单号 - _item[3] = item.planDate;//计划发运日期 - _item[4] = item.planTime;//计划发运时间 - _item[5] = item.remind;//提醒 - _item[6] = item.status;//状态 - if(item.status == '延迟'){ - _item[6] = `${item.status}`;//状态 - }else{ - _item[6] = `${item.status}`;//状态 - } - rows.push(_item) - }) - this.initConfig(rows) + // this.currentRowsCopy = _res + let _rows = this.initRow(res,new Date().getTime()) + this.initConfig(_rows) // this_.$refs['shippingBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 - // }).catch(error => { - // this.dataLoading = false - // console.log(error) - // }) + }).catch(error => { + this.dataLoading = false + console.log(error) + }) }, } } @@ -267,5 +502,14 @@ export default { margin: 2rem; height: calc(100vh - 10rem); } + .rowStatusBg{ + // background:rgb(164 161 255 / 82%); + background:rgb(0 182 255 / 35%); + width: 100%; + height: 100%; + } + .dv-scroll-board .rows .ceil{ + padding:0 !important + } } \ No newline at end of file diff --git a/PC/IAC_LargeScreen/src/views/stockBoard.vue b/PC/IAC_LargeScreen/src/views/stockBoard.vue index 4d55ec2..1898baa 100644 --- a/PC/IAC_LargeScreen/src/views/stockBoard.vue +++ b/PC/IAC_LargeScreen/src/views/stockBoard.vue @@ -24,12 +24,12 @@ export default { dataLoading: true, // config默认项 configDefult:{ - header:['物料', '描述', '数量', '需求库位', '状态' ], - waitTime: util.waitTime,//每页停留20秒d + header:['物料', '描述', '库存数量','最小', '需求库位' ], + waitTime: 120000,//2分钟 carousel: 'page', // index: true, // indexHeader: '序号', - columnWidth: [660,660,280,280,280], + // columnWidth: [660,660,280,280,280], align: ['left','left','center','center','center'], hoverPause: false, // 鼠标悬浮时，不停止轮播 rowNum: 10, @@ -47,7 +47,7 @@ export default { clearInterval(this.intervalId) this.intervalId = setInterval(() => { this.getList() - }, 60000)//一分钟刷新数据 + }, 300000)//5分钟刷新 util.addEventResizeFlesh() }, destroyed() { @@ -81,10 +81,11 @@ export default { this.dataLoading = true this.initConfig() // axiosUtil.ajax_get('/api/dashboard/plan-and-actual/plan-actual-list').then(res => { + axiosUtil.ajax_post('/api/wms/store/board/preparation-board').then(res => { this.dataLoading = false - // if(res.length <= 0){ - // return - // } + if(res.length <= 0){ + return + } let rows = [] // 假数据 let _res = [ @@ -278,25 +279,21 @@ export default { "status": '紧急' }, ] - _res.forEach(item=>{ + res.forEach(item=>{ let _item = [] _item[0] = item.itemCode;//物料 _item[1] = item.itemName;//描述 - _item[2] = item.qty;//数量 - _item[3] = item.locationCode;//需求库位 - if(item.status == '紧急'){ - _item[4] = `${item.status}`;//状态 - }else{ - _item[4] = `${item.status}`;//状态 - } + _item[2] = item.currentQty;//库存数量 + _item[3] = item.minQty;//最小数量 + _item[4] = item.locationCode;//需求库位 rows.push(_item) }) this.initConfig(rows) // this_.$refs['stockBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 - // }).catch(error => { - // this.dataLoading = false - // console.log(error) - // }) + }).catch(error => { + this.dataLoading = false + console.log(error) + }) }, } } diff --git a/PC/IAC_LargeScreen/vue.config.js b/PC/IAC_LargeScreen/vue.config.js index 0468f5d..6f4e204 100644 --- a/PC/IAC_LargeScreen/vue.config.js +++ b/PC/IAC_LargeScreen/vue.config.js @@ -52,7 +52,7 @@ module.exports = { productionSourceMap: false, devServer: { open: true, - port: 8082, + port: 9527, https: false, hotOnly: false, overlay: { diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue index 601d975..833a48b 100644 --- a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue +++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue @@ -23,7 +23,7 @@ v-if="item.type == 'input'" v-model="searchForm[item.prop]" :placeholder="'请输入'+item.label" - :clearable="true" + :clearable="!item.noClear" > + + + + \ No newline at end of file diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue new file mode 100644 index 0000000..44307e7 --- /dev/null +++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue index 91a1471..c48145f 100644 --- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue +++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue @@ -27,21 +27,24 @@ export default { { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述2', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '单位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '是否委外', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '收货数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '退货数量', type:"kiloNumber", cellClass: 'rightAlign', valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '单位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]}, {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, + {type:'select',prop:'receiptType',noClear:true,label:'类型',optionsProc:'receiptType',options:[]}, ], searchForm:{ ItemCode:'', SupplierCode:'', beginDate:"", endDate:'', + receiptType:null, }, BottomFixedItem:['收货数量','退货数量'] };