|
|
@@ -22,7 +22,7 @@
|
|
|
<van-field v-model.lazy="scanBarcode" label-align="left" placeholder="请扫描商品条码/SKU" label="商品条码:"
|
|
|
class="input-barcode" autocomplete="off" @keydown.enter="_handlerScan(scanBarcode)" />
|
|
|
<van-field v-model.lazy="totalWeight" ref="weightRef" label-align="left" required placeholder="请输入商品重量KG" label="重 量:"
|
|
|
- autocomplete="off" type="number" @click.enter.prevent="endCheck()" >
|
|
|
+ autocomplete="off" type="number" >
|
|
|
<template #button>
|
|
|
<div>KG</div>
|
|
|
</template>
|
|
|
@@ -113,7 +113,6 @@
|
|
|
<reverse-picking ref="reversePickingRef" :warehouse="warehouse" :reversePickingContainerNo="reversePickingContainerNo" @load-data="loadData" @reversePickingReset="reversePickingReset" />
|
|
|
<!-- 耗材-->
|
|
|
<related-materia ref="relatedMateriaRef" @cut-barcode="cutBarcode" />
|
|
|
-
|
|
|
</div>
|
|
|
</template>
|
|
|
<script setup>
|
|
|
@@ -123,7 +122,7 @@ import { useStore } from '@/store/modules/user'
|
|
|
import { closeListener, openListener, scanInit } from '@/utils/keydownListener'
|
|
|
import { getPendingReviewTask, packingReview } from '@/api/check/index'
|
|
|
import { barcodeToUpperCase } from '@/utils/dataType.js'
|
|
|
-import { showConfirmDialog, showNotify } from 'vant'
|
|
|
+import { closeToast, showConfirmDialog, showLoadingToast, showNotify } from 'vant'
|
|
|
import { closeLoading, showLoading } from '@/utils/loading'
|
|
|
import { fluxPrint } from '@/api/picking/index'
|
|
|
import InputBarcode from '@/views/outbound/picking/components/InputBarcode.vue'
|
|
|
@@ -361,9 +360,13 @@ const packingRequests = async (startIndex = 0, lastNumber) => {
|
|
|
totalGrossWeight:Number(totalWeight.value),
|
|
|
groupDetailList,
|
|
|
};
|
|
|
- showLoading()
|
|
|
+ showLoadingToast({
|
|
|
+ duration: 0,
|
|
|
+ forbidClick: true,
|
|
|
+ message: `复核进度:${startIndex+1}/${lastNumber}`,
|
|
|
+ });
|
|
|
const res = await packingReview(data)
|
|
|
- closeLoading()
|
|
|
+ // const res = await getPendingReviewTask(data)
|
|
|
if (res) {
|
|
|
if (res.data == '0000'){
|
|
|
orderMap.value.cancelGroup[item.orderNo] = item.orderNo
|
|
|
@@ -378,11 +381,11 @@ const packingRequests = async (startIndex = 0, lastNumber) => {
|
|
|
errorNumber.value+=1
|
|
|
tips.value=error.message
|
|
|
if(startIndex>0){
|
|
|
- reversePickingRef.value.show(successNumber.value,orderMap.value.cancelGroup.length-successNumber.value,orderMap.value.cancelGroup,orderMap.value.freezeGroup)
|
|
|
+ reversePickingRef.value.show(successNumber.value,lastNumber-successNumber.value,orderMap.value.cancelGroup,orderMap.value.freezeGroup)
|
|
|
}
|
|
|
scanError()
|
|
|
} finally {
|
|
|
- closeLoading()
|
|
|
+ closeToast()
|
|
|
}
|
|
|
}
|
|
|
//更多操作
|
|
|
@@ -606,7 +609,4 @@ window.onRefresh = loadData
|
|
|
.task-table-bin tbody
|
|
|
background: #cde7ff
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
</style>
|