BoXu.Zheng
/
WMS_IAC_FE
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【埃驰报表】委外相关报表暂存

master
安虹睿 10 months ago
parent
fb2e641557
commit
9a8caa93b5
14 changed files with 578 additions and 185 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      PC/IAC_LargeScreen/public/config.js
  2. 3
      PC/IAC_LargeScreen/src/styles/index.css
  3. 3
      PC/IAC_LargeScreen/src/styles/index.less
  4. 8
      PC/IAC_LargeScreen/src/utils/dateUtil.js
  5. 4
      PC/IAC_LargeScreen/src/utils/util.js
  6. 48
      PC/IAC_LargeScreen/src/views/reserveBoard.vue
  7. 518
      PC/IAC_LargeScreen/src/views/shippingBoard.vue
  8. 35
      PC/IAC_LargeScreen/src/views/stockBoard.vue
  9. 2
      PC/IAC_LargeScreen/vue.config.js
  10. 16
      PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
  11. 19
      PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
  12. 50
      PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue
  13. 50
      PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue
  14. 5
      PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue

2
PC/IAC_LargeScreen/public/config.js
View File

@ -1 +1 @@
window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60087' window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:10095'

3
PC/IAC_LargeScreen/src/styles/index.css
View File

@ -184,3 +184,6 @@
.statusBlockItem_normal { .statusBlockItem_normal {
background: #28b119; background: #28b119;
} }
.statusBlockItem_white {
background: #6150e7;
}

3
PC/IAC_LargeScreen/src/styles/index.less
View File

@ -209,4 +209,7 @@
} }
.statusBlockItem_normal{ .statusBlockItem_normal{
background:#28b119 background:#28b119
}
.statusBlockItem_white{
background: #6150e7;
} }

8
PC/IAC_LargeScreen/src/utils/dateUtil.js
View File

@ -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 { export default {
getAgoDay: getAgoDay, // 获取当前天前几天 getAgoDay: getAgoDay, // 获取当前天前几天
getnowDay: getnowDay, // 获取当前时间 yyyy-dd-mm getnowDay: getnowDay, // 获取当前时间 yyyy-dd-mm
getnowTime: getnowTime, // 获取当前时间 hh:mm:ss getnowTime: getnowTime, // 获取当前时间 hh:mm:ss
getServerTime:getServerTime,// 获取服务器时间 走接口 getServerTime:getServerTime,// 获取服务器时间 走接口
formatTimeStrToStr:formatTimeStrToStr,//2022-08-31T09:45:51.9340433 转 2022-08-31 09:45:51
} }

4
PC/IAC_LargeScreen/src/utils/util.js
View File

@ -5,6 +5,8 @@ var addEventResizeFlesh = function(){
}) })
} }
export default { export default {
waitTime:20000,//滚屏列表刷新等待间隔配置项 // waitTime:30000,//滚屏列表-滚屏间隔 半分钟
waitTime:300000,//滚屏列表-滚屏间隔 5分钟
fleshTime:1800000,//滚屏列表-刷新间隔 半小时
addEventResizeFlesh:addEventResizeFlesh, addEventResizeFlesh:addEventResizeFlesh,
} }

48
PC/IAC_LargeScreen/src/views/reserveBoard.vue
View File

