From 210988b56322931b9e0c91194f5c50f84b007688 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:21:34 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/i18n/en.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index f338b7e..8130e2f 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -107,7 +107,6 @@
},
menu: {
dashboard: 'Dashboard',
- basicInfo: 'BasicInfo',
settings: 'Settings',
basicInfo: 'BasicInfo',
system: 'System',
@@ -128,6 +127,7 @@
warehouse: 'Warehouse',
warehouseAreas: 'WarehouseAreas',
loc: 'Loc',
+ locType: 'LocType',
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
@@ -147,7 +147,6 @@
endBay: "endBay",
endLev: "endLev",
endRow: "endRow",
- locType: "locType",
startBay: "startBay",
startLev: "startLev",
startRow: "startRow",
@@ -305,6 +304,7 @@
warehouseAreas: {
uuid: "uuid",
name: "name",
+ wareId: "ware",
code: "code",
shipperId: "shipperId",
supplierId: "supplierId",
@@ -355,6 +355,17 @@
locAttrs: "LocAttrs",
useStatus: 'useStatus'
},
+ locType: {
+ uuid: "uuid",
+ name: "name",
+ regex: "regex",
+ },
+ locArea: {
+ name: "name",
+ code: "code",
+ areaId: "areaId",
+ locId: "locId",
+ },
container: {
code: "Code",
name: "Name",
--
Gitblit v1.9.1