diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 7a2da014..9101cf00 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -297,6 +297,7 @@ export default {
// this.closeScanPopup()
},
closeScanPopup() {
+ this.losefocus();
this.$refs.popup.close()
},
getfocus() {
diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue
index 629888bc..bd92ec30 100644
--- a/src/mycomponents/scan/winComScanBalanceLocation.vue
+++ b/src/mycomponents/scan/winComScanBalanceLocation.vue
@@ -239,6 +239,7 @@ export default {
// this.closeScanPopup()
},
closeScanPopup() {
+ this.packLoseFocus()
this.$refs.popup.close()
this.$emit('onCloseScanPopup')
},
diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue
index 7e0a08c1..624ebbde 100644
--- a/src/mycomponents/scan/winScanAsnNumber.vue
+++ b/src/mycomponents/scan/winScanAsnNumber.vue
@@ -44,6 +44,9 @@ const openScanPopup = () => {
}, 500)
}
const closeScanPopup = () => {
+ if(scan.value){
+ scan.value.losefocus()
+ }
isShow.value = false
}
const getfocus = () => {
diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue
index fdbbfe53..1f44f83a 100644
--- a/src/mycomponents/scan/winScanContainer.vue
+++ b/src/mycomponents/scan/winScanContainer.vue
@@ -44,6 +44,7 @@ const openScanPopup = () => {
}, 500)
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
}
const scanClick = () => {
@@ -81,10 +82,14 @@ const callBack = () => {
emit('getContainer', containerInfo.value)
}
const getfocus = () => {
- scan.value.getfocus()
+ if(scan.value) {
+ scan.value.getfocus()
+ }
}
const losefocus = () => {
- scan.value.losefocus()
+ if (scan.value) {
+ scan.value.losefocus()
+ }
}
const showErrorMessage = (message) => {
setTimeout((r) => {
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index be67298f..4c6cd96f 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -57,6 +57,7 @@ const openScanPopup = () => {
}, 500)
}
const closeScanPopup = () => {
+ losefocus()
isShow.value = false
}
diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue
index 8d485aab..ac0a4925 100644
--- a/src/mycomponents/scan/winScanJobNumber.vue
+++ b/src/mycomponents/scan/winScanJobNumber.vue
@@ -46,6 +46,9 @@ const openScanPopup = () => {
}, 500)
}
const closeScanPopup = () => {
+ if(scan.value){
+ scan.value.losefocus()
+ }
isShow.value = false
}
const getfocus = () => {
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 25624e8c..2b21d6ae 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -57,6 +57,7 @@ const openScanPopupSimulate = (location) => {
comscansimulate.value.clickScanMsg()
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
}
const scanClick = () => {
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index cb3e80c6..913770e1 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -61,6 +61,7 @@ const openScanPopup = () => {
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('close', '')
}
diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue
index 3621d411..f0ab27fd 100644
--- a/src/mycomponents/scan/winScanPackAndCont.vue
+++ b/src/mycomponents/scan/winScanPackAndCont.vue
@@ -58,6 +58,7 @@ export default {
},
closeScanPopup() {
+ this.losefocus()
this.$refs.popup.close()
this.$emit('close', '')
},
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 29e42067..9e4bc27a 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -178,6 +178,7 @@ const openScanPopupForJobSimulate = (fromLocationCodeParams, fromLocationListPar
})
}
const closeScanPopup = (content) => {
+ packLoseFocus()
show.value = false
emit('close', '')
}
diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
index 21970655..c5514548 100644
--- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
+++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
@@ -131,6 +131,7 @@ const openScanPopupForJob = (fromLocationCodeParms, fromLocationListParms, jobCo
fromLocationTypeArray.value = getDirectoryItemArray(jobContent.fromLocationTypes) // 出库库存状态
}
const closeScanPopup = (content) => {
+ packLoseFocus()
show.value = false
emit('close', '')
}
diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue
index de5541b8..97e1482b 100644
--- a/src/mycomponents/scan/winScanPackAndPosition.vue
+++ b/src/mycomponents/scan/winScanPackAndPosition.vue
@@ -102,6 +102,7 @@ const initData = () => {
}
const closeScanPopup = () => {
+ losefocus()
isShow.value = false
emit('close', '')
}
diff --git a/src/mycomponents/scan/winScanPackLevel.vue b/src/mycomponents/scan/winScanPackLevel.vue
index b6978759..a422d5fc 100644
--- a/src/mycomponents/scan/winScanPackLevel.vue
+++ b/src/mycomponents/scan/winScanPackLevel.vue
@@ -25,7 +25,7 @@
-
+
@@ -50,6 +50,7 @@
default: 'HPQ'
}
})
+ const emit = defineEmits(['close'])
const show = ref(false)
const priorityList = ref([
{
@@ -82,6 +83,7 @@
}, 200)
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('close', '')
}
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index b136367b..545c2e21 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -57,6 +57,7 @@ const openScanPopup = () => {
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('close', '')
}
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index a5c1f98a..25ae3e06 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -136,6 +136,7 @@ const openScanPopup = (content, jobcontentParams) => {
}, 500)
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('closeScan')
// 清除数据，恢复默认值
@@ -229,11 +230,11 @@ const onScanResult = (result) => {
result.balance = res.data[0]
if (result.label.packingNumber != result.balance.packingNumber) {
- result.balance.handleQty = Number(result.label.qty)
+ result.balance.qty = Number(result.label.qty)
}
else
{
- result.balance.handleQty = Number(result.balance.qty)
+ result.balance.qty = Number(result.balance.qty)
}
afterGetBalance(result.label, result.balance, result.package);
} else {
diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index 0edb0227..f274f6dc 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -50,6 +50,8 @@ const toLocationCombox = ref()
const comMessageRef = ref()
const detailOptions = ref([])
const comscan = ref()
+const scanPopup = ref(null)
+const balanceSelect = ref(null)
onMounted(() => {
detailOptions.value = getDetailOption()
scanOptions.value = getDetailEditRemoveOption()
@@ -62,6 +64,7 @@ const openScanPopup = (content, jobcontent) => {
scanPopup.value.openScanPopupForJob(fromLocationCode.value, fromLocationList.value, jobContent.value)
}
const closeScanPopup = () => {
+ packLoseFocus()
show.value = false
emit('closeScan')
// 清除数据，恢复默认值
@@ -277,17 +280,17 @@ const addRecord = (batch, label, balance, packageInfo) => {
calcBatchHandleQty(batch)
getfocus()
}
-const getfocus = () => {
- if (scanPopup.value) {
- scanPopup.value.getfocus()
- }
-}
-
-const losefocus = () => {
- if (scanPopup.value) {
- scanPopup.value.losefocus()
- }
-}
+// const getfocus = () => {
+// if (scanPopup.value) {
+// scanPopup.value.getfocus()
+// }
+// }
+//
+// const losefocus = () => {
+// if (scanPopup.value) {
+// scanPopup.value.losefocus()
+// }
+// }
const swipeClick = (params, item) => {
const { text } = scanOptions.value[params[1]]
@@ -330,10 +333,14 @@ const remove = (record, index) => {
})
}
const packGetFocus = () => {
- scanPopup.value.getfocus()
+ if(scanOptions.value){
+ scanPopup.value.packGetFocus()
+ }
}
const packLoseFocus = () => {
- scanPopup.value.losefocus()
+ if(scanPopup.value){
+ scanPopup.value.packLoseFocus()
+ }
}
const showMessage = (message, callback) => {
setTimeout((r) => {
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 92526ac8..7954a682 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -258,6 +258,7 @@ const calcHandleQty1 = () => {
}
const showErrorMessage = (message) => {
+ scanPopupLoseFocus()
comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
scanPopupGetFocus()
@@ -296,6 +297,11 @@ const scanPopupGetFocus = () => {
scanPopup.value.getfocus()
}
}
+const scanPopupLoseFocus = ()=> {
+ if (scanPopup.value) {
+ scanPopup.value.losefocus();
+ }
+}
const commit = () => {
// if (!dataContent.value.printerUuid) {
// showErrorMessage('请选择打印机')
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 3ba0df81..ae0baea7 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -113,6 +113,7 @@ const openScanPopup = (content, jobcontent) => {
}, 500)
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('closeScan')
// 清除数据，恢复默认值
@@ -369,13 +370,13 @@ const packLoseFocus = () => {
}
const showMessage = (message, callback) => {
setTimeout((r) => {
- packLoseFocus()
+ losefocus()
comMessageRef.value.showMessage(message, callback)
})
}
const showErrorMessage = (message, callback) => {
setTimeout((r) => {
- packLoseFocus()
+ losefocus()
comMessageRef.value.showErrorMessage(message, callback)
})
}
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 898cc591..7af382f8 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -125,6 +125,7 @@ const openScanPopupForJobSimulate = (content, jobcontent, scanMessage) => {
})
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('closeScan')
// 清除数据，恢复默认值
@@ -251,9 +252,9 @@ const onScanResult = (result) => {
result.balance = res.data[0]
if (result.label.packingNumber != result.balance.packingNumber) {
- result.balance.handleQty = Number(result.label.qty)
+ result.balance.qty = Number(result.label.qty)
} else {
- result.balance.handleQty = Number(result.balance.qty)
+ result.balance.qty = Number(result.balance.qty)
}
afterGetBalance(result.label, result.balance, result.package);
} else {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index ff3684a7..ff7820c5 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -5,7 +5,7 @@
:productionline="productionlineList" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
:checkedWaitTask="checkedWaitTask" :isShowItemCode="true" @productionLineCode="productionLineCode"
- @fromLocationCode="fromLocationCode" :isShowQurery='true' @onQuery="getListByFilter">
+ @fromLocationCode="fromLocationCodeQuery" :isShowQurery='true' @onQuery="getListByFilter">
@@ -196,7 +196,7 @@ const getList = (type, fromLocationCode = '', filterItemCode = '') => {
showErrorMessage(error)
})
}
-const fromLocationCode = (fromLocationCode) => {
+const fromLocationCodeQuery = (fromLocationCode) => {
console.log('fromLocationCode', fromLocationCode)
fromLocationCode.value = fromLocationCode
getList('refresh', fromLocationCode.value, filterItemCode.value)
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index c6268324..b2101114 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -141,6 +141,7 @@ const openScanPopup = (content, jobcontent) => {
}, 500)
}
const closeScanPopup = () => {
+ losefocus()
show.value = false
emit('closeScan')
// 清除数据，恢复默认值