@ -24,12 +24,12 @@ export default {
dataLoading: true, dataLoading: true,
// config默认项 // config默认项
configDefult:{ configDefult:{
header:['供应商', '供应商代码', '到货单号', '到货日期', '到货时间窗口','提醒','状态' ], header:['供应商', '供应商代码', '到货单号', '到货日期', '到货时间窗口','收货口','状态' ],
waitTime: util.waitTime,//每页停留20秒d waitTime: util.waitTime,
carousel: 'page', carousel: 'page',
// index: true, // index: true,
// indexHeader: '序号', // indexHeader: '序号',
columnWidth: [350], // columnWidth: [350],
align: ['left','center','center','center','center','center','center',], align: ['left','center','center','center','center','center','center',],
hoverPause: false, // 鼠标悬浮时，不停止轮播 hoverPause: false, // 鼠标悬浮时，不停止轮播
rowNum: 10, rowNum: 10,
@ -44,10 +44,11 @@ export default {
created() { created() {
this.initConfig() this.initConfig()
this.getList() this.getList()
//刷新数据
clearInterval(this.intervalId) clearInterval(this.intervalId)
this.intervalId = setInterval(() => { this.intervalId = setInterval(() => {
this.getList() this.getList()
}, 60000)//一分钟刷新数据 }, util.fleshTime)
util.addEventResizeFlesh() util.addEventResizeFlesh()
}, },
destroyed() { destroyed() {
@ -81,10 +82,11 @@ export default {
this.dataLoading = true this.dataLoading = true
this.initConfig() this.initConfig()
// axiosUtil.ajax_get('/api/dashboard/plan-and-actual/plan-actual-list').then(res => { // 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 this.dataLoading = false
// if(res.length <= 0){ if(res.length <= 0){
// return return
// } }
let rows = [] let rows = []
// 假数据 // 假数据
let _res = [ let _res = [
@ -278,28 +280,29 @@ export default {
"status":'准时' "status":'准时'
}, },
] ]
_res.forEach(item=>{ res.forEach(item=>{
let _item = [] let _item = []
_item[0] = item.supplier;//供应商 _item[0] = item.supplierName;//供应商
_item[1] = item.supplierCode;//供应商代码 _item[1] = item.supplierCode;//供应商代码
_item[2] = item.arrivalNumber;//到货单号 _item[2] = item.asnNumber;//到货单号
_item[3] = item.arrivalTime;//到货日期 _item[3] = item.arrivalDate;//到货日期
_item[4] = item.timeSlot;//到货窗口时间 _item[4] = item.timeWindow;//到货窗口时间
_item[5] = item.remind;//提醒 _item[5] = item.dockCode;//发货口
_item[6] = item.status;//状态 if(item.status == 'red'){
if(item.status == '延迟'){ _item[6] = `<span class="statusBlockItem statusBlockItem_warning">延迟</span>`;//状态
_item[6] = `<span class="statusBlockItem statusBlockItem_warning">${item.status}</span>`;//状态 }else if(item.status == 'green'){
_item[6] = `<span class="statusBlockItem statusBlockItem_normal">收货中</span>`;//状态
}else{ }else{
_item[6] = `<span class="statusBlockItem statusBlockItem_normal">${item.status}</span>`;//状态 _item[6] = `<span class="statusBlockItem statusBlockItem_white">未到收货时间</span>`;//状态
} }
rows.push(_item) rows.push(_item)
}) })
this.initConfig(rows) this.initConfig(rows)
// this_.$refs['reserveBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 // this_.$refs['reserveBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法
// }).catch(error => { }).catch(error => {
// this.dataLoading = false this.dataLoading = false
// console.log(error) console.log(error)
// }) })
}, },
} }
} }
@ -321,5 +324,8 @@ export default {
margin: 2rem; margin: 2rem;
height: calc(100vh - 10rem); height: calc(100vh - 10rem);
} }
.dv-scroll-board .rows .ceil{
padding:0 !important
}
} }
</style> </style>

518
PC/IAC_LargeScreen/src/views/shippingBoard.vue
View File

