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/zh.js |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 60efdde..53667aa 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,11 @@
         config: '閰嶇疆鍙傛暟',
         tenant: '绉熸埛绠＄悊',
         userLogin: '鐧诲綍鏃ュ織',
+        customer: '瀹㈡埛琛�',
+        shipper: '璐т富淇℃伅',
+        matnr: '鐗╂枡琛�',
+        matnrGroup: '鐗╂枡鍒嗙粍',
+
     },
     table: {
         field: {
@@ -135,6 +141,7 @@
             tenant: {
                 name: "绉熸埛鍚�",
                 flag: "浠ｇ爜",
+                root: "绠＄悊鍛�",
             },
             role: {
                 name: "瑙掕壊鍚嶇О",
@@ -217,17 +224,62 @@
                 result: "result",
                 userId: "鎿嶄綔鐢ㄦ埛",
             },
+            customer: {
+                uuid: "缂栧彿",
+                name: "瀹㈡埛鍚�",
+            },
+            shipper: {
+                uuid: "缂栫爜",
+                name: "鍚嶇О",
+            },
+            matnr: {
+                name: "鐗╂枡鍚嶇О",
+                code: "鐗╂枡缂栫爜",
+                shipperId: "璐т富鏍囪瘑",
+                groupId: "鍒嗙粍鏍囪瘑",
+                batchRegularId: "鎵规瑙勫垯鏍囪瘑",
+                erpCode: "ERP缂栫爜",
+                spec: "瑙勬牸",
+                model: "鍨嬪彿",
+                weight: "閲嶉噺",
+                color: "棰滆壊",
+                size: "灏哄",
+                describle: "鎻忚堪",
+                nromNum: "鏍囧寘鏁伴噺",
+                unit: "鍗曚綅",
+                purchaseUnit: "閲囪喘鍗曚綅",
+                stockUnit: "搴撳瓨鍗曚綅",
+                stockLeval: "ABC鍒嗙被",
+                isLabelMange: "鏍囩绠＄悊",
+                safetyQty: "瀹夊叏鍊�",
+                minQty: "鏈�灏忓��",
+                maxQty: "鏈�澶у��",
+                stagnate: "鍋滄粸棰勮鍊�",
+                validity: "淇濊川鏈�",
+                validityWarr: "鏁堟湡棰勮",
+                flagCheck: "鍏嶆",
+            },
+            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 +287,7 @@
             button: {
                 login: '鐧诲綍',
                 register: '娉ㄥ唽',
+                code: '鑾峰彇楠岃瘉鐮�',
             },
         },
         settings: {
@@ -244,12 +297,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