diff --git a/src/api/erp/stock/warehousearea/index.ts b/src/api/erp/stock/warehousearea/index.ts
index 5d0b9296..78923b50 100644
--- a/src/api/erp/stock/warehousearea/index.ts
+++ b/src/api/erp/stock/warehousearea/index.ts
@@ -4,6 +4,10 @@ export interface WarehouseAreaVO {
id: number
warehouseId: number
areaCode: string
+ isCode?: boolean
+ qrcode?: string
+ qrcodeUrl?: string
+ templateJson?: string | any
areaName: string
areaSize: number
description: string
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2c2a74e2..d6a68856 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -300,6 +300,7 @@ export default {
areaSize: 'Area Size (�?',
description: 'Description',
status: 'Status',
+ qrcode: 'QR Code/Barcode',
createTime: 'Create Time',
placeholderWarehouseId: 'Please select warehouse',
placeholderAreaCode: 'Please enter area code',
@@ -310,7 +311,11 @@ export default {
validatorWarehouseIdRequired: 'Warehouse is required',
validatorAreaCodeRequired: 'Area code is required',
validatorAreaNameRequired: 'Area name is required',
- validatorStatusRequired: 'Status is required'
+ validatorStatusRequired: 'Status is required',
+ qrcodeLoadError: 'Failed to load QR code',
+ qrcodeEmpty: 'No QR code',
+ qrcodeRefreshConfirm: 'Confirm to refresh this warehouse area QR code?',
+ qrcodePrintTitle: '{name} QR code print preview'
},
WarehouseLocation: {
warehouseId: 'Warehouse',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index d2a1407c..080f8ddb 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -300,6 +300,7 @@ export default {
areaSize: '面积(㎡)',
description: '库区描述',
status: '开启状态',
+ qrcode: '二维码/条形码',
createTime: '创建时间',
placeholderWarehouseId: '请选择所属仓库',
placeholderAreaCode: '请输入库区编码',
@@ -310,7 +311,11 @@ export default {
validatorWarehouseIdRequired: '所属仓库不能为空',
validatorAreaCodeRequired: '库区编码不能为空',
validatorAreaNameRequired: '库区名称不能为空',
- validatorStatusRequired: '开启状态不能为空'
+ validatorStatusRequired: '开启状态不能为空',
+ qrcodeLoadError: '二维码加载失败',
+ qrcodeEmpty: '暂无二维码',
+ qrcodeRefreshConfirm: '确认刷新该库区二维码吗?',
+ qrcodePrintTitle: '{name}二维码打印预览'
},
WarehouseLocation: {
warehouseId: '所属仓库',
diff --git a/src/views/erp/warehousearea/WarehouseAreaForm.vue b/src/views/erp/warehousearea/WarehouseAreaForm.vue
index 83e87a00..91dfa37b 100644
--- a/src/views/erp/warehousearea/WarehouseAreaForm.vue
+++ b/src/views/erp/warehousearea/WarehouseAreaForm.vue
@@ -28,7 +28,7 @@
-
+
@@ -51,6 +51,21 @@
+
+
+
{{ t('common.ok') }}
@@ -60,10 +75,10 @@