From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/i18n/en.js | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index d35a323..01d776a 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -118,6 +118,11 @@
config: 'Config',
tenant: 'Tenant',
userLogin: 'Token',
+ customer: 'Customer',
+ shipper: 'shipper',
+ matnr: 'Matnr',
+ matnrGroup: 'MatnrGroup',
+
},
table: {
field: {
@@ -135,6 +140,7 @@
tenant: {
name: "name",
flag: "flag",
+ root: "root",
},
role: {
name: "name",
@@ -217,18 +223,70 @@
result: "result",
userId: "user",
},
+ customer: {
+ uuid: "uuid",
+ name: "name",
+ },
+ shipper: {
+ uuid: "uuid",
+ name: "name",
+ },
+ matnr: {
+ name: "name",
+ code: "code",
+ shipperId: "shipperId",
+ groupId: "groupId",
+ batchRegularId: "batchRegularId",
+ erpCode: "erpCode",
+ spec: "spec",
+ model: "model",
+ weight: "weight",
+ color: "color",
+ size: "size",
+ describle: "describle",
+ nromNum: "nromNum",
+ unit: "unit",
+ purchaseUnit: "purchaseUnit",
+ stockUnit: "stockUnit",
+ stockLeval: "stockLeval",
+ isLabelMange: "isLabelMange",
+ safetyQty: "safetyQty",
+ minQty: "minQty",
+ maxQty: "maxQty",
+ stagnate: "stagnate",
+ validity: "validity",
+ validityWarr: "validityWarr",
+ flagCheck: "flagCheck",
+ },
+ matnrGroup: {
+ name: "name",
+ code: "code",
+ parentId: "parentId",
+ },
}
},
page: {
- welcome: ' Welcome to the RSF Management System.',
+ welcome: {
+ index: ' Welcome to the RSF Management System.',
+ tech: ' Technology stack: Java 17, SpringBoot2.5.3, Mybatis-plus_3.4.1, Spring Security, Druid 1.2.6, Redis, Mysql5.7, Node18, ReactJs, Material UI5.16, Axios, React-Admin5.1'
+ },
login: {
title: 'Welcome',
footer: 'Footer Goes Here',
tenant: 'Company',
+ email: 'Email Address',
+ username: 'Username',
+ password: 'Password',
confirmPwd: 'Confirm Password',
+ code: 'Verification Code',
+ tab: {
+ login: 'SIGN IN',
+ register: 'SIGN UP',
+ },
button: {
- login: 'LOG IN',
- register: 'REGISTER',
+ login: 'SIGN IN',
+ register: 'SIGN UP',
+ code: 'Send Code',
},
},
settings: {
@@ -238,12 +296,29 @@
confirmNewPwd: 'Confirm Password',
resetBtn: 'Reset',
tip: {
+ usernameLimit: 'Only 3-20 English letters or numbers are allowed. No special characters.',
pwdInputLimit: "New Password must be 6-13 characters long and include both letters and numbers.",
pwdNotSameAsOld: "New Password cannot be the same as the Current Password.",
pwdNotMatch: "New Password and Confirm Password do not match.",
}
}
},
+ tenant: {
+ create: {
+ title: {
+ basic: 'Basic Information',
+ root: 'Add Administrator',
+ confirm: 'Confirm',
+ },
+ btn: {
+ next: 'Next Step',
+ back: 'Back Step',
+ },
+ tip: {
+ onlyEn: 'Only 3-20 English letters are allowed.'
+ },
+ },
+ },
}
};
--
Gitblit v1.9.1