From 864ce98bb1277b7d9a88d0dc97d1f8f2dda874d9 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 29 Jun 2026 11:27:13 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=89=98=E7=9B=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=E8=B0=83=E7=94=A8=E5=88=B7=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/stock/pallet/index.ts         |  4 ++++
 src/locales/en.ts                         |  2 +-
 src/locales/zh-CN.ts                      |  2 +-
 src/views/erp/stock/pallet/PalletForm.vue | 26 +++++++++++++----------
 4 files changed, 21 insertions(+), 13 deletions(-)

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<PalletVO>)
     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) => {