@ -21,15 +21,17 @@ export default {
components:{boardHeader}, components:{boardHeader},
data () { data () {
return { return {
intervalId:null,
// intervalIdChangeBg:null,
dataLoading: true, dataLoading: true,
// config默认项 // config默认项
configDefult:{ configDefult:{
header:['客户', '客户渎职', '计划发运单号', '计划发运日期', '计划发运时间','提醒','状态' ], header:['客户', '客户地址', '计划发运单号', '计划发运日期', '计划发运时间','发货口','状态' ],
waitTime: util.waitTime,//每页停留20秒d waitTime: util.waitTime,
carousel: 'page', carousel: 'page',
// index: true, // index: true,
// indexHeader: '序号', // indexHeader: '序号',
// columnWidth: [200], // columnWidth: [200,500],
align: ['center','left','center','center','center','center','center',], align: ['center','left','center','center','center','center','center',],
hoverPause: false, // 鼠标悬浮时，不停止轮播 hoverPause: false, // 鼠标悬浮时，不停止轮播
rowNum: 10, rowNum: 10,
@ -38,20 +40,28 @@ export default {
evenRowBGC: 'rgba(0, 44, 81, 0.9)', evenRowBGC: 'rgba(0, 44, 81, 0.9)',
oddRowBGC: 'rgba(10, 29, 50, 0.9)' oddRowBGC: 'rgba(10, 29, 50, 0.9)'
}, },
config: {} config: {},
// currentRowsCopy:null,//当前数据暂存，用于更新背景色处理
} }
}, },
created() { created() {
this.initConfig() this.initConfig()
this.getList() this.getList()
clearInterval(this.intervalId) clearInterval(this.intervalId)
this.intervalId = setInterval(() => { this.intervalId = setInterval(() => {
this.getList() this.getList()
}, 60000)//一分钟刷新数据 }, util.fleshTime)
util.addEventResizeFlesh() util.addEventResizeFlesh()
// 用于更新背景色处理
// clearInterval(this.intervalIdChangeBg)
// this.intervalIdChangeBg = setInterval(() => {
// this.initConfig(this.initRow(this.currentRowsCopy),new Date().getTime())
// }, 10000)
}, },
destroyed() { destroyed() {
clearInterval(this.intervalId) clearInterval(this.intervalId)
clearInterval(this.intervalIdChangeBg)
}, },
methods: { methods: {
init(){ init(){
@ -77,175 +87,400 @@ export default {
evenRowBGC: this.configDefult.evenRowBGC 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] = `<div class="rowStatusBg">${item.customerCode || ''}</div>`;//客户
_item[1] = `<div class="rowStatusBg">${item.customerAdrss || ''}</div>`;//客户地址
_item[2] = `<div class="rowStatusBg">${item.deliverRequestNumber || ''}</div>`;//计划发运单号
_item[3] = `<div class="rowStatusBg">${_plan_date}</div>`;//计划发运日期
_item[4] = `<div class="rowStatusBg">${_plan_time}</div>`;//计划发运时间
_item[5] = `<div class="rowStatusBg">${item.dockCode || ''}</div>`;//发货口
if(item.status == 'red'){
_item[6] = `<div class="rowStatusBg"><span class="statusBlockItem statusBlockItem_warning">延迟</span></div>`;//状态
}else if(item.status == 'green'){
_item[6] = `<div class="rowStatusBg"><span class="statusBlockItem statusBlockItem_normal">正在发货</span></div>`;//状态
}
else{
_item[6] = `<div class="rowStatusBg"><span class="statusBlockItem statusBlockItem_white">等待发货</span></div>`;//状态
}
}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] = `<span class="statusBlockItem statusBlockItem_warning">延迟</span>`;//状态
}else if(item.status == 'green'){
_item[6] = `<span class="statusBlockItem statusBlockItem_normal">正在发货</span>`;//状态
}
else{
_item[6] = `<span class="statusBlockItem statusBlockItem_white">等待发货</span>`;//状态
}
}
rows.push(_item)
})
return rows
},
async getList(){ async getList(){
this.dataLoading = true this.dataLoading = true
this.initConfig() 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 this.dataLoading = false
// if(res.length <= 0){ if(res.length <= 0){
// return return
// } }
let rows = []
// 假数据 // 假数据
let _res = [ let _res = [
{ {
"customer": "IACCOTDA", "customerCode": "10000059",
"customerAddressCode": "北美Topper库位", "customerName": "1北京瀛海延锋工厂",
"number": "DLP202311230001", "customerAdrssCode": "YanfYH",
"planDate": '2023-12-25', "customerAdrss": "1北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '16:50:14', "deliverRequestNumber": "DLP202401240009",
"remind":"", "deliverPlanDate": "2024-01-25T17:00:00",
"status":'延迟' "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", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "8北京瀛海延锋工厂",
"number": "DLP202312200001", "customerAdrssCode": "YanfYH",
"planDate": '2023-12-20', "customerAdrss": "8北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '09:10:00', "deliverRequestNumber": "DLP202401240010",
"remind":"", "deliverPlanDate": "2024-01-25T20:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000054", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "9北京瀛海延锋工厂",
"number": "DLP202311240002", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-24', "customerAdrss": "9北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '10:11:00', "deliverRequestNumber": "DLP202401240011",
"remind":"", "deliverPlanDate": "2024-01-26T02:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000059", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "10北京瀛海延锋工厂",
"number": "DLP202311230001", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-23', "customerAdrss": "10北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '16:04:00', "deliverRequestNumber": "DLP202401240012",
"remind":"", "deliverPlanDate": "2024-01-26T06:00:00",
"status":'延迟' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000058", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "11北京瀛海延锋工厂",
"number": "DLP202311060003", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-19', "customerAdrss": "11北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '02:00:00', "deliverRequestNumber": "DLP202401240005",
"remind":"", "deliverPlanDate": "2024-01-26T15:50:00",
"status":'延迟' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "IACCOTDA", "customerCode": "10000055",
"customerAddressCode": "北美Topper库位", "customerName": "北京奔驰大兴工厂",
"number": "DLP202311230001", "customerAdrssCode": "BBACDX01",
"planDate": '2023-12-25', "customerAdrss": "北京市大兴区博兴路8号",
"planTime": '16:50:14', "deliverRequestNumber": "DLP202401240013",
"remind":"", "deliverPlanDate": "2024-01-26T13:15:00",
"status":'延迟' "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", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "北京瀛海延锋工厂",
"number": "DLP202312200001", "customerAdrssCode": "YanfYH",
"planDate": '2023-12-20', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '09:10:00', "deliverRequestNumber": "DLP202401240010",
"remind":"", "deliverPlanDate": "2024-01-25T20:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000054", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311240002", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-24', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '10:11:00', "deliverRequestNumber": "DLP202401240011",
"remind":"", "deliverPlanDate": "2024-01-26T02:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000059", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311230001", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-23', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '16:04:00', "deliverRequestNumber": "DLP202401240012",
"remind":"", "deliverPlanDate": "2024-01-26T06:00:00",
"status":'延迟' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000058", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311060003", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-19', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '02:00:00', "deliverRequestNumber": "DLP202401240005",
"remind":"", "deliverPlanDate": "2024-01-26T08:00:00",
"status":'延迟' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "IACCOTDA", "customerCode": "10000055",
"customerAddressCode": "北美Topper库位", "customerName": "北京奔驰大兴工厂",
"number": "DLP202311230001", "customerAdrssCode": "BBACDX01",
"planDate": '2023-12-25', "customerAdrss": "北京市大兴区博兴路8号",
"planTime": '16:50:14', "deliverRequestNumber": "DLP202401240013",
"remind":"", "deliverPlanDate": "2024-01-26T13:15:00",
"status":'延迟' "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", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "北京瀛海延锋工厂",
"number": "DLP202312200001", "customerAdrssCode": "YanfYH",
"planDate": '2023-12-20', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '09:10:00', "deliverRequestNumber": "DLP202401240010",
"remind":"", "deliverPlanDate": "2024-01-25T20:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000054", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311240002", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-24', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '10:11:00', "deliverRequestNumber": "DLP202401240011",
"remind":"", "deliverPlanDate": "2024-01-26T02:00:00",
"status":'准时' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000059", "customerCode": "10000059",
"customerAddressCode": "上海起帆恺瑞国际物流有限公司", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311230001", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-23', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '16:04:00', "deliverRequestNumber": "DLP202401240012",
"remind":"", "deliverPlanDate": "2024-01-26T06:00:00",
"status":'延迟' "deliverPlanTime": null,
"status": "red",
"dockCode": null
}, },
{ {
"customer": "10000058", "customerCode": "10000059",
"customerAddressCode": "Hongxiang", "customerName": "北京瀛海延锋工厂",
"number": "DLP202311060003", "customerAdrssCode": "YanfYH",
"planDate": '2023-11-19', "customerAdrss": "北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"planTime": '02:00:00', "deliverRequestNumber": "DLP202401240005",
"remind":"", "deliverPlanDate": "2024-01-26T08:00:00",
"status":'延迟' "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=>{ // this.currentRowsCopy = _res
let _item = [] let _rows = this.initRow(res,new Date().getTime())
_item[0] = item.customer;//客户 this.initConfig(_rows)
_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] = `<span class="statusBlockItem statusBlockItem_warning">${item.status}</span>`;//状态
}else{
_item[6] = `<span class="statusBlockItem statusBlockItem_normal">${item.status}</span>`;//状态
}
rows.push(_item)
})
this.initConfig(rows)
// this_.$refs['shippingBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 // this_.$refs['shippingBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法
// }).catch(error => { }).catch(error => {
// this.dataLoading = false this.dataLoading = false
// console.log(error) console.log(error)
// }) })
}, },
} }
} }
@ -267,5 +502,14 @@ export default {
margin: 2rem; margin: 2rem;
height: calc(100vh - 10rem); 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
}
} }
</style> </style>

