diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue index cb9600e3..a1ca2af0 100644 --- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue +++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue @@ -11,8 +11,8 @@ - - + + @@ -36,8 +36,30 @@ const props = defineProps({ settingParam: { type: Object, default: {} + }, + allowEditQty: { + type: Boolean, + default: false + }, + locationAreaTypeList: { + type: Array, + default: [] } }) +watch(()=> props.dataContent, (newName, oldName)=>{ + if (dataContent.value.subList.length > 0) { + nextTick(res => { + setTimeout(() => { + if (collapse1.value) { + collapse1.value.init(); + } + }, 200) + }) + } +},{ + immediate: true, + deep: true +}) const option = ref([]) const title = ref('推荐详情') const showItem = ref({}) @@ -53,7 +75,7 @@ const scanLocationCode = ref('') const winHint = ref() const dataContent = ref(props.dataContent) const collapse1 = ref() - +const locatonItem = ref({}) onMounted(() => { if (detailOptions.value.length == 0) { detailOptions.value = getDetailOption() diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue b/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue new file mode 100644 index 00000000..e7997e46 --- /dev/null +++ b/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue index 3d5ca05e..4fa3b88e 100644 --- a/src/pages/inventoryMove/coms/comMove.vue +++ b/src/pages/inventoryMove/coms/comMove.vue @@ -228,7 +228,7 @@ newDetail.toInventoryStatus = this.toInventoryStatus item.subList.push(newDetail); } else { - this.showErrorMessage(balance.packingNumber + "已经在列表中") + this.showErrorMessage(balance.packingNumber + "重复扫描") } } calcHandleQty(this.detailSource); @@ -307,7 +307,7 @@ inventoryMoveRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.title + "记录
" + + this.showCommitSuccessMessage("提交成功\n生成" + this.title + "记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index ab73e708..cc3b890e 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -1,7 +1,11 @@