From 128dfa5e1407751bc208c1999930b14c3eb864d8 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 14:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/zh.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 9490a9c..bc97763 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,6 +107,8 @@
menu: {
dashboard: '鎺у埗鍙�',
settings: '涓汉璁剧疆',
+ basicSettings: '鍩虹璁剧疆',
+ pakin: '缁勬墭',
system: '绯荤粺璁剧疆',
user: '鐢ㄦ埛绠＄悊',
role: '瑙掕壊绠＄悊',
@@ -118,6 +120,11 @@
config: '閰嶇疆鍙傛暟',
tenant: '绉熸埛绠＄悊',
userLogin: '鐧诲綍鏃ュ織',
+ customer: '瀹㈡埛琛�',
+ shipper: '璐т富淇℃伅',
+ matnr: '鐗╂枡琛�',
+ matnrGroup: '鐗╂枡鍒嗙粍',
+
},
table: {
field: {
@@ -135,6 +142,7 @@
tenant: {
name: "绉熸埛鍚�",
flag: "浠ｇ爜",
+ root: "绠＄悊鍛�",
},
role: {
name: "瑙掕壊鍚嶇О",
@@ -217,17 +225,55 @@
result: "result",
userId: "鎿嶄綔鐢ㄦ埛",
},
+ customer: {
+ uuid: "缂栧彿",
+ name: "瀹㈡埛鍚�",
+ },
+ shipper: {
+ uuid: "缂栫爜",
+ name: "鍚嶇О",
+ },
+ matnr: {
+ uuid: "缂栫爜",
+ shipperId: "璐т富ID",
+ name: "鍚嶇О",
+ code: "鐗╂枡缂栫爜",
+ groupId: "鍒嗙被鏍囪瘑",
+ erpCode: "ERP缂栫爜",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ weight: "閲嶉噺",
+ color: "棰滆壊",
+ size: "灏哄",
+ desc: "鎻忚堪",
+ nromNum: "鏍囧寘鏁伴噺",
+ unit: "鍗曚綅",
+ purchaseUnit: "閲囪喘鍗曚綅",
+ stockUnit: "搴撳瓨鍗曚綅",
+ stockLeval: "ABC鍒嗙被",
+ isLabelMange: "鏄惁鏍囩绠＄悊",
+ },
+ matnrGroup: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ parentId: "鐖剁被鏍囪瘑",
+ },
}
},
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 +281,7 @@
button: {
login: '鐧诲綍',
register: '娉ㄥ唽',
+ code: '鑾峰彇楠岃瘉鐮�',
},
},
settings: {
--
Gitblit v1.9.1