35
PC/IAC_LargeScreen/src/views/stockBoard.vue
View File

@ -24,12 +24,12 @@ export default {
dataLoading: true, dataLoading: true,
// config默认项 // config默认项
configDefult:{ configDefult:{
header:['物料', '描述', '数量', '需求库位', '状态' ], header:['物料', '描述', '库存数量','最小', '需求库位' ],
waitTime: util.waitTime,//每页停留20秒d waitTime: 120000,//2分钟
carousel: 'page', carousel: 'page',
// index: true, // index: true,
// indexHeader: '序号', // indexHeader: '序号',
columnWidth: [660,660,280,280,280], // columnWidth: [660,660,280,280,280],
align: ['left','left','center','center','center'], align: ['left','left','center','center','center'],
hoverPause: false, // 鼠标悬浮时，不停止轮播 hoverPause: false, // 鼠标悬浮时，不停止轮播
rowNum: 10, rowNum: 10,
@ -47,7 +47,7 @@ export default {
clearInterval(this.intervalId) clearInterval(this.intervalId)
this.intervalId = setInterval(() => { this.intervalId = setInterval(() => {
this.getList() this.getList()
}, 60000)//一分钟刷新数据 }, 300000)//5分钟刷新
util.addEventResizeFlesh() util.addEventResizeFlesh()
}, },
destroyed() { destroyed() {
@ -81,10 +81,11 @@ export default {
this.dataLoading = true this.dataLoading = true
this.initConfig() this.initConfig()
// axiosUtil.ajax_get('/api/dashboard/plan-and-actual/plan-actual-list').then(res => { // 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 this.dataLoading = false
// if(res.length <= 0){ if(res.length <= 0){
// return return
// } }
let rows = [] let rows = []
// 假数据 // 假数据
let _res = [ let _res = [
@ -278,25 +279,21 @@ export default {
"status": '紧急' "status": '紧急'
}, },
] ]
_res.forEach(item=>{ res.forEach(item=>{
let _item = [] let _item = []
_item[0] = item.itemCode;//物料 _item[0] = item.itemCode;//物料
_item[1] = item.itemName;//描述 _item[1] = item.itemName;//描述
_item[2] = item.qty;//数量 _item[2] = item.currentQty;//库存数量
_item[3] = item.locationCode;//需求库位 _item[3] = item.minQty;//最小数量
if(item.status == '紧急'){ _item[4] = item.locationCode;//需求库位
_item[4] = `<span class="statusBlockItem statusBlockItem_warning">${item.status}</span>`;//状态
}else{
_item[4] = `<span class="statusBlockItem statusBlockItem_normal">${item.status}</span>`;//状态
}
rows.push(_item) rows.push(_item)
}) })
this.initConfig(rows) this.initConfig(rows)
// this_.$refs['stockBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法 // this_.$refs['stockBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法
// }).catch(error => { }).catch(error => {
// this.dataLoading = false this.dataLoading = false
// console.log(error) console.log(error)
// }) })
}, },
} }
} }

