From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/zh.js | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 8907d38..bf0ba96 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,8 +107,7 @@
menu: {
dashboard: '鎺у埗鍙�',
settings: '涓汉璁剧疆',
- basicSettings: '鍩虹璁剧疆',
- pakin: '缁勬墭',
+ basicInfo: '鍩虹淇℃伅',
system: '绯荤粺璁剧疆',
user: '鐢ㄦ埛绠＄悊',
role: '瑙掕壊绠＄悊',
@@ -124,6 +123,9 @@
shipper: '璐т富淇℃伅',
matnr: '鐗╂枡琛�',
matnrGroup: '鐗╂枡鍒嗙粍',
+ warehouse: '浠撳簱淇℃伅',
+ warehouseAreas: '浠撳簱搴撳尯',
+
},
table: {
@@ -238,7 +240,7 @@
code: "鐗╂枡缂栫爜",
shipperId: "璐т富鏍囪瘑",
groupId: "鍒嗙粍鏍囪瘑",
- batchRegularId: "鎵规瑙勫垯鏍囪瘑",
+ rglarId: "鎵规瑙勫垯鏍囪瘑",
erpCode: "ERP缂栫爜",
spec: "瑙勬牸",
model: "鍨嬪彿",
@@ -248,16 +250,16 @@
describle: "鎻忚堪",
nromNum: "鏍囧寘鏁伴噺",
unit: "鍗曚綅",
- purchaseUnit: "閲囪喘鍗曚綅",
+ purUnit: "閲囪喘鍗曚綅",
stockUnit: "搴撳瓨鍗曚綅",
- stockLeval: "ABC鍒嗙被",
+ stockLevel: "ABC鍒嗙被",
isLabelMange: "鏍囩绠＄悊",
- safetyQty: "瀹夊叏鍊�",
+ safeQty: "瀹夊叏鍊�",
minQty: "鏈�灏忓��",
maxQty: "鏈�澶у��",
- stagnate: "鍋滄粸棰勮鍊�",
- validity: "淇濊川鏈�",
- validityWarr: "鏁堟湡棰勮",
+ stagn: "鍋滄粸棰勮鍊�",
+ valid: "淇濊川鏈�",
+ validWarn: "鏁堟湡棰勮",
flagCheck: "鍏嶆",
},
matnrGroup: {
@@ -265,6 +267,27 @@
code: "缂栫爜",
parentId: "鐖剁被鏍囪瘑",
},
+ warehouse: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ factory: "宸ュ巶",
+ address: "鍦板潃",
+ longitude: "缁忓害",
+ latgitude: "绾害",
+ length: "闀�",
+ width: "瀹�",
+ height: "楂�",
+ },
+ warehouseAreas: {
+ uuid: "鍞竴缂栫爜",
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ shipperId: "璐т富",
+ supplierId: "渚涘簲鍟�",
+ flagMinus: "鍏佽璐熷簱瀛�",
+ flagLabelMange: "鏍囩绠＄悊",
+ flagMix: "娣锋斁",
+ },
}
},
page: {
--
Gitblit v1.9.1