From 35c422aa74e47a2ee4bea49e6799fefac1b63713 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:39:47 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/en.js |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 1beaebd..cb54b18 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,8 @@
         warehouse: 'Warehouse',
         warehouseAreas: 'WarehouseAreas',
         loc: 'Loc',
+        locType: 'LocType',
+        locArea: 'locArea',
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
@@ -144,6 +145,12 @@
         fields: 'Extend Fields',
         fieldsItem: 'Extend Fields Items',
         warehouseAreasItem: 'WarehouseAreasItem',
+        endBay: "endBay",
+        endLev: "endLev",
+        endRow: "endRow",
+        startBay: "startBay",
+        startLev: "startLev",
+        startRow: "startRow",
     },
     table: {
         field: {
@@ -298,6 +305,7 @@
             warehouseAreas: {
                 uuid: "uuid",
                 name: "name",
+                wareId: "ware",
                 code: "code",
                 shipperId: "shipperId",
                 supplierId: "supplierId",
@@ -346,6 +354,20 @@
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
                 locAttrs: "LocAttrs",
+                useStatus: 'useStatus',
+                locAreaId: 'locAreaId'
+            },
+            locType: {
+                uuid: "uuid",
+                code: "code",
+                name: "name",
+                regex: "regex",
+            },
+            locArea: {
+                name: "name",
+                code: "code",
+                areaId: "areaId",
+                locId: "locId",
             },
             container: {
                 code: "Code",
@@ -600,6 +622,12 @@
         inspection: "Inspection",
         creatcode: "creatcode",
         print: "print",
+        enable: 'enable',
+        unenable: 'unenable',
+        locInit: 'loc init',
+        batch: 'batch',
+        confirm: 'confirm',
+        subzone: 'subzone'
     },
 };
 

--
Gitblit v1.9.1