|
|
@ -1,6 +1,6 @@ |
|
|
<template> |
|
|
<template> |
|
|
<view> |
|
|
<view> |
|
|
<uni-popup ref="popup" @change="change" :mask-click="false"> |
|
|
<uni-popup ref="popup" @change="change" :mask-click="false" > |
|
|
<view class="popup_box"> |
|
|
<view class="popup_box"> |
|
|
<view class="pop_title uni-flex space-between"> |
|
|
<view class="pop_title uni-flex space-between"> |
|
|
<view class="" style="font-size: 35rpx;"> |
|
|
<view class="" style="font-size: 35rpx;"> |
|
|
@ -28,7 +28,7 @@ |
|
|
|
|
|
|
|
|
<view v-if='allowModifyLocation'> |
|
|
<view v-if='allowModifyLocation'> |
|
|
<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位" |
|
|
<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位" |
|
|
@confirm="" style='height: 30rpx;border:1px solid #fff ;'></uni-combox> |
|
|
@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox> |
|
|
</view> |
|
|
</view> |
|
|
<view v-else> |
|
|
<view v-else> |
|
|
<text style="padding: 5px"> |
|
|
<text style="padding: 5px"> |
|
|
@ -46,6 +46,10 @@ |
|
|
</view> |
|
|
</view> |
|
|
</uni-popup> |
|
|
</uni-popup> |
|
|
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select> |
|
|
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select> |
|
|
|
|
|
<!-- 模拟扫描功能 --> |
|
|
|
|
|
<win-com-scan v-show="false" ref="comscansimulate" @getResult="getScanResult" :headerType="headerType" |
|
|
|
|
|
:isShowHistory="false" :clearResult="true"></win-com-scan> |
|
|
|
|
|
|
|
|
</view> |
|
|
</view> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
</template> |
|
|
</template> |
|
|
@ -54,7 +58,7 @@ |
|
|
import winComScan from '@/mycomponents/scan/winComScan.vue' |
|
|
import winComScan from '@/mycomponents/scan/winComScan.vue' |
|
|
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' |
|
|
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' |
|
|
import { |
|
|
import { |
|
|
getBalanceByManagementPrecision, |
|
|
getBalanceByManagementPrecisionByPacking, |
|
|
} from '@/common/balance.js'; |
|
|
} from '@/common/balance.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
@ -70,7 +74,7 @@ |
|
|
} from '@/common/directory.js'; |
|
|
} from '@/common/directory.js'; |
|
|
export default { |
|
|
export default { |
|
|
name: 'winScanPack', |
|
|
name: 'winScanPack', |
|
|
emits: ["getResult", "close", "getCountScanResult"], |
|
|
emits: ["getResult", "close", "getCountScanResult", "confirm"], |
|
|
components: { |
|
|
components: { |
|
|
winComScan, |
|
|
winComScan, |
|
|
balanceSelect |
|
|
balanceSelect |
|
|
@ -106,7 +110,7 @@ |
|
|
type: Boolean, |
|
|
type: Boolean, |
|
|
default: true |
|
|
default: true |
|
|
}, |
|
|
}, |
|
|
balanceFromInventoryStatuses:{//是否传fromInventoryStatuses |
|
|
balanceFromInventoryStatuses: { //是否传fromInventoryStatuses |
|
|
type: Boolean, |
|
|
type: Boolean, |
|
|
default: true |
|
|
default: true |
|
|
} |
|
|
} |
|
|
@ -128,15 +132,20 @@ |
|
|
inventoryStatus: [], |
|
|
inventoryStatus: [], |
|
|
managementPrecision: '', |
|
|
managementPrecision: '', |
|
|
fromInventoryStatuses: "", |
|
|
fromInventoryStatuses: "", |
|
|
isCheck: false |
|
|
isCheck: false, |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
created() { |
|
|
created() { |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
|
|
|
|
|
|
handleConfirm() { |
|
|
|
|
|
this.$emit('confirm', this.fromLocationCode) |
|
|
|
|
|
}, |
|
|
//直接扫描 |
|
|
//直接扫描 |
|
|
openScanPopupForType(fromLocationCode, businessType) { |
|
|
openScanPopupForType(fromLocationCode, businessType) { |
|
|
|
|
|
|
|
|
this.businessType = businessType; |
|
|
this.businessType = businessType; |
|
|
this.fromLocationCode = fromLocationCode; |
|
|
this.fromLocationCode = fromLocationCode; |
|
|
if (fromLocationCode != '') { |
|
|
if (fromLocationCode != '') { |
|
|
@ -147,9 +156,11 @@ |
|
|
this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) |
|
|
this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) |
|
|
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 |
|
|
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 |
|
|
this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区 |
|
|
this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区 |
|
|
setTimeout(res => { |
|
|
if (!this.show) { |
|
|
this.$refs.popup.open('bottom') |
|
|
setTimeout(res => { |
|
|
}, 500) |
|
|
this.$refs.popup.open('bottom') |
|
|
|
|
|
}, 500) |
|
|
|
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//在任务中扫描 |
|
|
//在任务中扫描 |
|
|
@ -172,6 +183,38 @@ |
|
|
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 |
|
|
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 |
|
|
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 |
|
|
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 |
|
|
}, |
|
|
}, |
|
|
|
|
|
//模拟扫描 |
|
|
|
|
|
openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, item) { |
|
|
|
|
|
this.fromLocationCode = fromLocationCode; |
|
|
|
|
|
this.fromLocationList = fromLocationList; |
|
|
|
|
|
if (fromLocationCode != '') { |
|
|
|
|
|
// this.packGetFocus(); |
|
|
|
|
|
if (this.$refs.comscansimulate != undefined) { |
|
|
|
|
|
this.$refs.comscansimulate.getfocus(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
if (this.fromLocationList.length == 0) { |
|
|
|
|
|
// this.locationGetFocus(); |
|
|
|
|
|
alert('没有来源库位：List') |
|
|
|
|
|
} else { |
|
|
|
|
|
this.fromLocationCode = this.fromLocationList[0]; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) |
|
|
|
|
|
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 |
|
|
|
|
|
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 |
|
|
|
|
|
let timer = setTimeout(res => { |
|
|
|
|
|
if (timer) { |
|
|
|
|
|
clearTimeout(timer) |
|
|
|
|
|
} |
|
|
|
|
|
this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) |
|
|
|
|
|
this.$refs.comscansimulate.clickScanMsg(); |
|
|
|
|
|
}, 500) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
closeScanPopup(content) { |
|
|
closeScanPopup(content) { |
|
|
this.$refs.popup.close(); |
|
|
this.$refs.popup.close(); |
|
|
@ -202,9 +245,12 @@ |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
getBasicLocationByCode(this.fromLocationCode).then(res => { |
|
|
getBasicLocationByCode(this.fromLocationCode).then(res => { |
|
|
uni.hideLoading(); |
|
|
|
|
|
if (res.data.total > 0) { |
|
|
if (res.data.total > 0) { |
|
|
let result = res.data.list[0]; |
|
|
let result = res.data.list[0]; |
|
|
|
|
|
if(result.code!=this.fromLocationCode){ |
|
|
|
|
|
this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']') |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
var type = result.areaType; |
|
|
var type = result.areaType; |
|
|
var available = result.available; |
|
|
var available = result.available; |
|
|
if (available == "TRUE") { |
|
|
if (available == "TRUE") { |
|
|
@ -213,11 +259,13 @@ |
|
|
// this.packGetFocus(); |
|
|
// this.packGetFocus(); |
|
|
this.checkPackage(scanResult); |
|
|
this.checkPackage(scanResult); |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
uni.hideLoading(); |
|
|
var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList); |
|
|
var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList); |
|
|
this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]是[" + |
|
|
this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]是[" + |
|
|
getLocationAreaTypeName(result.areaType) + "],需要的库区是[" + hint + "]") |
|
|
getLocationAreaTypeName(result.areaType) + "],需要的库区是[" + hint + "]") |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
uni.hideLoading(); |
|
|
this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => { |
|
|
this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => { |
|
|
this.locationGetFocus(); |
|
|
this.locationGetFocus(); |
|
|
}) |
|
|
}) |
|
|
@ -260,7 +308,8 @@ |
|
|
// mask: true |
|
|
// mask: true |
|
|
// }) |
|
|
// }) |
|
|
// 采购上架任务--大哥让去掉 fromInventoryStatuses |
|
|
// 采购上架任务--大哥让去掉 fromInventoryStatuses |
|
|
getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined, |
|
|
getBalanceByManagementPrecisionByPacking(result.label,result.package, this.fromLocationCode, this |
|
|
|
|
|
.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined, |
|
|
res => { |
|
|
res => { |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
if (res.success) { |
|
|
if (res.success) { |
|
|
@ -274,6 +323,7 @@ |
|
|
// uni.hideLoading(); |
|
|
// uni.hideLoading(); |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
uni.hideLoading(); |
|
|
this.packCallBack(null); |
|
|
this.packCallBack(null); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -284,9 +334,9 @@ |
|
|
if (this.allowNullBalance) { |
|
|
if (this.allowNullBalance) { |
|
|
this.allowNoneBalance(datas); |
|
|
this.allowNoneBalance(datas); |
|
|
} else if (this.noShowBalanceMessage) { |
|
|
} else if (this.noShowBalanceMessage) { |
|
|
if(Array.isArray(datas)){ |
|
|
if (Array.isArray(datas)) { |
|
|
this.countCallBack(datas[0]); |
|
|
this.countCallBack(datas[0]); |
|
|
}else{ |
|
|
} else { |
|
|
this.countCallBack(datas); |
|
|
this.countCallBack(datas); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
@ -350,7 +400,9 @@ |
|
|
|
|
|
|
|
|
//盘点回调 |
|
|
//盘点回调 |
|
|
countCallBack(datas) { |
|
|
countCallBack(datas) { |
|
|
this.$refs.comscan.clear(); |
|
|
if (this.$refs.comscan) { |
|
|
|
|
|
this.$refs.comscan.clear(); |
|
|
|
|
|
} |
|
|
//返回标签信息、库存信息和管理模式 |
|
|
//返回标签信息、库存信息和管理模式 |
|
|
let data = { |
|
|
let data = { |
|
|
label: this.scanResult.label, |
|
|
label: this.scanResult.label, |
|
|
@ -364,7 +416,9 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
packCallBack(item) { |
|
|
packCallBack(item) { |
|
|
this.$refs.comscan.clear(); |
|
|
if (this.$refs.comscan) { |
|
|
|
|
|
this.$refs.comscan.clear(); |
|
|
|
|
|
} |
|
|
//返回标签信息、库存信息和管理模式 |
|
|
//返回标签信息、库存信息和管理模式 |
|
|
let data = { |
|
|
let data = { |
|
|
label: this.scanResult.label, |
|
|
label: this.scanResult.label, |
|
|
|
