Commit 88b48449 by wusiyi

fix: 修复配货分拣扫码切换配货区且配货完成后弹窗提示bug

parent 3938c266
...@@ -216,8 +216,6 @@ ...@@ -216,8 +216,6 @@
>,不占用播种墙 >,不占用播种墙
</div> </div>
<div class="box-top-item-status"> <div class="box-top-item-status">
{{ isAutoPrint }}
{{ podOrderDetailsData?.printResult }}
<span <span
v-if=" v-if="
isAutoPrint && isAutoPrint &&
...@@ -750,7 +748,6 @@ const renderItemBox = (bool: boolean) => { ...@@ -750,7 +748,6 @@ const renderItemBox = (bool: boolean) => {
data.printResult === 'printSuccess' data.printResult === 'printSuccess'
) { ) {
submitInspection(() => { submitInspection(() => {
getPackingData(currentCode)
renderLock = false renderLock = false
}) })
return return
...@@ -948,7 +945,7 @@ const getPackingData = async (code: string) => { ...@@ -948,7 +945,7 @@ const getPackingData = async (code: string) => {
(!!area && warehouseId.value != area.warehouseId) (!!area && warehouseId.value != area.warehouseId)
syncSortingArea(packingId as number, respFactoryNo ?? factoryNo) syncSortingArea(packingId as number, respFactoryNo ?? factoryNo)
if (areaChanged) { if (areaChanged) {
await initOrderDetailBox() await initOrderDetailBox('scan')
} }
} }
...@@ -1027,7 +1024,7 @@ const submitInspection = async (callback: () => void) => { ...@@ -1027,7 +1024,7 @@ const submitInspection = async (callback: () => void) => {
warehouseId.value, warehouseId.value,
sortingAreaId.value, sortingAreaId.value,
) )
if (res.code !== 200) return // if (res.code !== 200) return
ElMessage.warning(res.message) ElMessage.warning(res.message)
isLock.value = false isLock.value = false
coverImage.value = '' coverImage.value = ''
...@@ -1043,7 +1040,7 @@ const submitInspection = async (callback: () => void) => { ...@@ -1043,7 +1040,7 @@ const submitInspection = async (callback: () => void) => {
} }
} }
const isBillLading = ref<boolean>(false) const isBillLading = ref<boolean>(false)
const initOrderDetailBox = async () => { const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
const factoryNo = userStore.user?.factory.id const factoryNo = userStore.user?.factory.id
if (!factoryNo) { if (!factoryNo) {
return return
...@@ -1131,8 +1128,10 @@ const initOrderDetailBox = async () => { ...@@ -1131,8 +1128,10 @@ const initOrderDetailBox = async () => {
const pickFinished = boxList.filter((item) => { const pickFinished = boxList.filter((item) => {
return item.data?.productList?.every((product) => product.power) return item.data?.productList?.every((product) => product.power)
}) })
// 配货分拣 扫码切换配货区且配货完成 不提示
const boxs = pickFinished.map((item) => item.box) const boxs = pickFinished.map((item) => item.box)
if (boxs.length > 0) { if (type === 'manual' && boxs.length > 0) {
if (props.wallType === 'sort' && !isAutoPrint.value) { if (props.wallType === 'sort' && !isAutoPrint.value) {
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment