From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/zh.js | 98 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 60efdde..bf0ba96 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,6 +107,7 @@
menu: {
dashboard: '鎺у埗鍙�',
settings: '涓汉璁剧疆',
+ basicInfo: '鍩虹淇℃伅',
system: '绯荤粺璁剧疆',
user: '鐢ㄦ埛绠＄悊',
role: '瑙掕壊绠＄悊',
@@ -118,6 +119,14 @@
config: '閰嶇疆鍙傛暟',
tenant: '绉熸埛绠＄悊',
userLogin: '鐧诲綍鏃ュ織',
+ customer: '瀹㈡埛琛�',
+ shipper: '璐т富淇℃伅',
+ matnr: '鐗╂枡琛�',
+ matnrGroup: '鐗╂枡鍒嗙粍',
+ warehouse: '浠撳簱淇℃伅',
+ warehouseAreas: '浠撳簱搴撳尯',
+
+
},
table: {
field: {
@@ -135,6 +144,7 @@
tenant: {
name: "绉熸埛鍚�",
flag: "浠ｇ爜",
+ root: "绠＄悊鍛�",
},
role: {
name: "瑙掕壊鍚嶇О",
@@ -217,17 +227,83 @@
result: "result",
userId: "鎿嶄綔鐢ㄦ埛",
},
+ customer: {
+ uuid: "缂栧彿",
+ name: "瀹㈡埛鍚�",
+ },
+ shipper: {
+ uuid: "缂栫爜",
+ name: "鍚嶇О",
+ },
+ matnr: {
+ name: "鐗╂枡鍚嶇О",
+ code: "鐗╂枡缂栫爜",
+ shipperId: "璐т富鏍囪瘑",
+ groupId: "鍒嗙粍鏍囪瘑",
+ rglarId: "鎵规瑙勫垯鏍囪瘑",
+ erpCode: "ERP缂栫爜",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ weight: "閲嶉噺",
+ color: "棰滆壊",
+ size: "灏哄",
+ describle: "鎻忚堪",
+ nromNum: "鏍囧寘鏁伴噺",
+ unit: "鍗曚綅",
+ purUnit: "閲囪喘鍗曚綅",
+ stockUnit: "搴撳瓨鍗曚綅",
+ stockLevel: "ABC鍒嗙被",
+ isLabelMange: "鏍囩绠＄悊",
+ safeQty: "瀹夊叏鍊�",
+ minQty: "鏈�灏忓��",
+ maxQty: "鏈�澶у��",
+ stagn: "鍋滄粸棰勮鍊�",
+ valid: "淇濊川鏈�",
+ validWarn: "鏁堟湡棰勮",
+ flagCheck: "鍏嶆",
+ },
+ matnrGroup: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ parentId: "鐖剁被鏍囪瘑",
+ },
+ warehouse: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ factory: "宸ュ巶",
+ address: "鍦板潃",
+ longitude: "缁忓害",
+ latgitude: "绾害",
+ length: "闀�",
+ width: "瀹�",
+ height: "楂�",
+ },
+ warehouseAreas: {
+ uuid: "鍞竴缂栫爜",
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ shipperId: "璐т富",
+ supplierId: "渚涘簲鍟�",
+ flagMinus: "鍏佽璐熷簱瀛�",
+ flagLabelMange: "鏍囩绠＄悊",
+ flagMix: "娣锋斁",
+ },
}
},
page: {
- welcome: ' 娆㈣繋浣跨敤RSF绠＄悊绯荤粺',
+ welcome: {
+ index: ' 娆㈣繋浣跨敤RSF绠＄悊绯荤粺',
+ tech: ' 鎶�鏈爤: Java17, 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: '娆㈣繋浣跨敤',
footer: 'Footer Goes Here',
tenant: '鍏徃',
- username: '璐﹀彿',
+ email: '閭鍦板潃',
+ username: '鐧诲綍璐﹀彿',
password: '瀵嗙爜',
confirmPwd: '纭瀵嗙爜',
+ code: '楠岃瘉鐮�',
tab: {
login: '鐧诲綍',
register: '娉ㄥ唽',
@@ -235,6 +311,7 @@
button: {
login: '鐧诲綍',
register: '娉ㄥ唽',
+ code: '鑾峰彇楠岃瘉鐮�',
},
},
settings: {
@@ -244,12 +321,29 @@
confirmNewPwd: '纭鏂板瘑鐮�',
resetBtn: '閲嶇疆瀵嗙爜',
tip: {
+ usernameLimit: '浠呭厑璁歌緭鍏� 3-20 涓嫳鏂囧瓧姣嶆垨鏁板瓧锛屼笉鑳藉寘鍚壒娈婂瓧绗�',
pwdInputLimit: "瀵嗙爜蹇呴』涓�6-13浣�,涓斿繀椤诲寘鍚瓧姣嶅拰鏁板瓧",
pwdNotSameAsOld: "鏂板瘑鐮佷笉鑳戒笌褰撳墠瀵嗙爜鐩稿悓",
pwdNotMatch: "纭瀵嗙爜涓嶄竴鑷�",
}
}
},
+ tenant: {
+ create: {
+ title: {
+ basic: '鍩虹淇℃伅',
+ root: '娣诲姞绠＄悊鍛�',
+ confirm: '纭',
+ },
+ btn: {
+ next: '涓嬩竴姝�',
+ back: '涓婁竴姝�',
+ },
+ tip: {
+ onlyEn: '浠呭厑璁歌緭鍏� 3-20 涓嫳鏂囧瓧姣�'
+ },
+ },
+ },
}
};
--
Gitblit v1.9.1