From 203e553223a51b1e80c3d764363771c4d9453b8d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 15:06:14 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/zh.js |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 8c533da..f94b280 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -68,6 +68,7 @@
             deprecate: '搴熷純',
             resend: '閲嶅彂',
             selected: '椤归�変腑',
+            batch: '鎵归噺缂栬緫'
         },
         msg: {
             confirm: {
@@ -121,11 +122,13 @@
         userLogin: '鐧诲綍鏃ュ織',
         customer: '瀹㈡埛琛�',
         shipper: '璐т富淇℃伅',
-        matnr: '鐗╂枡琛�',
+        matnr: '鐗╂枡鏁版嵁',
         matnrGroup: '鐗╂枡鍒嗙粍',
         warehouse: '浠撳簱淇℃伅',
         warehouseAreas: '浠撳簱搴撳尯',
         loc: '鍩虹搴撲綅',
+        locType: '搴撲綅绫诲瀷',
+        locArea: '閫昏緫鍒嗗尯',
         container: '瀹瑰櫒绠＄悊',
         contract: '鍚堝悓淇℃伅',
         qlyInspect: '璐ㄦ淇℃伅',
@@ -280,7 +283,7 @@
             matnrGroup: {
                 name: "鍚嶇О",
                 code: "缂栫爜",
-                parentId: "鐖剁被鏍囪瘑",
+                parentId: "涓婄骇鏍囪瘑",
             },
             warehouse: {
                 name: "浠撳簱鍚嶇О",
@@ -296,6 +299,7 @@
             warehouseAreas: {
                 uuid: "鍞竴缂栫爜",
                 name: "鍚嶇О",
+                wareId: "浠撳簱",
                 code: "缂栫爜",
                 shipperId: "璐т富",
                 supplierId: "渚涘簲鍟�",
@@ -326,13 +330,16 @@
                 warehouseId: "浠撳簱",
                 areaId: "搴撳尯",
                 code: "缂栫爜",
-                type: "绫诲瀷",
+                type: "搴撲綅绫诲瀷",
                 name: "鍚嶇О",
                 flagLogic: "铏氭嫙搴撲綅",
                 fucAtrrs: "鍔熻兘灞炴��",
                 barcode: "瀹瑰櫒鐮�",
                 unit: "鍗曚綅",
                 size: "闀�/瀹�/楂�",
+                length: "闀�",
+                width: "瀹�",
+                height: "楂�",
                 row: "鎺�",
                 col: "鍒�",
                 lev: "灞�",
@@ -341,8 +348,27 @@
                 maxPack: "鏈�澶у寘瑁呮暟",
                 flagLabelMange: "鏍囩绠＄悊",
                 locAttrs: "灞炴��",
+                endBay: "缁堟鍒�",
+                endLev: "缁堟灞�",
+                endRow: "缁堟鎺�",
+                locType: "瀹界獎绫诲瀷",
+                startBay: "璧峰鍒�",
+                startLev: "璧峰灞�",
+                startRow: "璧峰鎺�",
+                useStatus: '搴撲綅鐘舵��',
+                locAreaId: '閫昏緫鍒嗗尯'
             },
-
+            locType: {
+                name: "搴撲綅绫诲瀷",
+                code: "缂栧彿",
+                regex: "瑙勫垯琛ㄨ揪寮�",
+            },
+            locArea: {
+                name: "鍚嶇О",
+                code: "缂栫爜",
+                areaId: "搴撳尯",
+                locId: "搴撲綅",
+            },
             container: {
                 code: "缂栫爜",
                 name: "鍚嶇О",
@@ -598,6 +624,12 @@
         inspection: "鎶ユ",
         creatcode: "鐢熸垚鏉＄爜",
         print: "鎵撳嵃",
+        enable: '鍚敤',
+        unenable: '绂佺敤',
+        locInit: '聽搴撲綅鍒濆鍖�',
+        batch: '鎵归噺鎿嶄綔',
+        confirm: '纭',
+        subzone: '缁戝畾鍒嗗尯'
     },
 };
 

--
Gitblit v1.9.1