diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index b2022a23..44592381 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -52,8 +52,8 @@ const scan = ref()
const expendIcon = ref('arrow-down')
const comMessageRef = ref()
const openScanPopup = () => {
+ isShow.value = true
setTimeout((res) => {
- isShow.value = true
getfocus()
}, 500)
}
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 2e0d537a..68cd36b1 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -78,7 +78,7 @@ const queryParams = reactive({
fromLocationCode: ""
} )
onShow(() => {
- nextTick(() => {
+ setTimeout(()=>{
getList('refresh')
})
})
diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
index 359c7bcd..a562f02f 100644
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -3,12 +3,10 @@
-
-
-
-
-
-
+
+
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 63b25b5c..5490b6cf 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -2,17 +2,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -30,7 +32,7 @@
import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
import recommend from '@/mycomponents/recommend/recommend.vue'
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
-import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+import JobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import detailList from '@/mycomponents/detail/detailList.vue'
@@ -50,10 +52,11 @@ import {
import {ref, onMounted, watch, nextTick} from 'vue';
+
const props = defineProps({
dataContent: {
type: Object,
- default: null
+ default: ()=>{}
},
settingParam: {
type: Object,
@@ -76,9 +79,19 @@ const removeOptions = ref([]);
const collapse = ref(null);
const receiptEdit = ref(null);
const scanLocationCode = ref(null);
-const jobDetailPopup = ref(null);
const message = ref(null);
-
+const jobDetailPopup = ref(null);
+watch(() => props.dataContent, (newDataContent, oldDataContent) => {
+ if (newDataContent?.subList.length > 0) {
+ nextTick(() => {
+ setTimeout(() => {
+ if (collapse.value) {
+ collapse.value.init();
+ }
+ }, 500);
+ });
+ }
+}, { immediate: true, deep: true });
onMounted(() => {
if (detailOptions.value.length === 0) {
detailOptions.value = getDetailOption();
diff --git a/src/pages/purchaseReceipt/job/purchaseReceipt.vue b/src/pages/purchaseReceipt/job/purchaseReceipt.vue
index ccdbe6fa..c2b01424 100644
--- a/src/pages/purchaseReceipt/job/purchaseReceipt.vue
+++ b/src/pages/purchaseReceipt/job/purchaseReceipt.vue
@@ -12,7 +12,7 @@ import receiptJob from '@/pages/purchaseReceipt/job/receiptJob.vue'
const receiptjob = ref()
const title = ref('')
onShow(() => {
- nextTick(() => {
+ setTimeout(()=>{
if (receiptjob.value != undefined) {
receiptjob.value.refresh()
}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 0a1ccc0d..b87d2ef8 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -13,7 +13,7 @@
-
+
@@ -113,6 +113,7 @@ const comReceiptDetailCardRef = ref()
const count = ref(0)
const managementType = ref('')
const switchCode1 = ref('')
+const scanedPackingNumber = ref('')
onLoad((option) => {
id.value = option.id
scanMessage.value = option.scanMessage
@@ -205,7 +206,7 @@ const getDetail = () => {
detailSource.value.forEach(item => {
itemCodes.push(item.itemCode)
})
- getManagementPrecisions(itemCodes, that.jobToLocationCode, res => {
+ getManagementPrecisions(itemCodes, jobToLocationCode.value, res => {
if (res.success) {
managementList.value = res.list;
managementType.value = managementList.value.some(item => item.ManagementPrecision ==
@@ -262,15 +263,14 @@ const getScanResultAfter = (result) => {
} else if (result.label.labelType == 'PurchaseLabel') {
let packingNumber = result.package.number
const parentpackingNumber = result.package.parentNumber
- const { packingNumber } = result.label
const { batch } = result.label
const { qty } = result.label
- var detail = detailSource.value.find((r) => r.itemCode == itemCode)
+ let detail = detailSource.value.find((r) => r.itemCode == itemCode)
if (detail == undefined) {
showMessage(`物料号【${itemCode}】不在列表中`)
} else {
// 物料在列表中
- var itemDetail = detail.subList.find((r) => r.packingNumber == packingNumber && r.batch == batch)
+ let itemDetail = detail.subList.find((r) => r.packingNumber == packingNumber && r.batch == batch)
if (itemDetail == undefined) {
itemDetail = detail.subList.find((r) => r.packingNumber == parentpackingNumber && r.batch == batch)
if (itemDetail == undefined) {
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 3dfeedb7..120ee225 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -214,8 +214,8 @@ const getDataListByType = (code, type) => {
showMessage(error)
})
}
-const openJobDetail = (item, scanMessage = '') => {
- proxy.$tab.navigateTo(`./receiptDetail?id=${item.masterId}&status=${item.status}&operation=${this.operation}&scanMessage=${scanMessage}`)
+const openJobDetail = (item, scanMessageMes = '') => {
+ proxy.$tab.navigateTo(`./receiptDetail?id=${item.masterId}&status=${item.status}&operation=${props.operation}&scanMessage=${scanMessageMes}`)
scanMessage.value = ''
}
const showItemList = (itemList) => {