diff --git a/src/api/erp/stock/pallet/index.ts b/src/api/erp/stock/pallet/index.ts index c29e3a0f..4322d8b0 100644 --- a/src/api/erp/stock/pallet/index.ts +++ b/src/api/erp/stock/pallet/index.ts @@ -26,6 +26,10 @@ export const PalletApi = { return await request.get({ url: `/erp/pallet/page`, params }) }, + getPallet: async (id: number) => { + return await request.get({ url: `/erp/pallet/get?id=` + id }) + }, + createPallet: async (data: PalletVO) => { return await request.post({ url: `/erp/pallet/create`, data }) }, diff --git a/src/locales/en.ts b/src/locales/en.ts index 346034c6..bf7cb218 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -859,7 +859,7 @@ export default { productId: 'Product ID', productName: 'Product Name', productCount: 'Product Quantity', - qrcode: 'QR Code', + qrcode: 'QR Code/Barcode', viewQrcode: 'View QR Code', qrcodeEmpty: 'No QR code', qrcodeRefreshConfirm: 'Confirm to refresh this pallet QR code?', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 675fa6c7..7b7b51e0 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -859,7 +859,7 @@ export default { productId: '产品编号', productName: '产品名称', productCount: '产品数量', - qrcode: '二维码', + qrcode: '二维码/条形码', viewQrcode: '查看二维码', qrcodeEmpty: '暂无二维码', qrcodeRefreshConfirm: '确认刷新该托盘二维码吗?', diff --git a/src/views/erp/stock/pallet/PalletForm.vue b/src/views/erp/stock/pallet/PalletForm.vue index cab2fa0f..4c9d3999 100644 --- a/src/views/erp/stock/pallet/PalletForm.vue +++ b/src/views/erp/stock/pallet/PalletForm.vue @@ -557,13 +557,7 @@ const open = async (type: string, row?: PalletVO, defaults?: Partial) await hydrateSelectedProduct() } if (type === 'update' && row) { - formData.value = { - ...row, - isCode: false - } - parseSpecification(row.specification) - await hydrateSelectedWarehouseArea() - await hydrateSelectedProduct() + await applyPalletDetail(row) } } defineExpose({ open }) @@ -623,11 +617,21 @@ const getQrcodeRefreshUrl = () => { return `/erp/pallet/regenerate-code?id=${formData.value.id}&code=${encodeURIComponent(String(formData.value.code))}` } -const handleQrcodeRefreshSuccess = (data: any) => { - const qrcode = data?.qrcode ?? data?.qrcodeUrl - if (qrcode) { - formData.value.qrcode = qrcode +const applyPalletDetail = async (data: PalletVO) => { + formData.value = { + ...formData.value, + ...data, + isCode: false } + parseSpecification(formData.value.specification) + await hydrateSelectedWarehouseArea() + await hydrateSelectedProduct() +} + +const handleQrcodeRefreshSuccess = async () => { + if (!formData.value.id) return + const data = await PalletApi.getPallet(Number(formData.value.id)) + await applyPalletDetail(data) } const parseSpecification = (value?: string) => {