|
@ -84,7 +84,11 @@ |
|
|
// 装配收货:type = 'assemble' |
|
|
// 装配收货:type = 'assemble' |
|
|
// 预生产收货:type = 'predict' |
|
|
// 预生产收货:type = 'predict' |
|
|
props: { |
|
|
props: { |
|
|
type: 'assemble', |
|
|
type: 'assemble', |
|
|
|
|
|
title: { |
|
|
|
|
|
type: String, |
|
|
|
|
|
default: '' |
|
|
|
|
|
}, |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -182,13 +186,8 @@ |
|
|
|
|
|
|
|
|
var list = res.data.list; |
|
|
var list = res.data.list; |
|
|
this.totalCount = res.data.total |
|
|
this.totalCount = res.data.total |
|
|
if (this.type == 'predict') { |
|
|
// 预生产收货任务 装配收货任务 报废收货任务 |
|
|
updateTitle("预生产收货任务(" + this.totalCount + ")"); |
|
|
updateTitle(this.title+"(" + this.totalCount + ")"); |
|
|
} else if (this.type == 'assemble') { |
|
|
|
|
|
updateTitle("装配收货任务(" + this.totalCount + ")"); |
|
|
|
|
|
} else { |
|
|
|
|
|
updateTitle("报废收货任务(" + this.totalCount + ")"); |
|
|
|
|
|
} |
|
|
|
|
|
this.loadingType = "more"; |
|
|
this.loadingType = "more"; |
|
|
if (list == null || list.length == 0) { |
|
|
if (list == null || list.length == 0) { |
|
|
this.loadingType = "noMore"; |
|
|
this.loadingType = "noMore"; |
|
@ -202,13 +201,7 @@ |
|
|
if (type === "refresh") { |
|
|
if (type === "refresh") { |
|
|
uni.stopPullDownRefresh(); |
|
|
uni.stopPullDownRefresh(); |
|
|
} |
|
|
} |
|
|
if (this.type == 'predict') { |
|
|
updateTitle(this.title+"(" + this.totalCount + ")"); |
|
|
updateTitle("预生产收货任务(" + this.totalCount + ")"); |
|
|
|
|
|
} else if (this.type == 'assemble') { |
|
|
|
|
|
updateTitle("装配收货任务(" + this.totalCount + ")"); |
|
|
|
|
|
} else { |
|
|
|
|
|
updateTitle("报废收货任务(" + this.totalCount + ")"); |
|
|
|
|
|
} |
|
|
|
|
|
this.loadingType = ""; |
|
|
this.loadingType = ""; |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
that.showMessage(error) |
|
|
that.showMessage(error) |
|
@ -218,18 +211,15 @@ |
|
|
openJobDetail(item, packingNumber = '') { |
|
|
openJobDetail(item, packingNumber = '') { |
|
|
if (this.type == 'predict') { |
|
|
if (this.type == 'predict') { |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + |
|
|
url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title |
|
|
packingNumber |
|
|
|
|
|
}); |
|
|
}); |
|
|
} else if (this.type == 'assemble') { |
|
|
} else if (this.type == 'assemble') { |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + |
|
|
url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title |
|
|
'&scaned=' + packingNumber |
|
|
|
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + |
|
|
url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title |
|
|
packingNumber |
|
|
|
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|