diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue index 2f7fcca..068b08c 100644 --- a/pages/inventory/index.vue +++ b/pages/inventory/index.vue @@ -15,7 +15,7 @@ - 待商品物料信息 + 待盘点商品信息 @@ -245,9 +245,7 @@ undefined) { return } - // this.queryFlag = setTimeout(() => { this.loadList() - // }, 500) }, onNavigationBarButtonTap(e){ }, @@ -258,7 +256,6 @@ this.pickUpObj.moldBarcodeList.splice(index,1) }, loadList() { - //防抖 // clearInterval(this.timer) this.timer =setTimeout(()=>{ @@ -269,30 +266,14 @@ setTimeout(()=>{ flag = true this.firstFocus=false - // this.$u.api.inv.pdaInvByContainerCode(this.dataForm).then(res=>{ - // console.log(res); - // if(!res.rows || res.rows.length == 0){ - // // console.log(res); - // // this.$u.toast("当前商品不存在"); - // }else if(res.code == '200'){ - // console.log(res); - // this.dataList=res.rows - // setTimeout(()=>{ - // this.dataForm.containerCode='' - // },0) - // this.$nextTick(()=>{ - // this.firstFocus = true - // }) - // } - - - // }) + this.$u.api.invPlan.pdaInvByContainerCode(this.dataForm).then(res=>{ if(!res.rows || res.rows.length == 0){ - // console.log(res); - this.$u.toast("当前台车内物料不存在"); + this.$u.toast("当前托盘内商品不存在"); }else if(res.code == '200'){ - // console.log(res); + res.row.forEach(item=>{ + item.invQty=item.quantity + }) this.dataList=res.rows setTimeout(()=>{ this.dataForm.containerCode='' @@ -308,9 +289,9 @@ },400) }, enterUp(){ - // this.$u.api.inv.entrySave(this.) - // item.qty=this.invQty - // console.log(item); + // this.$u.api.inv.entrySave(this.) + // item.qty=this.invQty + // console.log(item); // if(this.form.ptPart === null // || this.form.ptPart === '' // || this.form.ptPart === 0 @@ -319,14 +300,14 @@ // this.$u.toast("请扫描物料编码"); // return; // } - if(this.form.batch === null - || this.form.batch === '' - || this.form.batch === 0 - || this.form.batch === undefined - || this.form.batch ==='undefined'){ - this.$u.toast("请选择批次"); - return; - } + // if(this.form.batch === null + // || this.form.batch === '' + // || this.form.batch === 0 + // || this.form.batch === undefined + // || this.form.batch ==='undefined'){ + // this.$u.toast("请选择批次"); + // return; + // } if(this.form.invQty === null || this.form.invQty === '' || this.form.invQty === 0 @@ -336,17 +317,13 @@ return; } this.$u.api.invPlan.entrySave(this.form).then(res=>{ - // console.log(res); if(res.code==200){ this.$u.toast("修改完成"); setTimeout(()=>{ - // this.$router.go(0) this.$u.api.invPlan.pdaInvByContainerCode({containerCode:this.form.containerCode}).then(res=>{ if(!res.rows || res.rows.length == 0){ - // console.log(res); this.$u.toast("当前台车内物料不存在"); }else if(res.code == '200'){ - // console.log(res); this.dataList=res.rows setTimeout(()=>{ this.dataForm.containerCode='' @@ -365,7 +342,6 @@ }, confirm(e){ - // console.log(val); this.form.batch=e[0].label; }, pickUp(){ diff --git a/pages/payInto/index.vue b/pages/payInto/index.vue index 1504102..7db39ae 100644 --- a/pages/payInto/index.vue +++ b/pages/payInto/index.vue @@ -148,7 +148,8 @@ // pageSize: 10, ptPart: '' }, - dataList: [{ + dataList: [ + { rerpPart: '222222', ptName: 'ptName', containerCode: '11111',