diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue index fce0dcf3..bf900352 100644 --- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue +++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue @@ -19,7 +19,7 @@ - + @@ -71,13 +71,27 @@ type: Boolean, default: false }, + locationAreaTypeList: { + type: Array, + default: [] + } }, watch: { - // dataContent: { - // handler(newName, oldName) {}, - // immediate: true, - // deep: true - // } + dataContent: { + handler(newName, oldName) { + if (this.dataContent.subList.length > 0) { + this.$nextTick(res => { + setTimeout(() => { + if (this.$refs.collapse1) { + this.$refs.collapse1.resize(); + } + }, 200) + }) + } + }, + immediate: true, + deep: true + } }, mounted() { if (this.detailOptions.length == 0) { diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 207ed519..7d7fc400 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -13,7 +13,9 @@ + @updateData='updateData' + :locationAreaTypeList="toLocationAreaTypeList" + @openDetail="openDetail"> @@ -55,6 +57,10 @@ getScanCount, calcHandleQty } from '@/common/detail.js'; + import { + getDirectoryItemArray, + } from '@/common/directory.js'; + import { goHome, navigateBack, @@ -95,7 +101,8 @@ toLocationCode: '', toInventoryStatus: '', jobStatus: "", - title: '' + title: '', + toLocationAreaTypeList:[] }; }, props: { @@ -220,6 +227,7 @@ } else { if (res.data.subList.length > 0) { that.jobContent = res.data; + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes); that.jobStatus = res.data.status that.subList = res.data.subList; that.detailSource = getDataSource(that.subList)