diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue index 2b801251..4781ae03 100644 --- a/pages/deliver/job/deliverDetail.vue +++ b/pages/deliver/job/deliverDetail.vue @@ -137,12 +137,21 @@ //拦截返回按钮事件 onBackPress(e) { //已经接收但是没提交任务 - if (this.received) { - //取消承接任务 - cancleTakeDeliverJob(this.id).then(res => {}).catch(error => { - this.showMessage(err); - }) + if (e.from == 'backbutton') { + if (this.received) { + //取消承接任务 + cancleTakeDeliverJob(this.id).then(res => { + uni.navigateBack(); + }).catch(error => { + uni.navigateBack(); + }) + } else { + uni.navigateBack(); + } + + return true; } + }, methods: { @@ -342,10 +351,10 @@ let handleQty = 0; if (batch != undefined) { batch.Records.forEach(res => { - handleQty = calc.add(handleQty,res.qty) + handleQty = calc.add(handleQty, res.qty) }) batch.handleQty = handleQty; - itemHandleQty = calc.add(itemHandleQty,handleQty) + itemHandleQty = calc.add(itemHandleQty, handleQty) } }) } diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue index ef8b74c0..a03df905 100644 --- a/pages/issue/job/issueDetail.vue +++ b/pages/issue/job/issueDetail.vue @@ -61,6 +61,10 @@ import { getManagementPrecisions } from '@/common/balance.js'; + + import { + calc + } from '@/common/calc.js'; import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' @@ -90,7 +94,8 @@ subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 detailOptions: [], - scanOptions: [] + scanOptions: [], + received:false }; }, @@ -122,12 +127,21 @@ //拦截返回按钮事件 onBackPress(e) { //已经接收但是没提交任务 - if (this.received) { - //取消承接任务 - cancleTakeIssueJob(this.id).then(res => {}).catch(error => { - this.showMessage(err); - }) + if (e.from === 'backbutton') { + if (this.received) { + //取消承接任务 + cancleTakeIssueJob(this.id).then(res => { + uni.navigateBack(); + }).catch(error => { + uni.navigateBack(); + }) + } else { + uni.navigateBack(); + } + + return true; } + }, watch: { @@ -392,10 +406,10 @@ let handleQty = 0; if (batch != undefined) { batch.Records.forEach(res => { - handleQty += Number(res.qty) + handleQty = calc.add(handleQty,res.qty) }) batch.handleQty = handleQty; - itemHandleQty += handleQty; + itemHandleQty = calc.add(itemHandleQty,handleQty) } }) } diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 5d5a76af..96d41864 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -252,7 +252,7 @@ purchaseReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购退货记录" + res.data) + this.showCommitSuccessMessage("提交成功
生成采购退货记录
" + res.data) } else { this.showErrorMessage("提交失败" + res.msg) } diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue index 5171adad..d87aaee3 100644 --- a/pages/repleinsh/job/repleinshDetail.vue +++ b/pages/repleinsh/job/repleinshDetail.vue @@ -99,7 +99,8 @@ detailOptions: [], scanOptions: [], toLocationCode: '', - tolocationTypeList: [] + tolocationTypeList: [], + received:false, }; }, @@ -131,12 +132,21 @@ //拦截返回按钮事件 onBackPress(e) { //已经接收但是没提交任务 - if (this.received) { - //取消承接任务 - cancleTakeRepleinshJob(this.id).then(res => {}).catch(error => { - this.showMessage(err); - }) + if (e.from === 'backbutton') { + if (this.received) { + //取消承接任务 + cancleTakeRepleinshJob(this.id).then(res => { + uni.navigateBack(); + }).catch(error => { + uni.navigateBack(); + }) + } else { + uni.navigateBack(); + } + + return true; } + }, watch: {