2
PC/IAC_LargeScreen/vue.config.js
View File

@ -52,7 +52,7 @@ module.exports = {
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
open: true, open: true,
port: 8082, port: 9527,
https: false, https: false,
hotOnly: false, hotOnly: false,
overlay: { overlay: {

16
PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
View File

@ -23,7 +23,7 @@
v-if="item.type == 'input'" v-if="item.type == 'input'"
v-model="searchForm[item.prop]" v-model="searchForm[item.prop]"
:placeholder="'请输入'+item.label" :placeholder="'请输入'+item.label"
:clearable="true" :clearable="!item.noClear"
></el-input> ></el-input>
<!-- 下拉 --> <!-- 下拉 -->
<el-select <el-select
@ -31,7 +31,7 @@
v-model="searchForm[item.prop]" v-model="searchForm[item.prop]"
filterable filterable
:placeholder="'请选择'+item.label" :placeholder="'请选择'+item.label"
:clearable="true" :clearable="!item.noClear"
> >
<el-option <el-option
v-for="op in item.options" v-for="op in item.options"
@ -43,7 +43,7 @@
<!-- 日期 --> <!-- 日期 -->
<el-date-picker <el-date-picker
v-if="item.type == 'date'" v-if="item.type == 'date'"
:clearable="true" :clearable="!item.noClear"
v-model="searchForm[item.prop]" v-model="searchForm[item.prop]"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
@ -236,7 +236,15 @@ export default {
item.opV="Number" item.opV="Number"
}) })
} }
//收货类型-委外+不限
if(item.optionsProc == 'receiptType'){
item.options = [
{label:'委外',value:'1'},
{label:'不限',value:null}
]
item.opL='label'
item.opV="value"
}
} }
}) })
}, },

