|
@ -26,7 +26,7 @@ |
|
|
<view class=""> |
|
|
<view class=""> |
|
|
</view> |
|
|
</view> |
|
|
<view class=" uni-flex uni-row"> |
|
|
<view class=" uni-flex uni-row"> |
|
|
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> |
|
|
<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
@ -51,7 +51,8 @@ |
|
|
import { |
|
|
import { |
|
|
goHome, |
|
|
goHome, |
|
|
updateTitle, |
|
|
updateTitle, |
|
|
getCurrDateTime |
|
|
getCurrDateTime, |
|
|
|
|
|
getPackingNumberAndBatch |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
@ -322,7 +323,9 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
closeScanPopup() { |
|
|
closeScanPopup() { |
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
if(this.$refs.scanPopup!=undefined){ |
|
|
|
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
|
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
scanPopupGetFocus() { |
|
|
scanPopupGetFocus() { |
|
@ -331,11 +334,6 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
scanLocationCode(location, code) { |
|
|
|
|
|
this.toLocationCode = code |
|
|
|
|
|
this.toLocationCode = location; |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
submit() { |
|
|
submit() { |
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "提交中....", |
|
|
title: "提交中....", |
|
@ -390,6 +388,7 @@ |
|
|
fromLocation.Batchs.forEach(batch => { |
|
|
fromLocation.Batchs.forEach(batch => { |
|
|
let subItem = batch.detail; |
|
|
let subItem = batch.detail; |
|
|
subItem.recordList = []; |
|
|
subItem.recordList = []; |
|
|
|
|
|
|
|
|
if (batch.Records.length > 0) { |
|
|
if (batch.Records.length > 0) { |
|
|
batch.Records.forEach(r => { |
|
|
batch.Records.forEach(r => { |
|
|
let record = {}; |
|
|
let record = {}; |
|
@ -410,14 +409,15 @@ |
|
|
record.fromLocationCode = fromLocation.fromLocationCode |
|
|
record.fromLocationCode = fromLocation.fromLocationCode |
|
|
record.supplierCode = r.supplierCode; |
|
|
record.supplierCode = r.supplierCode; |
|
|
|
|
|
|
|
|
var info = getPackingNumberAndBatch( |
|
|
//使用在途库不改变管理模式 |
|
|
this.managementList, r |
|
|
var info = getPackingNumberAndBatch( |
|
|
.itemCode, |
|
|
this.managementList, r |
|
|
r.packingNumber, r |
|
|
.itemCode, |
|
|
.batch); |
|
|
r.packingNumber, r |
|
|
record.toPackingNumber = info |
|
|
.batch); |
|
|
.packingNumber; |
|
|
record.toPackingNumber = info |
|
|
record.toBatch = info.batch; |
|
|
.packingNumber; |
|
|
|
|
|
record.toBatch = info.batch; |
|
|
subItem.recordList.push(record); |
|
|
subItem.recordList.push(record); |
|
|
}) |
|
|
}) |
|
|
subList.push(subItem); |
|
|
subList.push(subItem); |
|
|