|
|
|
|
@ -1,25 +1,54 @@
|
|
|
|
|
<template> |
|
|
|
|
<basic-container> |
|
|
|
|
<div class="avue-crud"> |
|
|
|
|
<!--<el-row :hidden="!search" style="padding:6px 18px"> |
|
|
|
|
<!– 查询模块 –> |
|
|
|
|
<el-row :hidden="!search" style="padding:6px 18px"> |
|
|
|
|
<!-- 查询模块 --> |
|
|
|
|
<el-form :inline="true" :model="query"> |
|
|
|
|
<el-form-item label="备货状态:"> |
|
|
|
|
<el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input> |
|
|
|
|
<!-- <el-form-item label="备货状态:"> |
|
|
|
|
<!– <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>–> |
|
|
|
|
<el-select v-model="query.stockupStatus" class="m-2" placeholder="请选择备货状态"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in stockupStatus" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="备货区:"> |
|
|
|
|
<el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input> |
|
|
|
|
</el-form-item>--> |
|
|
|
|
<el-form-item label="备货时间:"> |
|
|
|
|
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>--> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="stockupDate" |
|
|
|
|
type="datetimerange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始时间" |
|
|
|
|
end-placeholder="结束时间" |
|
|
|
|
:shortcuts="shortcuts" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="指派状态;1-未指派、2-已指派:"> |
|
|
|
|
<el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!– 查询按钮 –> |
|
|
|
|
<!--<el-form-item label="指派状态"> |
|
|
|
|
<!– <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>–> |
|
|
|
|
<el-select v-model="query.assignStatus" class="m-2" placeholder="请选择指派状态"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in stockAllocation" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
|
|
|
|
|
</el-form-item>--> |
|
|
|
|
<!-- 查询按钮 --> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> |
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
</el-row>--> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
@ -265,22 +294,22 @@ export default {
|
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [ |
|
|
|
|
{ |
|
|
|
|
label: '未备货', |
|
|
|
|
value: '1', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '待备货', |
|
|
|
|
value: '2', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '备货中', |
|
|
|
|
value: '3', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '已备货', |
|
|
|
|
value: '4', |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// label: '未备货', |
|
|
|
|
// value: '1', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// label: '待备货', |
|
|
|
|
// value: '2', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// label: '备货中', |
|
|
|
|
// value: '3', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// label: '已备货', |
|
|
|
|
// value: '4', |
|
|
|
|
// }, |
|
|
|
|
], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -433,8 +462,40 @@ export default {
|
|
|
|
|
loaderData: [], |
|
|
|
|
goodsAreaIdData: [], |
|
|
|
|
distributionType: [], |
|
|
|
|
stockupStatus: [], |
|
|
|
|
stockAllocation: [], |
|
|
|
|
deptId: '', |
|
|
|
|
num: '', |
|
|
|
|
stockupDate: [], |
|
|
|
|
shortcuts :[ |
|
|
|
|
{ |
|
|
|
|
text: '最近一周', |
|
|
|
|
value: () => { |
|
|
|
|
const end = new Date() |
|
|
|
|
const start = new Date() |
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) |
|
|
|
|
return [start, end] |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
text: '最近一个月', |
|
|
|
|
value: () => { |
|
|
|
|
const end = new Date() |
|
|
|
|
const start = new Date() |
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) |
|
|
|
|
return [start, end] |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
text: '最近三个月', |
|
|
|
|
value: () => { |
|
|
|
|
const end = new Date() |
|
|
|
|
const start = new Date() |
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) |
|
|
|
|
return [start, end] |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
] |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
mounted () { |
|
|
|
|
@ -729,17 +790,49 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
init () { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
// getDictionaryBiz('distribution_type').then(res => { |
|
|
|
|
// // console.log("8908098080",res.data.data); |
|
|
|
|
// this.distributionType = res.data.data; |
|
|
|
|
// this.columnList[8].checkarr =res.data.data.map(item=>{ |
|
|
|
|
// item.value=item.dictKey |
|
|
|
|
// item.label=item.dictValue |
|
|
|
|
// return item |
|
|
|
|
// }); |
|
|
|
|
// }); |
|
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
|
// console.log("8908098080",res.data.data); |
|
|
|
|
this.distributionType = res.data.data; |
|
|
|
|
this.columnList[8].checkarr =res.data.data.map(item=>{ |
|
|
|
|
item.value=item.dictKey |
|
|
|
|
item.label=item.dictValue |
|
|
|
|
this.checkcColumnList("typeServiceName", this.columnList).checkarr = res.data.data.map(item => { |
|
|
|
|
item.value = item.dictKey |
|
|
|
|
item.label = item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('stockup_status').then(res => { |
|
|
|
|
this.stockupStatus = res.data.data; |
|
|
|
|
this.checkcColumnList("stockupStatusName", this.columnList).checkarr = res.data.data.map(item => { |
|
|
|
|
item.value = item.dictKey |
|
|
|
|
item.label = item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('stock_allocation').then(res => { |
|
|
|
|
this.stockAllocation = res.data.data; |
|
|
|
|
this.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { |
|
|
|
|
item.value = item.dictKey |
|
|
|
|
item.label = item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
checkcColumnList(prop,columnList){ |
|
|
|
|
for(var a = 0; a < columnList.length; a++){ |
|
|
|
|
if(columnList[a].prop===prop){ |
|
|
|
|
console.log("1111111111111",columnList[a]); |
|
|
|
|
return columnList[a]; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
searchHide () { |
|
|
|
|
this.search = !this.search; |
|
|
|
|
}, |
|
|
|
|
@ -748,6 +841,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
searchReset () { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.stockupDate = []; |
|
|
|
|
this.page.currentPage = 1; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
@ -872,35 +966,39 @@ export default {
|
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
getTime(dat){ |
|
|
|
|
let date = new Date(dat); |
|
|
|
|
var y = date.getFullYear() |
|
|
|
|
var m = date.getMonth() + 1 |
|
|
|
|
m = m < 10 ? '0' + m : m |
|
|
|
|
var d = date.getDate() |
|
|
|
|
d = d < 10 ? '0' + d : d |
|
|
|
|
var h = date.getHours() |
|
|
|
|
h = h < 10 ? '0' + h : h |
|
|
|
|
var minute = date.getMinutes() |
|
|
|
|
minute = minute < 10 ? '0' + minute : minute |
|
|
|
|
var s = date.getSeconds() |
|
|
|
|
s = s < 10 ? '0' + s : s |
|
|
|
|
return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s; |
|
|
|
|
}, |
|
|
|
|
onLoad (page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
|
|
|
|
|
if(this.stockupDate.length > 0){ |
|
|
|
|
let startDate = this.stockupDate[0]; |
|
|
|
|
let entDate = this.stockupDate[1]; |
|
|
|
|
params.startDate = this.getTime(startDate.toString()); |
|
|
|
|
params.entDate = this.getTime(entDate.toString()); |
|
|
|
|
} |
|
|
|
|
// console.log(">>>>",params); |
|
|
|
|
this.query.typeService = '1'; |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.data.forEach(async i =>{ |
|
|
|
|
/* if(i.forkliftId != "-1"){ |
|
|
|
|
console.log("i==",i); |
|
|
|
|
let a = await getUser(i.forkliftId); |
|
|
|
|
i.forkliftId =a.data.data.name; |
|
|
|
|
}*/ |
|
|
|
|
let s =this.distributionType.find(d => d.dictKey == i.typeService); |
|
|
|
|
// console.log("sssss",s); |
|
|
|
|
i.typeServiceName = s.dictValue; |
|
|
|
|
i.loader = i.groupName; |
|
|
|
|
i.stockupArea = i.headline; |
|
|
|
|
if(i.assignStatus == '2'){ |
|
|
|
|
i.assignStatusName = '已指派'; |
|
|
|
|
}else{ |
|
|
|
|
i.assignStatusName = '未指派'; |
|
|
|
|
} |
|
|
|
|
if(i.stockupStatus == '2'){ |
|
|
|
|
i.stockupStatusName = '待备货'; |
|
|
|
|
}else if(i.stockupStatus == '3'){ |
|
|
|
|
i.stockupStatusName = '已备货'; |
|
|
|
|
}else{ |
|
|
|
|
i.stockupStatusName = '未备货'; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.selectionClear(); |
|
|
|
|
this.loading = false; |
|
|
|
|
|
0.0
2 years ago