diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue index 5e059e0b..5b8e0783 100644 --- a/src/pages/count/job/countBlindDetail.vue +++ b/src/pages/count/job/countBlindDetail.vue @@ -25,8 +25,8 @@ - - + + @@ -599,7 +599,10 @@ .header { position: fixed; + /* #ifdef H5 */ top: 88rpx; + /* #endif */ + left: 0; width: 100%; background-color: #fff; diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 62729e03..108152ba 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -193,17 +193,20 @@ }, openJobDetail(item) { - //明盘 - if(item.isOpenCount=="TRUE"){ - uni.navigateTo({ - url: './countLightDetail?id=' + item.id + '&status=' + item.status - }); - }else { - //盲盘 - uni.navigateTo({ - url: './countBlindDetail?id=' + item.id + '&status=' + item.status - }); - } + uni.navigateTo({ + url: './countDetail?id=' + item.id + '&status=' + item.status + }); + // //明盘 + // if(item.isOpenCount=="TRUE"){ + // uni.navigateTo({ + // url: './countLightDetail?id=' + item.id + '&status=' + item.status + // }); + // }else { + // //盲盘 + // uni.navigateTo({ + // url: './countBlindDetail?id=' + item.id + '&status=' + item.status + // }); + // } }, showItemList(itemList) { diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index 5bb64a94..51f1b74d 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -29,8 +29,8 @@ - - + + @@ -382,6 +382,7 @@ } else { //未扫描,赋值 selectItem.scaned = true; + selectItem.balanceQty= Number(qty) selectItem.handleQty = Number(qty) selectItem.packQty = pack.packQty selectItem.packUnit = pack.packUnit @@ -511,17 +512,17 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // countJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + countJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, @@ -608,7 +609,9 @@ .header { position: fixed; + /* #ifdef H5 */ top: 88rpx; + /* #endif */ left: 0; width: 100%; background-color: #fff;