|
|
|
@ -1,18 +1,11 @@ |
|
|
|
<template> |
|
|
|
<view class=""> |
|
|
|
<com-empty-view v-if="jobList.length==0"></com-empty-view> |
|
|
|
<job-filter :isShowFromLocationCode="true" :isShowFromAreaCode="true" :isShowToAreaCode="true" :isShowProductionLineCode="true" :productionline="productionlineList" |
|
|
|
ref="filter" otherTitle="" |
|
|
|
:checkedToday="checkedToday" |
|
|
|
:checkedWaitTask="checkedWaitTask" |
|
|
|
@switchChangeWait="switchChangeWait" |
|
|
|
@switchChangeToday="switchChangeToday" |
|
|
|
:isShowItemCode="true" @onQuery="getListByFilter" :isShowQurery='true'> |
|
|
|
<!-- <job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" |
|
|
|
:productionline="productionlineList" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" |
|
|
|
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" |
|
|
|
:checkedWaitTask="checkedWaitTask" @productionLineCode="productionLineCode" |
|
|
|
@fromLocationCode="fromLocationCode"> --> |
|
|
|
<job-filter :isShowFromLocationCode="true" :isShowFromAreaCode="true" :isShowToAreaCode="true" |
|
|
|
:isShowProductionLineCode="true" |
|
|
|
:productionline="productionlineList" |
|
|
|
ref="filter" otherTitle="" :isShowItemCode="true" |
|
|
|
@onQuery="getListByFilter" :isShowQurery='true'> |
|
|
|
</job-filter> |
|
|
|
<view v-if="jobList.length>0"> |
|
|
|
<uni-swipe-action ref="swipeAction"> |
|
|
|
@ -58,7 +51,8 @@ |
|
|
|
} from '@/common/record.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
planRefreshTime |
|
|
|
planRefreshTime, |
|
|
|
issueJobFilter |
|
|
|
} from '@/common/config.js'; |
|
|
|
|
|
|
|
|
|
|
|
@ -114,7 +108,8 @@ |
|
|
|
filterItemCode: "", |
|
|
|
businessTypeCode: "Issue", |
|
|
|
businessType: null, |
|
|
|
timer:null |
|
|
|
timer: null, |
|
|
|
productionLineCode:"" |
|
|
|
}; |
|
|
|
}, |
|
|
|
onLoad(option) { |
|
|
|
@ -122,15 +117,15 @@ |
|
|
|
this.getIssueJobByProductionline() |
|
|
|
}, |
|
|
|
onShow() { |
|
|
|
this.timerRefresh(); |
|
|
|
this.getList('refresh') |
|
|
|
}, |
|
|
|
|
|
|
|
onHide() { |
|
|
|
this.stopRefresh(); |
|
|
|
// this.stopRefresh(); |
|
|
|
}, |
|
|
|
|
|
|
|
onUnload(){ |
|
|
|
this.stopRefresh(); |
|
|
|
onUnload() { |
|
|
|
// this.stopRefresh(); |
|
|
|
}, |
|
|
|
|
|
|
|
onReady() { |
|
|
|
@ -143,13 +138,15 @@ |
|
|
|
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { |
|
|
|
return; |
|
|
|
} |
|
|
|
this.getList('more', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
|
|
|
|
this.getList('more') |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onPullDownRefresh() { |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
|
|
|
|
this.getList('refresh') |
|
|
|
}, |
|
|
|
|
|
|
|
//后退按钮 |
|
|
|
@ -167,17 +164,17 @@ |
|
|
|
if (e.index === 0) { |
|
|
|
goHome(); |
|
|
|
} else if (e.index == 1) { |
|
|
|
this.$refs.filter.openFilter(); |
|
|
|
this.$refs.filter.openFilterParams(uni.getStorageSync(issueJobFilter)); |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
methods: { |
|
|
|
timerRefresh() { |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
this.getList('refresh') |
|
|
|
this.stopRefresh(); |
|
|
|
var that = this; |
|
|
|
this.timer = setInterval(function() { |
|
|
|
that.getList('refresh', that.fromLocation, that.productionLine, that.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
that.getList('refresh') |
|
|
|
console.log('发料刷新'); |
|
|
|
}, planRefreshTime) |
|
|
|
}, |
|
|
|
@ -218,7 +215,7 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
getList(type, fromLocation = '', productionLine = '',filterItemCode='',fromAreaCode='',toAreaCode='') { |
|
|
|
getList(type) { |
|
|
|
let that = this; |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
@ -230,72 +227,19 @@ |
|
|
|
this.pageNo = 1; |
|
|
|
this.jobList = []; |
|
|
|
} |
|
|
|
var filters = [] |
|
|
|
if (this.checkedToday) { |
|
|
|
filters.push({ |
|
|
|
column: "create_time", |
|
|
|
action: "betweeen", |
|
|
|
value: this.todayTime |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
filters.push({ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: this.status |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
if (fromLocation) { |
|
|
|
// 来源库位 |
|
|
|
filters.push({ |
|
|
|
column: "fromLocationCode", |
|
|
|
action: "==", |
|
|
|
value: fromLocation |
|
|
|
}) |
|
|
|
} |
|
|
|
if(fromAreaCode){ |
|
|
|
//来源库区 |
|
|
|
filters.push({ |
|
|
|
column: "fromAreaCode", |
|
|
|
action: "==", |
|
|
|
value: fromAreaCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if(toAreaCode){ |
|
|
|
//到库区 |
|
|
|
filters.push({ |
|
|
|
column: "toAreaCode", |
|
|
|
action: "==", |
|
|
|
value: toAreaCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if (productionLine) { |
|
|
|
// 生产线 |
|
|
|
filters.push({ |
|
|
|
column: "productionLineCode", |
|
|
|
action: "==", |
|
|
|
value: productionLine |
|
|
|
}) |
|
|
|
} |
|
|
|
if(filterItemCode){ |
|
|
|
// 物料代码 |
|
|
|
filters.push({ |
|
|
|
column: "itemCode", |
|
|
|
action: "like", |
|
|
|
value: filterItemCode |
|
|
|
}) |
|
|
|
} |
|
|
|
var queryFiltersParams =this.setQueryParam() |
|
|
|
var params = { |
|
|
|
filters: filters, |
|
|
|
filters: queryFiltersParams, |
|
|
|
pageNo: this.pageNo, |
|
|
|
pageSize: 100, |
|
|
|
pageSize: this.pageSize, |
|
|
|
} |
|
|
|
|
|
|
|
console.log("查询条件",JSON.stringify(params)) |
|
|
|
getIssueJobList(params).then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
if (type === "refresh") { |
|
|
|
uni.stopPullDownRefresh(); |
|
|
|
this.openScanPopup() |
|
|
|
|
|
|
|
} |
|
|
|
var list = res.data.list; |
|
|
|
|
|
|
|
@ -311,6 +255,9 @@ |
|
|
|
if (type === "refresh") { |
|
|
|
uni.stopPullDownRefresh(); |
|
|
|
} |
|
|
|
if(this.jobList.length>0){ |
|
|
|
this.openScanPopup() |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
if (type === "refresh") { |
|
|
|
uni.stopPullDownRefresh(); |
|
|
|
@ -322,153 +269,93 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
getListByFilter(params) { |
|
|
|
console.log('getListByFilter',params) |
|
|
|
let that = this; |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
// var filters = [] |
|
|
|
// if (this.checkedToday) { |
|
|
|
// filters.push({ |
|
|
|
// column: "create_time", |
|
|
|
// action: "betweeen", |
|
|
|
// value: this.todayTime |
|
|
|
// }) |
|
|
|
setQueryParam() { |
|
|
|
var filterParams = [] |
|
|
|
var queryParams=uni.getStorageSync(issueJobFilter) |
|
|
|
// if(!queryParams){ |
|
|
|
// queryParams={ |
|
|
|
// } |
|
|
|
// queryParams.status="1,2" |
|
|
|
// } |
|
|
|
|
|
|
|
// filters.push({ |
|
|
|
// column: "status", |
|
|
|
// action: "in", |
|
|
|
// value: this.status |
|
|
|
// }) |
|
|
|
if (params.status) { |
|
|
|
this.status = params.status |
|
|
|
|
|
|
|
}else{ |
|
|
|
this.status = "1,2" |
|
|
|
//只看当天 |
|
|
|
if (queryParams.creationTime ) { |
|
|
|
filterParams.push({ |
|
|
|
column: "create_time", |
|
|
|
action: "betweeen", |
|
|
|
value: queryParams.creationTime |
|
|
|
}) |
|
|
|
} |
|
|
|
if(params.creationTime==""){ |
|
|
|
this.checkedToday = false; |
|
|
|
//只看待处理 |
|
|
|
if (queryParams.status) { |
|
|
|
filterParams.push({ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: queryParams.status |
|
|
|
}) |
|
|
|
}else { |
|
|
|
filterParams.push({ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: "1,2" |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (params.fromLocationCode) { |
|
|
|
// 来源库位 |
|
|
|
this.fromLocation = params.fromLocationCode |
|
|
|
// filters.push({ |
|
|
|
// column: "fromLocationCode", |
|
|
|
// action: "==", |
|
|
|
// value: params.fromLocationCode |
|
|
|
// }) |
|
|
|
}else{ |
|
|
|
this.fromLocation = '' |
|
|
|
//生产线 |
|
|
|
if (queryParams.productionLineCode) { |
|
|
|
filterParams.push({ |
|
|
|
column: "productionLineCode", |
|
|
|
action: "==", |
|
|
|
value: queryParams.productionLineCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if (params.productionLineCode) { |
|
|
|
// 生产线 |
|
|
|
this.productionLine = params.productionLineCode |
|
|
|
// filters.push({ |
|
|
|
// column: "productionLineCode", |
|
|
|
// action: "==", |
|
|
|
// value: params.productionLineCode |
|
|
|
// }) |
|
|
|
}else{ |
|
|
|
this.productionLine = '' |
|
|
|
//物料代码 |
|
|
|
if (queryParams.itemCode) { |
|
|
|
filterParams.push({ |
|
|
|
column: "itemCode", |
|
|
|
action: "like", |
|
|
|
value: queryParams.itemCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if (params.itemCode) { |
|
|
|
// 物料代码 |
|
|
|
this.filterItemCode = params.itemCode |
|
|
|
// filters.push({ |
|
|
|
// column: "itemCode", |
|
|
|
// action: "like", |
|
|
|
// value: params.itemCode |
|
|
|
// }) |
|
|
|
}else{ |
|
|
|
this.filterItemCode = '' |
|
|
|
|
|
|
|
//来源库位 |
|
|
|
if (queryParams.fromLocationCode) { |
|
|
|
filterParams.push({ |
|
|
|
column: "fromLocationCode", |
|
|
|
action: "==", |
|
|
|
value: queryParams.fromLocationCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if (params.fromAreaCode) { |
|
|
|
// 来源库区 |
|
|
|
this.fromAreaCode = params.fromAreaCode |
|
|
|
// filters.push({ |
|
|
|
// column: "fromAreaCode", |
|
|
|
// action: "==", |
|
|
|
// value: params.fromAreaCode |
|
|
|
// }) |
|
|
|
}else{ |
|
|
|
this.fromAreaCode = '' |
|
|
|
|
|
|
|
//来源库区 |
|
|
|
if (queryParams.fromAreaCode) { |
|
|
|
filterParams.push({ |
|
|
|
column: "fromAreaCode", |
|
|
|
action: "==", |
|
|
|
value: queryParams.fromAreaCode |
|
|
|
}) |
|
|
|
} |
|
|
|
if (params.toAreaCode) { |
|
|
|
// 到库区 |
|
|
|
this.toAreaCode = params.toAreaCode |
|
|
|
// filters.push({ |
|
|
|
// column: "toAreaCode", |
|
|
|
// action: "==", |
|
|
|
// value: params.toAreaCode |
|
|
|
// }) |
|
|
|
}else{ |
|
|
|
this.toAreaCode = '' |
|
|
|
//到库区 |
|
|
|
if (queryParams.toAreaCode) { |
|
|
|
filterParams.push({ |
|
|
|
column: "toAreaCode", |
|
|
|
action: "==", |
|
|
|
value: queryParams.toAreaCode |
|
|
|
}) |
|
|
|
} |
|
|
|
// var params = { |
|
|
|
// filters: filters, |
|
|
|
// pageNo: 1, |
|
|
|
// pageSize: 100, |
|
|
|
// } |
|
|
|
|
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
// getIssueJobList(params).then(res => { |
|
|
|
// uni.hideLoading(); |
|
|
|
// if (res.data.total == 0) { |
|
|
|
// that.showMessage('未查找到发料任务'); |
|
|
|
// } else if (res.data.total == 1) { |
|
|
|
// that.openJobDetail(res.data.list[0]); |
|
|
|
// } else { |
|
|
|
// that.showItemList(res.data.list); |
|
|
|
// } |
|
|
|
// }).catch(error => { |
|
|
|
return filterParams; |
|
|
|
|
|
|
|
// that.showMessage(error) |
|
|
|
// }) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
fromLocationCode(fromLocation) { |
|
|
|
this.fromLocation = fromLocation; |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
|
|
|
|
}, |
|
|
|
productionLineCode(productionLineCode) { |
|
|
|
this.productionLine = productionLineCode |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
}, |
|
|
|
getByAsnNumber(code) { |
|
|
|
let that = this; |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
|
|
|
|
getPurchasereceiptByAsnNumber(code).then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
if (res.data.total == 0) { |
|
|
|
that.showMessage('未查找到' + '【' + code + '】的收货任务'); |
|
|
|
} else if (res.data.total == 1) { |
|
|
|
this.$refs.scanAsnNumber.closeScanPopup(); |
|
|
|
that.openJobDetail(res.data.list[0]); |
|
|
|
} else { |
|
|
|
this.$refs.scanAsnNumber.closeScanPopup(); |
|
|
|
that.showItemList(res.data.list); |
|
|
|
} |
|
|
|
|
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading(); |
|
|
|
that.showErrorMessage(error); |
|
|
|
}) |
|
|
|
getListByFilter(params) { |
|
|
|
this.productionLineCode =params.productionLineCode |
|
|
|
uni.setStorageSync(issueJobFilter,params) |
|
|
|
this.getList('refresh') |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
openJobDetail(item, scanMessage = '') { |
|
|
|
this.getJobInfoByNumber(item.number,scanMessage) |
|
|
|
this.getJobInfoByNumber(item.number, scanMessage) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
@ -512,7 +399,7 @@ |
|
|
|
cancleJob(id) { |
|
|
|
cancleTakeIssueJob(id).then(res => { |
|
|
|
if (res.data) { |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
this.getList('refresh') |
|
|
|
|
|
|
|
uni.showToast({ |
|
|
|
title: "放弃任务成功" |
|
|
|
@ -533,7 +420,7 @@ |
|
|
|
closeTakeIssueJob(id).then(res => { |
|
|
|
uni.hideLoading() |
|
|
|
if (res.data) { |
|
|
|
this.getList("refresh") |
|
|
|
this.getList('refresh') |
|
|
|
uni.showToast({ |
|
|
|
title: "关闭任务成功" |
|
|
|
}) |
|
|
|
@ -546,19 +433,7 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
switchChangeToday(state, creationTime) { |
|
|
|
this.checkedToday = state; |
|
|
|
this.todayTime = creationTime; |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
switchChangeWait(state, jobStatus) { |
|
|
|
this.checkedWaitTask = state; |
|
|
|
this.status = jobStatus; |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
}, |
|
|
|
getJobInfoByNumber(number,scanMessage){ |
|
|
|
getJobInfoByNumber(number, scanMessage) { |
|
|
|
let that = this; |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
@ -579,31 +454,33 @@ |
|
|
|
var params = { |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
pageSize: this.pageSize, |
|
|
|
} |
|
|
|
getIssueJobList(params).then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
if (res.data.list.length == 0) { |
|
|
|
that.showMessage('未查找到' + '【' + number + '】的发料任务'); |
|
|
|
} else { |
|
|
|
var result =res.data.list[0]; |
|
|
|
if(result.acceptUserId&&result.acceptUserId!=this.$store.state.user.id){ |
|
|
|
this.$refs.comMessage.showErrorMessage("任务号["+result.number+"]已经被["+result.acceptUserName+"]承接,无法执行", res => { |
|
|
|
if (res) { |
|
|
|
if (this.$refs.scanPopup) { |
|
|
|
this.$refs.scanPopup.getfocus() |
|
|
|
} else { |
|
|
|
var result = res.data.list[0]; |
|
|
|
if (result.acceptUserId && result.acceptUserId != this.$store.state.user.id) { |
|
|
|
this.$refs.comMessage.showErrorMessage("任务号[" + result.number + "]已经被[" + result |
|
|
|
.acceptUserName + "]承接,无法执行", res => { |
|
|
|
if (res) { |
|
|
|
if (this.$refs.scanPopup) { |
|
|
|
this.$refs.scanPopup.getfocus() |
|
|
|
} |
|
|
|
this.getList('refresh') |
|
|
|
} |
|
|
|
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
return; |
|
|
|
} |
|
|
|
uni.navigateTo({ |
|
|
|
url: './issueDetail?id=' + result.masterId + '&status=' + result.status + '&scanMessage=' + |
|
|
|
url: './issueDetail?id=' + result.masterId + '&status=' + result.status + |
|
|
|
'&scanMessage=' + |
|
|
|
scanMessage + '&title=' + this.title |
|
|
|
}); |
|
|
|
this.scanMessage="" |
|
|
|
this.scanMessage = "" |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading(); |
|
|
|
@ -611,44 +488,6 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
getScanNumber(code) { |
|
|
|
this.getDataListByType(code) |
|
|
|
}, |
|
|
|
getDataListByType(code) { |
|
|
|
let that = this; |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
var filters = [] |
|
|
|
filters.push({ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: '1,2' |
|
|
|
}) |
|
|
|
filters.push({ |
|
|
|
column: "number", |
|
|
|
action: "==", |
|
|
|
value: code |
|
|
|
}) |
|
|
|
|
|
|
|
var params = { |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
} |
|
|
|
getIssueJobList(params).then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
if (res.data.list.length == 0) { |
|
|
|
that.showMessage('未查找到' + '【' + code + '】的发料任务'); |
|
|
|
} else if (res.data.list.length == 1) { |
|
|
|
that.openJobDetail(res.data.list[0]); |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading(); |
|
|
|
that.showMessage(error); |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
showMessage(message) { |
|
|
|
this.$refs.comMessage.showErrorMessage(message, res => { |
|
|
|
@ -700,6 +539,14 @@ |
|
|
|
value: balance.locationCode |
|
|
|
} |
|
|
|
] |
|
|
|
if(productionLineCode){ |
|
|
|
filters.push({ |
|
|
|
column: "productionLineCode", |
|
|
|
action: "==", |
|
|
|
value: productionLineCode |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
getIssueJobList({ |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
|
