From e6af1100ab9b98b142ce2e0b158f5416f499628b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 15:38:08 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 3a328f8..2f2f96b 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -13,8 +13,8 @@
id: 'ID',
uuid: '缂栧彿',
name: '鍚嶇О',
- createTime: '娣诲姞鏃堕棿',
- createBy: '娣诲姞浜哄憳',
+ createTime: '鍒涘缓鏃堕棿',
+ createBy: '鍒涘缓浜哄憳',
updateTime: '淇敼鏃堕棿',
updateBy: '淇敼浜哄憳',
status: '鐘舵��',
@@ -122,11 +122,11 @@
userLogin: '鐧诲綍鏃ュ織',
customer: '瀹㈡埛琛�',
shipper: '璐т富淇℃伅',
- matnr: '鐗╂枡鏁版嵁',
+ matnr: '鐗╂枡',
matnrGroup: '鐗╂枡鍒嗙粍',
- warehouse: '浠撳簱淇℃伅',
- warehouseAreas: '浠撳簱搴撳尯',
- loc: '鍩虹搴撲綅',
+ warehouse: '浠撳簱',
+ warehouseAreas: '搴撳尯',
+ loc: '搴撲綅',
locType: '搴撲綅绫诲瀷',
locArea: '閫昏緫鍒嗗尯',
container: '瀹瑰櫒绠＄悊',
@@ -355,10 +355,12 @@
startBay: "璧峰鍒�",
startLev: "璧峰灞�",
startRow: "璧峰鎺�",
- useStatus: '搴撲綅鐘舵��'
+ useStatus: '搴撲綅鐘舵��',
+ locAreaId: '閫昏緫鍒嗗尯'
},
locType: {
name: "搴撲綅绫诲瀷",
+ code: "缂栧彿",
regex: "瑙勫垯琛ㄨ揪寮�",
},
locArea: {
@@ -627,6 +629,7 @@
locInit: '聽搴撲綅鍒濆鍖�',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ subzone: '缁戝畾鍒嗗尯'
},
};
--
Gitblit v1.9.1