From 632bb5a9a0f07c01ffba53e9009d69c4a50c2bd7 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 12:50:01 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index f338b7e..dad32ca 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',
@@ -147,7 +148,6 @@
endBay: "endBay",
endLev: "endLev",
endRow: "endRow",
- locType: "locType",
startBay: "startBay",
startLev: "startLev",
startRow: "startRow",
@@ -305,6 +305,7 @@
warehouseAreas: {
uuid: "uuid",
name: "name",
+ wareId: "ware",
code: "code",
shipperId: "shipperId",
supplierId: "supplierId",
@@ -354,6 +355,18 @@
flagLabelMange: "FlagLabelMange",
locAttrs: "LocAttrs",
useStatus: 'useStatus'
+ },
+ locType: {
+ uuid: "uuid",
+ code: "code",
+ name: "name",
+ regex: "regex",
+ },
+ locArea: {
+ name: "name",
+ code: "code",
+ areaId: "areaId",
+ locId: "locId",
},
container: {
code: "Code",
@@ -612,6 +625,7 @@
unenable: 'unenable',
locInit: 'loc init',
batch: 'batch',
+ confirm: 'confirm',
},
};
--
Gitblit v1.9.1