From c3949ec79f06e7bdee9c3a12367bd97ddf46e033 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 15:28:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/i18n/zh.js |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index edbb37d..c617d17 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1,3 +1,4 @@
+import { s } from "motion/react-client";
 import chineseMessages from "./core/chineseMessages";
 
 const customChineseMessages = {
@@ -131,7 +132,7 @@
         qlyInspect: '璐ㄦ淇℃伅',
         dictType: '鏁版嵁瀛楀吀',
         dictData: '瀛楀吀鏁版嵁闆�',
-
+        companys: '寰�鏉ヤ紒涓�',
 
 
     },
@@ -342,6 +343,7 @@
                 name: "鍚嶇О",
             },
             dictType: {
+                code: "瀛楀吀缂栫爜",
                 name: "瀛楀吀鍚嶇О",
                 description: "鍐呭鎻忚堪",
             },
@@ -353,6 +355,21 @@
                 sort: "鎺掑簭",
                 color: "棰滆壊",
             },
+            companys: {
+                code: "浼佷笟缂栫爜",
+                name: "鍚嶇О",
+                nameEn: "鑻辨枃鍒悕",
+                breifCode: "鍔╄鐮�",
+                type: "绫诲瀷",
+                contact: "鑱旂郴浜�",
+                tel: "鑱旂郴鐢佃瘽",
+                email: "鐢靛瓙閭欢",
+                pcode: "閭紪",
+                province: "鐪佷唤",
+                city: "鍩庡競",
+                address: "鍦板潃",
+            },
+
         }
     },
     page: {
@@ -409,6 +426,20 @@
                 },
             },
         },
+        matnr: {
+            title: {
+                basic: '鍩虹灞炴��',
+                control: '鎺у埗灞炴��',
+                batchRole: '鎵规瑙勫垯',
+            }
+        }
+    },
+    form: {
+        matnr: {
+            name: '鐗╂枡鍚嶇О涓嶈兘涓虹┖',
+            shipper: '璐т富涓嶈兘涓虹┖',
+            groupId: '鍒嗙粍涓嶈兘涓虹┖',
+        }
     }
 };
 

--
Gitblit v1.9.1