diff --git a/common/http.api.js b/common/http.api.js index 7e0a52d..1134c95 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -232,6 +232,8 @@ const install = (Vue, vm) => { getTaskNumber: (params = {}) => vm.$u.get('/system/dict/data/type/once_pick_task_number'), // 获取盘点类型的字典 getInvType: (params = {}) => vm.$u.get('/system/dict/data/type/inv_type_dict'), + // 订单类型 + orderTypeDict: (params = {}) => vm.$u.get('/system/dict/data/type/order_type_dict'), //获取AGV点位的字典 getCarry:(params = {}) => vm.$u.get('/system/dict/data/type/agv_move_location'), //获取托盘状态字典 diff --git a/pages/AvgCarry/index.vue b/pages/AvgCarry/index.vue index 04defec..5793f93 100644 --- a/pages/AvgCarry/index.vue +++ b/pages/AvgCarry/index.vue @@ -4,16 +4,17 @@ 扫描托盘条码: + style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" placeholder="请扫描或输入要搬运的托盘条码" + :focus="focusFlag" @input="changeCode()"> 搬运起始点位: - - - - + --> + @@ -21,10 +22,14 @@ 搬运目标点位: - - + --> + + 开始搬运 @@ -40,6 +45,7 @@ show: false, showTwo: false, focusFlag: true, + flag: true, begin: '', endValue: '', end: '', @@ -49,16 +55,18 @@ containerCode: '', endPoint: '', }, + timer: 0, pointList: [], pointList1: [], + pointList2:[], + pointList3:[], } }, onLoad() { - // this.getDic() - - this.$u.api.AvgCarry.getPointList({ + this.$u.api.AvgCarry.getPointList({ pageNum: 1, - pageSize: 100 + pageSize: 999, + // pointGroup:1 }).then(res => { this.pointList = [] this.pointList1 = [] @@ -73,63 +81,70 @@ this.pointList1.push(obj); } } + }) + + // this.$u.api.AvgCarry.getPointList({ + // pageNum: 1, + // pageSize: 999 + // }).then(res => { + // this.pointList2 = [] + // this.pointList3 = [] + // if (res.code == 200) { + // let dataArry = res.rows; + // for (var i = 0; i < dataArry.length; i++) { + // var obj = { + // value: dataArry[i].pointNo, + // label: dataArry[i].pointName, + // }; + // this.pointList2.push(obj); + // this.pointList3.push(obj); + // } + // } - // this.getList() - + // }) }, methods: { - changeCode() { - this.focusFlag = false - // this.query = { - // pageNum: 1, - // pageSize: 10 - // } - // this.getDataList() - - this.$u.api.AvgCarry.queryBillingDByContainerCode({ - containerCode: this.dataForm.containerCode - }).then(res => { - // console.log(res); - // res.data=[{ - // "targetPoint":"0460" - // }] - // this.endValue = res.data[0].targetPoint - // this.beginValue= res.data[1].startPoint - // this.pointList.forEach(item=>{ - // if(res.data[0].targetPoint == item.value){ - // this.end = item.label - // } - // if(res.data[1].startPoint == item.value){ - // this.begin = item.label - // } - // }) - this.endValue = res.data[0] ? res.data[0].targetPoint : '' - this.beginValue = res.data[1] ? res.data[1].startPoint : '' - this.pointList.forEach(item => { - if (res.data[0]) { - if (res.data[0].targetPoint == item.value) { - this.end = item.label + clearTimeout(this.timer) + //防抖节流 + this.flag = true + if (this.flag === false) return; + this.flag = false; + this.timer = setTimeout(() => { + this.flag = true + this.focusFlag = false + this.$u.api.AvgCarry.queryBillingDByContainerCode({ + containerCode: this.dataForm.containerCode + }).then(res => { + this.endValue = res.data[0] ? res.data[0].targetPoint : '' + this.beginValue = res.data[1] ? res.data[1].startPoint : '' + this.pointList.forEach(item => { + if (res.data[0]) { + if (res.data[0].targetPoint == item.value) { + this.end = item.label + } } - } + if (res.data[1]) { + if (res.data[1].startPoint == item.value) { + this.begin = item.label - if (res.data[1]) { - if (res.data[1].startPoint == item.value) { - this.begin = item.label + } } - } - }) + }) // this.end = res.data - this.pointList1 = this.pointList.filter(item => item.value != this.beginValue && item.value != - this.endValue) + // this.pointList1 = this.pointList.filter(item => item.value != this.beginValue && item.value != + // this.endValue) // this.dataForm.endPoint = res.data // this.endValue=res.data this.pointList = this.pointList.filter(item => item.value != this.beginValue && item.value != this.endValue) }) + + this.$forceUpdate() + },800) }, //呼叫搬运 checkOutPick() { @@ -150,7 +165,6 @@ this.$u.toast("请选择目标位置"); return; } - // }).catch(err=>console.log(err)) this.$u.api.AvgCarry.agvCarry({ startPoint: this.beginValue, toLocation: this.endValue, @@ -188,6 +202,17 @@ } }).catch(err => {}) }, + // 选择点位 + queryList(index,item){ + this.begin=item.label + this.beginValue=item.value + this.judge() + }, + queryList1(index,item){ + this.end = item.label + this.endValue = item.value + this.judge() + }, //获取点位 async getList() { this.list = []; @@ -206,14 +231,22 @@ } }); this.showList = [...this.list] - // console.log(this.list) + }, + + reomveValue(){ + this.beginValue = '' + this.begin = '' + }, + reomveValue1(){ + this.end = '' + this.endValue = '' }, //过滤数组 judge(e) { - // console.log(e); - // console.log(this.pointList); this.pointList1 = this.pointList.filter(item => item.value != this.beginValue && item.value != this - .endValue) + .endValue) + // this.pointList = this.pointList1.filter(item => item.value != this.beginValue && item.value != this + // .endValue) }, confirm(e) { this.begin = e[0].label @@ -234,7 +267,7 @@ @import "index.scss"; .img1 { - height: 220px; + height: 200px; background-image: url(@/static/down.png); background-size: 50% 100%; background-repeat: no-repeat; diff --git a/pages/AvgOrderPkg/index.vue b/pages/AvgOrderPkg/index.vue index 7638c2a..2c9a5b5 100644 --- a/pages/AvgOrderPkg/index.vue +++ b/pages/AvgOrderPkg/index.vue @@ -3,7 +3,7 @@ - @@ -303,7 +303,7 @@ this.$u.api.pickBy.pickByContainerCode(this.dataForm).then(res=>{ if(!res.data || res.data.length == 0){ // console.log(res); - this.$u.toast("当前台车不存在"); + this.$u.toast("当前托盘不存在"); this.dataList=res.data }else if(res.code == '200'){ // console.log(res); @@ -335,7 +335,7 @@ || this.dataForm.containerCode === 0 || this.dataForm.containerCode === undefined || this.dataForm.containerCode ==='undefined'){ - this.$u.toast("请扫描台车编号"); + this.$u.toast("请扫描托盘编号"); return; } var obj ={ diff --git a/pages/checkAccept/checkHomework.vue b/pages/checkAccept/checkHomework.vue index f45d21f..6ec4882 100644 --- a/pages/checkAccept/checkHomework.vue +++ b/pages/checkAccept/checkHomework.vue @@ -30,12 +30,12 @@ 件装量： {{result.businInReceivingDForPdaVo.bpPackageQty}} - + 未验数量： @@ -49,15 +49,15 @@ 是否缠膜： - {{dataForm.extend3 == '1'?'是':'否'}} + {{dataForm.isWrap == '1'?'是':'否'}} 是否验重： - {{dataForm.extend4 == '1'?'是':'否'}} + {{dataForm.isVerWeight == '1'?'是':'否'}} 件 数： - + @@ -100,6 +100,8 @@ result: '', extend3:'', extend4:'', + isWrap:'', + isVerWeight:'', actualQty: '', // 件数 @@ -137,8 +139,9 @@ onLoad: function(options) { this.sid = options.sid this.detailId = options.did - this.dataForm.extend3 = options.extend3 - this.dataForm.extend4 = options.extend4 + options.isWrap ?this.dataForm.isWrap = options.isWrap :'' + options.isVerWeight ?this.dataForm.isVerWeight = options.isVerWeight:'' + options.ableQty?this.dataForm.actualQty = options.ableQty:'' this.getList(options) // 收货结论 this.getByDicReceivingStatus() @@ -298,6 +301,14 @@ if (res.code === 200) { this.$u.toast('验收成功'); this.result = {} + this.dataForm={} + setTimeout(() => { + this.$u.route({ + url: 'pages/checkAccept/index', + type: 'navigateBack' + }) + }, 500) + } else { this.$u.toast(res.msg); } @@ -322,7 +333,10 @@ getList(params) { this.$u.api.acceptance.getReceiving(params).then(res => { if (res.code === 200) { + // res.data.actualQty = res.data.ableQty this.result = res.data + // this.dataForm.actualQty = this.result.ableQty + if (!this.result.businInReceivingDForPdaVo) { this.$u.toast('当前商品待验收信息') } diff --git a/pages/checkAccept/checkHomeworks.vue b/pages/checkAccept/checkHomeworks.vue index 080c689..d741d95 100644 --- a/pages/checkAccept/checkHomeworks.vue +++ b/pages/checkAccept/checkHomeworks.vue @@ -53,10 +53,10 @@ 是否缠膜： - {{item.extend3 == '1'?'是':'否'}} + {{item.isWrap == '1'?'是':'否'}} 是否验重: - {{item.extend4 == '1'?'是':'否'}} + {{item.isVerWeight == '1'?'是':'否'}} - + 是否验重 - + @@ -73,7 +73,7 @@ - + @@ -195,31 +195,32 @@ } }, changeFilm(item){ - if(item.extend3 == 0 ){ - item.extend3 = 1 - }else if(item.extend3 == 1 ){ - item.extend3 = 0 - }else if(item.extend3 == "" ){ - item.extend3 = 1 + if(item.isWrap == 0 ){ + item.isWrap = 1 + }else if(item.isWrap == 1 ){ + item.isWrap = 0 + }else if(item.isWrap == "" || item.isWrap == undefined || item.isWrap == 'undefined' || item.isWrap == 0 ){ + item.isWrap = 1 } this.orderNoList.forEach(item1=>{ if(item1.orderNo === item.orderNo){ - item1.extend3 = item.extend3 + item1.isWrap = item.isWrap } }) + }, changeWeight(item){ - if(item.extend4 == 0 ){ - item.extend4 = 1 - }else if(item.extend4 == 1 ){ - item.extend4 = 0 - }else if(item.extend4 == "" ){ - item.extend4 = 1 + if(item.isVerWeight == 0 ){ + item.isVerWeight = '1' + }else if(item.isVerWeight == 1 ){ + item.isVerWeight = '0' + }else if(item.isVerWeight == "" || item.isVerWeight == undefined || item.isVerWeight == 'undefined' || item.isVerWeight == 0 ){ + item.isVerWeight = '1' } this.orderNoList.forEach(item1=>{ if(item1.orderNo === item.orderNo){ - item1.extend4 = item.extend4 + item1.isVerWeight = item.isVerWeight } }) @@ -234,7 +235,6 @@ handleOrderNoOne(item){ let _ = this; let detailIds = []; - console.log(item.extend3,item.extend4); detailIds.push(item.id); let tempData = { orderNo: item.orderNo, @@ -243,13 +243,12 @@ detailIds:detailIds, goodNo:item.goodNo, bgGoodName:item.bgGoodName, - extend3:item.extend3, - extend4:item.extend4, + isWrap:item.isWrap, + isVerWeight:item.isVerWeight, actualQty:item.ableQty, packageQty:0 }; _.orderNoList.push(tempData); - console.log(_.orderNoList); }, //增加时多个选择 handleOrderNoMulti(item){ @@ -367,15 +366,16 @@ }); this.$u.toast("数据列表已刷新"); }, - goodDetail(sid, did,extend3,extend4) { + goodDetail(sid, did,isWrap,isVerWeight,ableQty) { this.$u.route({ url: 'pages/checkAccept/checkHomework', type: 'navigateTo', params: { sid, did, - extend3, - extend4 + isWrap, + isVerWeight, + ableQty, } }) }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 58d1ff5..3fa388b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -23,10 +23,10 @@ 出库分拣 - + 库存查询 diff --git a/pages/payInto/index.vue b/pages/payInto/index.vue index 962f7fd..79f88a6 100644 --- a/pages/payInto/index.vue +++ b/pages/payInto/index.vue @@ -5,10 +5,10 @@ - 台车编号:托盘编号: + type="text" placeholder="请扫描托盘编号" :border="true" /> 选择物料: @@ -90,7 +90,7 @@ - 台车编号: + 托盘编号: {{item.containerCode}} @@ -271,7 +271,7 @@ e.text = 111 this.$u.api.mouldStorage.callEmptyContainer().then(res => { if (res.code == 200) { - this.$u.toast("已呼叫台车"); + this.$u.toast("已呼叫托盘"); } }) diff --git a/pages/queryPoint/index.vue b/pages/queryPoint/index.vue index 22c12f6..439f4ab 100644 --- a/pages/queryPoint/index.vue +++ b/pages/queryPoint/index.vue @@ -105,6 +105,12 @@ // this.typeList = res.data // }) // this.loadList(); + + // this.$u.api.AvgCarry.getPointList(this.dataForm).then(res=>{ + // if(res.code == '200'){ + // this.dataList = res.rows + // } + // }) this.$u.api.AvgCarry.getPointList({...this.dataForm,pageSize: 9999}).then(res=>{ this.nextDataList=[] if(res.code == '200'){ @@ -122,21 +128,21 @@ }, //上拉刷新(当数据距离底部100时触发，距离在pages.json配置) - onReachBottom() { - this.loadStatus = "loading"; - setTimeout(() => { - this.dataForm.pageNum += 1; - this.loadList(); - }, 100); - }, - onPullDownRefresh () { - this.list = [] - //调用获取数据方法 - setTimeout(() => { - //结束下拉刷新 - uni.stopPullDownRefresh (); - }, 1000); - }, + // onReachBottom() { + // this.loadStatus = "loading"; + // setTimeout(() => { + // this.dataForm.pageNum += 1; + // this.loadList(); + // }, 100); + // }, + // onPullDownRefresh () { + // this.list = [] + // //调用获取数据方法 + // setTimeout(() => { + // //结束下拉刷新 + // uni.stopPullDownRefresh (); + // }, 1000); + // }, methods: { //点击变色 btn(index,item){ diff --git a/pages/receive/index.vue b/pages/receive/index.vue index 70f72f4..a30dc9f 100644 --- a/pages/receive/index.vue +++ b/pages/receive/index.vue @@ -3,7 +3,7 @@ - @@ -26,7 +26,7 @@ 单据编号 - {{item.sourceOrderNo}} + {{item.orderNo}} @@ -41,6 +41,12 @@ {{item.companyName}} + + + 订单类型 + {{ orderTypeObj[item.orderType] }} + + @@ -131,10 +137,18 @@ import { nextTick } from "vue"; bgSpecificationsList:[], loadStatus: 'loadmore', detailIds:[], + orderTypeList:[], + orderTypeObj:{}, } }, onLoad() { this.loadList(); + this.$u.api.orderTypeDict().then(res=>{ + // console.log(res.data); + res.data.forEach(item=>{ + this.orderTypeObj[item.dictValue] = item.dictLabel + }) + }) }, //上拉刷新(当数据距离底部100时触发，距离在pages.json配置) onReachBottom() { diff --git a/pages/receive/receiveHomeWork/receiveHomeWork.vue b/pages/receive/receiveHomeWork/receiveHomeWork.vue index 1925ba3..cb84405 100644 --- a/pages/receive/receiveHomeWork/receiveHomeWork.vue +++ b/pages/receive/receiveHomeWork/receiveHomeWork.vue @@ -423,10 +423,10 @@ }).then((res) => { if (res.code === 200) { this.$u.toast('收货成功！'); - this.$u.route({ - url: 'pages/receive/index', - type: 'navigateTo' - }) + this.$u.route({ + url: 'pages/receive/index', + type: 'navigateBack' + }) } else { this.$u.toast(res.msg); } diff --git a/pages/receive/receiveHomeWorks/receiveHomeWork.vue b/pages/receive/receiveHomeWorks/receiveHomeWork.vue index e780881..ee9c63e 100644 --- a/pages/receive/receiveHomeWorks/receiveHomeWork.vue +++ b/pages/receive/receiveHomeWorks/receiveHomeWork.vue @@ -298,7 +298,7 @@ setTimeout(() => { this.$u.route({ url: 'pages/receive/index', - type: 'navigateTo' + type: 'navigateBack' }) }, 500) } else { diff --git a/pages/release/index.vue b/pages/release/index.vue index 19d509e..e120e3a 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -121,8 +121,8 @@ let dataArry = res.rows; for (var i = 0; i < dataArry.length; i++) { var obj = { - value: dataArry[i].pointNo, - label: dataArry[i].pointName, + value: dataArry[i].pointNo , + label: dataArry[i].pointName +'----'+ (dataArry[i].isOccupy=='1'?'占用':(dataArry[i].isOccupy=='2'?'已分配':'未占用')) , }; this.pointList.push(obj); } @@ -160,7 +160,7 @@ methods: { pickUp(){ this.$u.api.release.releasePoint({pointNo:this.dataForm.pointNo}).then(res=>{ - this.$u.toast(res.msg); + this.$u.toast(res.msg+'请确认托盘已取走'); this.dataForm.pointNo = '' }) }, diff --git a/uni_modules/select-lay/components/select-lay/select-lay.vue b/uni_modules/select-lay/components/select-lay/select-lay.vue index 0379570..67bc1af 100644 --- a/uni_modules/select-lay/components/select-lay/select-lay.vue +++ b/uni_modules/select-lay/components/select-lay/select-lay.vue @@ -107,8 +107,9 @@ watch: { //pointNoChild pointNoChild(){ - // console.log(this.pointNoChild); - if(this.pointNoChild === ''){ + if(this.pointNoChild === '' || this.pointNoChild === null || this.pointNoChild == undefined){ + this.changevalue =this.pointNoChild + }else{ this.changevalue =this.pointNoChild } },