|
|
@@ -223,7 +223,7 @@
|
|
|
<input type="number" id="amountInput" @keypress="amountPress($event)"
|
|
|
name="count" class="form-control input" value="@if(old('count')){{old('count')}}@endif" autocomplete="off">
|
|
|
</span>
|
|
|
- <span type="button" class="btn btn-sm btn-outline-danger col-md-2 form-group ml-4" v-if="location" style="max-width: 160px" @click="stockInventoryByLocation()">盘点该库位下所有记录</span>
|
|
|
+ <span class="btn btn-sm btn-outline-danger ml-4" v-if="inputs().location" style="max-width: 160px" @click="stockInventoryByLocation()">盘点该库位下所有记录</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--相同库位和条码 pc端-->
|
|
|
@@ -784,17 +784,15 @@
|
|
|
methods:{
|
|
|
outToULine(){
|
|
|
this.ideLocArr=this.unique(this.ideLocArr);
|
|
|
- console.log(this.ideLocArr)
|
|
|
$("#change-outOnLineAmount").modal('show');
|
|
|
},
|
|
|
- //TODO 更具输入数量 截取库位 出库
|
|
|
+ //根据输入数量 截取库位 出库
|
|
|
outToULineEnsure(){
|
|
|
let _this=this;
|
|
|
let error = {};
|
|
|
if (_this.outOnLineAmount>_this.ideLocArr.length)error.outOnLineAmount = ["出库料箱数大于当前任务料想总数"];
|
|
|
if (JSON.stringify(error)!=='{}'){this.errors = error;return;}
|
|
|
if(!confirm('确定要将当前盘点任务涉及的IDE料箱号出至输送线吗？')){return;}
|
|
|
- console.log(_this.ideLocArr)
|
|
|
let selectedArr = _this.ideLocArr.slice(0,_this.outOnLineAmount);
|
|
|
_this.materialBoxCodes='';
|
|
|
selectedArr.forEach(function (item){
|
|
|
@@ -825,7 +823,6 @@
|
|
|
})
|
|
|
},
|
|
|
dispatchHaiq(text){
|
|
|
- console.log(text)
|
|
|
axios.post('{{url('/api/thirdPart/haiq/storage/takeOutToULine')}}',{codes:text})
|
|
|
.then(function(response){
|
|
|
tempTip.okWindow(response.data.result,'确定')
|
|
|
@@ -965,6 +962,7 @@
|
|
|
this.提交部分输入();
|
|
|
if(!this.addInventoryMission){
|
|
|
this.location=this.inputs().location ;
|
|
|
+ this.$forceUpdate()
|
|
|
}
|
|
|
},
|
|
|
提交部分输入:_.throttle(function(){
|
|
|
@@ -1074,6 +1072,7 @@
|
|
|
_this.库位索引_记录[库位].forEach(function(inventoryMission){
|
|
|
if (inventoryMission.location===库位){
|
|
|
$appointInventoryList.push(inventoryMission);
|
|
|
+ if ((!inventoryMission.verified_amount ||inventoryMission.verified_amount==0))$appointInventoryList.unshift(inventoryMission);
|
|
|
$appointInventoryList=_this.unique($appointInventoryList);
|
|
|
}
|
|
|
});
|
|
|
@@ -1175,6 +1174,7 @@
|
|
|
let 库位=_this.inputs().location.trim();
|
|
|
let 盘点数=_this.inputs().amount.trim();
|
|
|
let 选定盘点记录id=_this.selectingId;
|
|
|
+ let isInventory=false;
|
|
|
$appointInventoryList.forEach(function (inventoryMission) {
|
|
|
if (inventoryMission.location === 库位) {
|
|
|
if (inventoryMission.stockInventoryPersons.length > 0 && inventoryMission.id === _this.selectingId) {
|
|
|
@@ -1182,13 +1182,16 @@
|
|
|
_this.stockInventoryPersons = inventoryMission.stockInventoryPersons;
|
|
|
if (_this.inventory.status !== '复盘中'){
|
|
|
$("#lastStockInventoryRecord").modal('show');
|
|
|
+ isInventory=true;
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- _this.盘点(选定盘点记录id,库位,条码,_this.inventory.id,盘点数);
|
|
|
- _this.清空指定盘点记录列();
|
|
|
}
|
|
|
});
|
|
|
+ if (!isInventory){
|
|
|
+ _this.盘点(选定盘点记录id,库位,条码,_this.inventory.id,盘点数);
|
|
|
+ _this.清空指定盘点记录列();
|
|
|
+ }
|
|
|
},100,{ 'trailing': false }),
|
|
|
//结束初盘任务
|
|
|
stockInventoryEnd(id) {
|
haozi