|
@ -102,6 +102,9 @@ |
|
|
import { |
|
|
import { |
|
|
productDismantleJobClose |
|
|
productDismantleJobClose |
|
|
} from '@/api/request2.js'; |
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
import { |
|
|
|
|
|
nextTick |
|
|
|
|
|
} from 'vue'; |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
name: 'receipt_detail', |
|
|
name: 'receipt_detail', |
|
@ -137,7 +140,7 @@ |
|
|
|
|
|
|
|
|
onLoad(option) { |
|
|
onLoad(option) { |
|
|
this.id = option.id; |
|
|
this.id = option.id; |
|
|
// this.scanedPackingNumber = option.scaned || ''; |
|
|
this.scanedPackingNumber = option.scaned || ''; |
|
|
this.operation = option.operation; |
|
|
this.operation = option.operation; |
|
|
if (this.id != undefined) { |
|
|
if (this.id != undefined) { |
|
|
//新建的任务自动接收 |
|
|
//新建的任务自动接收 |
|
@ -219,13 +222,19 @@ |
|
|
that.jobStatus = res.data.status |
|
|
that.jobStatus = res.data.status |
|
|
that.jobToLocationCode = that.subList[0].toLocationCode |
|
|
that.jobToLocationCode = that.subList[0].toLocationCode |
|
|
that.detailSource = getTreeDataSource(that.subList) |
|
|
that.detailSource = getTreeDataSource(that.subList) |
|
|
|
|
|
that.isAllReceived = false; |
|
|
|
|
|
nextTick(() => { |
|
|
that.detailSource.forEach(r => { |
|
|
that.detailSource.forEach(r => { |
|
|
r.subList.forEach(s => { |
|
|
r.subList.forEach(s => { |
|
|
if (this.scanedPackingNumber && this.scanedPackingNumber == s |
|
|
if (this.scanedPackingNumber && this |
|
|
.packingNumber) s.scaned = true |
|
|
.scanedPackingNumber == s |
|
|
|
|
|
.packingNumber) { |
|
|
|
|
|
s.scaned = true |
|
|
|
|
|
this.$refs.scanPopup.simulateScan(s); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
that.isAllReceived = false; |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
that.showMessage('列表数据为0'); |
|
|
that.showMessage('列表数据为0'); |
|
|
} |
|
|
} |
|
@ -481,19 +490,26 @@ |
|
|
pageSize: 1000, |
|
|
pageSize: 1000, |
|
|
}).then(res1 => { |
|
|
}).then(res1 => { |
|
|
timerCount = timerCount + 1 |
|
|
timerCount = timerCount + 1 |
|
|
if(res1.data && res1.data.list&&res1.data.list.length&&(res1.data.total >= res.data.detailCount)){ |
|
|
if (res1.data && res1.data.list && res1.data |
|
|
|
|
|
.list.length && (res1.data.total >= res |
|
|
|
|
|
.data.detailCount)) { |
|
|
uni.hideLoading() |
|
|
uni.hideLoading() |
|
|
clearInterval(timer1) |
|
|
clearInterval(timer1) |
|
|
const dataParams = { |
|
|
const dataParams = { |
|
|
toLocationCode: res1.data.list[0].toLocationCode, |
|
|
toLocationCode: res1.data.list[0] |
|
|
|
|
|
.toLocationCode, |
|
|
number: res1.data.list[0].number, |
|
|
number: res1.data.list[0].number, |
|
|
creator: res1.data.list[0].creator, |
|
|
creator: res1.data.list[0].creator, |
|
|
createTime: res1.data.list[0].createTime, |
|
|
createTime: res1.data.list[0] |
|
|
ids : res1.data.list.map(item=>item.masterId).join(',') |
|
|
.createTime, |
|
|
|
|
|
ids: res1.data.list.map(item => |
|
|
|
|
|
item.masterId).join(',') |
|
|
} |
|
|
} |
|
|
console.log(dataParams) |
|
|
console.log(dataParams) |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url:'/pages/pointPutawayJob/index?data='+encodeURIComponent(JSON.stringify(dataParams)) |
|
|
url: '/pages/pointPutawayJob/index?data=' + |
|
|
|
|
|
encodeURIComponent(JSON |
|
|
|
|
|
.stringify(dataParams)) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|