|
@@ -369,13 +369,12 @@
|
|
success: function (ret) {
|
|
success: function (ret) {
|
|
console.log(ret);
|
|
console.log(ret);
|
|
const params = {
|
|
const params = {
|
|
- codeType: ret.scanType == 'QR_CODE' ? 0 : 1,
|
|
|
|
|
|
+ codeType: ret.scanType == 'QR_CODE' ? 0 : 1
|
|
}
|
|
}
|
|
- const billSource = ret.scanType == 'QR_CODE' ? 'qr_code': 'bar_code'
|
|
|
|
// 二维码
|
|
// 二维码
|
|
if(ret.scanType == 'QR_CODE'){
|
|
if(ret.scanType == 'QR_CODE'){
|
|
- const ret = ret.result.split("&")
|
|
|
|
- params.productSn = ret[2] // 产品编码sn
|
|
|
|
|
|
+ const result = ret.result.split("&")
|
|
|
|
+ params.productSn = result[2] // 产品编码sn
|
|
}else{
|
|
}else{
|
|
params.qrCode = ret.result
|
|
params.qrCode = ret.result
|
|
}
|
|
}
|
|
@@ -386,6 +385,7 @@
|
|
getProductfindByScanCode(params).then(res => {
|
|
getProductfindByScanCode(params).then(res => {
|
|
if(res.status == 200 && res.data){
|
|
if(res.status == 200 && res.data){
|
|
if(res.data.currentInven){
|
|
if(res.data.currentInven){
|
|
|
|
+ const billSource = ret.scanType == 'QR_CODE' ? 'qr_code': 'bar_code'
|
|
const params = Object.assign({shelfSn: shelfSn, billSource: billSource},res.data)
|
|
const params = Object.assign({shelfSn: shelfSn, billSource: billSource},res.data)
|
|
_this.$store.state.vuex_tempData = params
|
|
_this.$store.state.vuex_tempData = params
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|