diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 86eff1d93..cbe18f856 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -184,6 +184,7 @@ ref="labelFormRef" :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas" @submitForm="submitFormLabel" + :key="count" /> @@ -224,6 +225,7 @@ const { t } = useI18n() // 国际化 const genLabelId = ref() const route = useRoute() // 路由信息 const routeName = ref() +const count = ref(0) routeName.value = route.name const tableColumns = ref([ @@ -590,6 +592,7 @@ const buttonTableClick = async (val, row) => { genLabelId.value = row.masterId // await getDetailList() await getGenerateLabelList(row) + count.value++ formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 } else if (val == 'ressbq') { console.log('重新生成标签') @@ -606,6 +609,7 @@ const buttonTableClick = async (val, row) => { } genLabelId.value = row.masterId // await getDetailList() + count.value++ await getGenerateLabelList(row) formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 } @@ -638,6 +642,8 @@ const getGenerateLabelList = async (row) => { await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => { detatableData1.value = res detatableData1.value.forEach((item) => { + // console.log(3333, item?.boxPackaging[0]) + item.boxPackaging =item.boxPackaging ? item.boxPackaging:[] item.packUnitInitOptions = item.boxPackaging item.secondPackUnitInitOptions = item.palletPackaging || [] let obj = item?.boxPackaging[0] @@ -646,10 +652,10 @@ const getGenerateLabelList = async (row) => { item.packQty = obj.packQty } // 有托规格显示托规格,没有显示第一条规格 - item.secondPackUnit = obj.parentPackUnit + item.secondPackUnit = obj?.parentPackUnit ? obj.parentPackUnit : item?.secondPackUnitInitOptions[0]?.packUnit - item.secondPackQty = obj.parentPackUnit + item.secondPackQty = obj?.parentPackUnit ? obj.parentPackQty : item?.secondPackUnitInitOptions[0]?.packQty }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index ad0d66033..d098eb51c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -79,7 +79,7 @@