From 8edc8701512d6a02492c8f8d38c05a4253650117 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 08:19:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 602630c..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",
@@ -353,6 +353,18 @@
maxPack: "MaxPack",
flagLabelMange: "FlagLabelMange",
locAttrs: "LocAttrs",
+ useStatus: 'useStatus'
+ },
+ locType: {
+ uuid: "uuid",
+ name: "name",
+ regex: "regex",
+ },
+ locArea: {
+ name: "name",
+ code: "code",
+ areaId: "areaId",
+ locId: "locId",
},
container: {
code: "Code",
@@ -609,7 +621,8 @@
print: "print",
enable: 'enable',
unenable: 'unenable',
- locInit: 'loc init'
+ locInit: 'loc init',
+ batch: 'batch',
},
};
--
Gitblit v1.9.1