|
|
|
@ -19,8 +19,7 @@ |
|
|
|
<uni-swipe-action ref="swipeAction"> |
|
|
|
<uni-swipe-action-item> |
|
|
|
<view class="uni-flex uni-row " |
|
|
|
style="align-items: center; margin: 10rpx; border-radius: 10rpx ;" |
|
|
|
> |
|
|
|
style="align-items: center; margin: 10rpx; border-radius: 10rpx ;"> |
|
|
|
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" |
|
|
|
@editItem="editItem" :settingParam="jobContent" @remove="updateData" |
|
|
|
@summCount="summCount" @currentCount="currentCount" @updateData="updateData"> |
|
|
|
@ -46,8 +45,7 @@ |
|
|
|
|
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
|
<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true" |
|
|
|
:isShowHistory="false" |
|
|
|
@getCountScanResult='getCountScanResult'> |
|
|
|
:isShowHistory="false" @getCountScanResult='getCountScanResult'> |
|
|
|
</win-scan-pack-and-location> |
|
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" |
|
|
|
@ -201,25 +199,19 @@ |
|
|
|
refreshData(recordList) { |
|
|
|
//记录的数据刷新列表 |
|
|
|
var addList = [] |
|
|
|
|
|
|
|
this.dataList.forEach(mainItem => { |
|
|
|
mainItem.recordList = []; |
|
|
|
recordList.forEach(subItem => { |
|
|
|
let mainItem = this.dataList.find(r => |
|
|
|
r.itemCode == subItem.itemCode && |
|
|
|
r.batch == subItem.batch && |
|
|
|
r.inventoryStatus == subItem.inventoryStatus) |
|
|
|
//主列表存在数据 |
|
|
|
if (mainItem) { |
|
|
|
mainItem.scaned = true; |
|
|
|
if (!mainItem.recordList) { |
|
|
|
mainItem.recordList = [] |
|
|
|
} |
|
|
|
//在主表中，添加到recordList |
|
|
|
if (mainItem.itemCode == subItem.itemCode && |
|
|
|
mainItem.batch == subItem.batch && |
|
|
|
mainItem.inventoryStatus == subItem.inventoryStatus) |
|
|
|
{ |
|
|
|
mainItem.recordList.push(subItem) |
|
|
|
}else { |
|
|
|
//主列表不存在数据，添加到主列表 |
|
|
|
//不在主表中，添加主表明细 |
|
|
|
var detail = this.createBackAddDetailInfo(subItem) |
|
|
|
|
|
|
|
if (!detail.recordList) { |
|
|
|
detail.recordList = [] |
|
|
|
} |
|
|
|
var recordItem = { |
|
|
|
scaned: true, |
|
|
|
isNewJobDetail: "true", |
|
|
|
@ -240,17 +232,19 @@ |
|
|
|
balanceQty: subItem.balanceQty, |
|
|
|
locationCode: subItem.locationCode |
|
|
|
} |
|
|
|
detail.recordList=[]; |
|
|
|
detail.recordList.push(recordItem) |
|
|
|
addList.push(detail) |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
if (addList.length > 0) { |
|
|
|
this.dataList = this.dataList.concat(addList) |
|
|
|
} |
|
|
|
|
|
|
|
this.updateList(false); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -313,7 +307,9 @@ |
|
|
|
var pack = result.package |
|
|
|
var batch = result.label.batch |
|
|
|
var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK" |
|
|
|
var qty = result.balance ? result.balance.qty : result.label.qty; |
|
|
|
var qty = result.balance ? result.balance.qty : 0; |
|
|
|
var handleQty =qty!=0?qty:result.label.qty |
|
|
|
|
|
|
|
var uom = pack.uom |
|
|
|
var locationCode = this.locationCode |
|
|
|
this.managementType = managementPrecision; |
|
|
|
@ -331,7 +327,7 @@ |
|
|
|
toBatch: batch, |
|
|
|
inventoryStatus: inventoryStatus, |
|
|
|
qty: qty, |
|
|
|
handleQty: qty, |
|
|
|
handleQty: handleQty, |
|
|
|
uom: uom, |
|
|
|
packUnit: pack.packUnit, |
|
|
|
packQty: pack.packQty, |
|
|
|
|
