|
|
@ -34,7 +34,7 @@ |
|
|
<uni-swipe-action-item @click="swipeClick($event, item)" :right-options="item.scaned ? scanOptions : detailOptions"> |
|
|
<uni-swipe-action-item @click="swipeClick($event, item)" :right-options="item.scaned ? scanOptions : detailOptions"> |
|
|
<view class="uni-flex uni-row" style="align-items: center" :class="item.scaned ? 'scan_view' : 'item'"> |
|
|
<view class="uni-flex uni-row" style="align-items: center" :class="item.scaned ? 'scan_view' : 'item'"> |
|
|
<view class="" style="font-size: 30rpx; font-weight: bold"> {{ index + 1 }}. </view> |
|
|
<view class="" style="font-size: 30rpx; font-weight: bold"> {{ index + 1 }}. </view> |
|
|
<comCountDetailcards :ref="'countDetail_' + index" :dataContent="item" :index="index" @editItem="editItem" :settingParam="jobContent" @remove="updateData" @updateData="updateData"> </comCountDetailcards> |
|
|
<comCountDetailcards :ref="'countDetail_' + index" :dataContent="item" :index="index" @editItem="editItem" :settingParam="jobContent" @remove="updateData" :isShowRecommendQty="false" @updateData="updateData"> </comCountDetailcards> |
|
|
</view> |
|
|
</view> |
|
|
<view class="split_line"></view> |
|
|
<view class="split_line"></view> |
|
|
</uni-swipe-action-item> |
|
|
</uni-swipe-action-item> |
|
|
@ -54,7 +54,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<win-scan-button @goScan="openScanPopup"></win-scan-button> |
|
|
<win-scan-button @goScan="openScanPopup"></win-scan-button> |
|
|
<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="false" @getResult="getScanResult"> </win-scan-pack-and-location> |
|
|
<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true" @getResult="getScanResult"> </win-scan-pack-and-location> |
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit> |
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit> |
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
@ -207,15 +207,15 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
that.jobContent = res.data |
|
|
that.jobContent = res.data |
|
|
that.jobStatus = res.data.status |
|
|
that.jobStatus = res.data.status |
|
|
that.fromLocationCode = that.jobContent.locationCode |
|
|
that.fromLocationCode = that.jobContent.countSplitCode |
|
|
// res.data.subList.forEach(item => { |
|
|
res.data.subList.forEach((item) => { |
|
|
// item.recommendQty = item.qty |
|
|
item.recommendQty = item.qty |
|
|
// item.handleQty = 0 |
|
|
item.handleQty = 0 |
|
|
// item.countTime = new Date() |
|
|
item.countTime = new Date() |
|
|
// item.fromLocationCode =that.fromLocationCode; |
|
|
item.fromLocationCode = that.fromLocationCode |
|
|
// }) |
|
|
}) |
|
|
// that.allDetails = res.data.subList; |
|
|
that.allDetails = res.data.subList |
|
|
// that.allCount = res.data.subList.length; |
|
|
that.allCount = res.data.subList.length |
|
|
that.initList() |
|
|
that.initList() |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -297,18 +297,25 @@ export default { |
|
|
const { packingNumber } = result.label |
|
|
const { packingNumber } = result.label |
|
|
const pack = result.package |
|
|
const pack = result.package |
|
|
const { batch } = result.label |
|
|
const { batch } = result.label |
|
|
const inventoryStatus = 'OK' |
|
|
const inventoryStatus = result.balance ? result.balance.inventoryStatus : 'OK' |
|
|
const qty = result.label.qty ? result.label.qty : 0 |
|
|
const qty = result.balance ? result.balance.qty : 0 |
|
|
|
|
|
|
|
|
// 按物料、箱码、批次、状态匹配 |
|
|
// 按物料、箱码、批次、状态匹配 |
|
|
const items = this.allDetails.filter((r) => r.itemCode === itemCode && r.packingNumber === packingNumber && r.batch === batch && r.inventoryStatus === inventoryStatus) |
|
|
const items = this.allDetails.filter((r) => r.itemCode === itemCode && r.packingNumber === packingNumber && r.batch === batch && r.inventoryStatus === inventoryStatus) |
|
|
// 不在任务列表中,是否添加库存 |
|
|
// 不在任务列表中,是否添加库存 |
|
|
if (items.length == 0) { |
|
|
if (items.length == 0) { |
|
|
const detail = this.createAddDetailInfo(pack, qty) |
|
|
this.$refs.comMessage.showQuestionMessage(`包装【${result.label.packingNumber}】不在任务列表中,是否要添加到列表中?`, (res) => { |
|
|
detail.countTime = new Date() |
|
|
// 创建盘点信息，标记为已经扫描 |
|
|
this.allDetails.push(detail) |
|
|
if (res) { |
|
|
this.updateList() |
|
|
const detail = this.createAddDetailInfo(pack, qty) |
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, null) |
|
|
detail.countTime = new Date() |
|
|
|
|
|
this.allDetails.push(detail) |
|
|
|
|
|
this.updateList() |
|
|
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, null) |
|
|
|
|
|
} else { |
|
|
|
|
|
this.scanPopupGetFocus() |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
const selectItem = items[0] |
|
|
const selectItem = items[0] |
|
|
// 已经扫描 |
|
|
// 已经扫描 |
|
|
@ -324,7 +331,7 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
// 未扫描，赋值 |
|
|
// 未扫描，赋值 |
|
|
selectItem.scaned = true |
|
|
selectItem.scaned = true |
|
|
selectItem.recommendQty = Number(qty) |
|
|
selectItem.balanceQty = Number(qty) |
|
|
selectItem.handleQty = Number(qty) |
|
|
selectItem.handleQty = Number(qty) |
|
|
selectItem.packQty = pack.packQty |
|
|
selectItem.packQty = pack.packQty |
|
|
selectItem.packUnit = pack.packUnit |
|
|
selectItem.packUnit = pack.packUnit |
|
|
@ -372,7 +379,7 @@ export default { |
|
|
// 创建盘盈的明细 |
|
|
// 创建盘盈的明细 |
|
|
createAddDetailInfo(pack, qty) { |
|
|
createAddDetailInfo(pack, qty) { |
|
|
const detail = { |
|
|
const detail = { |
|
|
id: this.jobContent.masterId, // 新增的明细 |
|
|
masterId: this.jobContent.id, // 新增的明细 |
|
|
scaned: true, |
|
|
scaned: true, |
|
|
countDetailNumber: '', |
|
|
countDetailNumber: '', |
|
|
ownerCode: '', |
|
|
ownerCode: '', |
|
|
@ -396,6 +403,7 @@ export default { |
|
|
countQty: 0, |
|
|
countQty: 0, |
|
|
balanceQty: 0, |
|
|
balanceQty: 0, |
|
|
fromLocationCode: this.fromLocationCode, |
|
|
fromLocationCode: this.fromLocationCode, |
|
|
|
|
|
locationCode: this.fromLocationCode, |
|
|
creator: this.$store.state.user.id, |
|
|
creator: this.$store.state.user.id, |
|
|
countTime: new Date() |
|
|
countTime: new Date() |
|
|
} |
|
|
} |
|
|
@ -538,6 +546,7 @@ page { |
|
|
/* #ifdef H5 */ |
|
|
/* #ifdef H5 */ |
|
|
top: 88rpx; |
|
|
top: 88rpx; |
|
|
/* #endif */ |
|
|
/* #endif */ |
|
|
|
|
|
|
|
|
left: 0; |
|
|
left: 0; |
|
|
width: 100%; |
|
|
width: 100%; |
|
|
background-color: #fff; |
|
|
background-color: #fff; |
|
|
|