19
PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
View File

@ -29,6 +29,8 @@ import doorRelocationStartReport from '../views/report/doorRelocationStartReport
import doorDeliveryNoteReport from '../views/report/doorDeliveryNoteReport.vue' import doorDeliveryNoteReport from '../views/report/doorDeliveryNoteReport.vue'
import doorReturnNoteReport from '../views/report/doorReturnNoteReport.vue' import doorReturnNoteReport from '../views/report/doorReturnNoteReport.vue'
import EQLevelReport from '../views/report/EQLevelReport.vue' import EQLevelReport from '../views/report/EQLevelReport.vue'
import outsourcingOutReport from '../views/report/outsourcingOutReport.vue'
import outsourcingReturnReport from '../views/report/outsourcingReturnReport.vue'
Vue.use(VueRouter) Vue.use(VueRouter)
@ -265,6 +267,23 @@ const routes = [
title:"门板_退货汇总报表", title:"门板_退货汇总报表",
} }
}, },
{
path: '/outsourcingOutReport',
name: 'outsourcingOutReport',
component: outsourcingOutReport,
meta:{
title:"委外出库报表",
}
},
{
path: '/outsourcingReturnReport',
name: 'outsourcingReturnReport',
component: outsourcingReturnReport,
meta:{
title:"委外退库报表",
}
},
] ]
const router = new VueRouter({ const router = new VueRouter({

50
PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue
View File

@ -0,0 +1,50 @@
<template>
<reportPage
:columnList="columnDefs"
:searchConfig="searchConfig"
:searchForm="searchForm"
:BottomFixedItem="BottomFixedItem"
:reportName="'委外出库报表'"
:procName="'Proc_Zheng_委外出库'"
></reportPage>
</template>
<script>
import reportPage from "@/components/reportPage/index"
import util from '@/utils/util'
export default {
name: "outsourcingOutReport",
components: {
reportPage
},
data () {
return {
columnDefs: [
{ field: '物料代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
{ 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: '库位组', 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 } },
],
searchConfig:[
{type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
{type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
{type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
{type:'date',prop:'beginDate',label:'起始'},
{type:'date',prop:'endDate',label:'截止'},
],
searchForm:{
ItemCode:'',
LocationGroupCode:"",
SupplierCode:'',
beginDate:"",
endDate:'',
},
BottomFixedItem:['数量'],
};
}
};
</script>

50
PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue
View File

@ -0,0 +1,50 @@
<template>
<reportPage
:columnList="columnDefs"
:searchConfig="searchConfig"
:searchForm="searchForm"
:BottomFixedItem="BottomFixedItem"
:reportName="'委外退库报表'"
:procName="'Proc_Zheng_委外退库'"
></reportPage>
</template>
<script>
import reportPage from "@/components/reportPage/index"
import util from '@/utils/util'
export default {
name: "outsourcingReturnReport",
components: {
reportPage
},
data () {
return {
columnDefs: [
{ field: '物料代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
{ 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: '库位组', 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 } },
],
searchConfig:[
{type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
{type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
{type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
{type:'date',prop:'beginDate',label:'起始'},
{type:'date',prop:'endDate',label:'截止'},
],
searchForm:{
ItemCode:'',
LocationGroupCode:"",
SupplierCode:'',
beginDate:"",
endDate:'',
},
BottomFixedItem:['数量'],
};
}
};
</script>

5
PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue
View File

@ -27,21 +27,24 @@ export default {
{ field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
{ field: '物料描述1', 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: '物料描述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: '退货数量', 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:[ searchConfig:[
{type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]}, {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
{type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
{type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'beginDate',label:'起始'},
{type:'date',prop:'endDate',label:'截止'}, {type:'date',prop:'endDate',label:'截止'},
{type:'select',prop:'receiptType',noClear:true,label:'类型',optionsProc:'receiptType',options:[]},
], ],
searchForm:{ searchForm:{
ItemCode:'', ItemCode:'',
SupplierCode:'', SupplierCode:'',
beginDate:"", beginDate:"",
endDate:'', endDate:'',
receiptType:null,
}, },
BottomFixedItem:['收货数量','退货数量'] BottomFixedItem:['收货数量','退货数量']
}; };

Write Preview
Loading…
Cancel
Save