From c2e6fd5492f27d9c3a9786905036bb89518c7c4a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 10:45:16 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/i18n/zh.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 6319e61..7044fee 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -129,7 +129,8 @@
loc: '搴撲綅',
locType: '搴撲綅绫诲瀷',
locArea: '閫昏緫鍒嗗尯',
- locAreaMatRela: '鐗╂枡缁戝畾',
+ locAreaMat: '閫昏緫鍒嗗尯',
+ locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
@@ -300,7 +301,7 @@
warehouseAreas: {
uuid: "鍞竴缂栫爜",
name: "鍚嶇О",
- wareId: "浠撳簱",
+ wareId: "鎵�灞炰粨搴�",
code: "缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
@@ -328,8 +329,8 @@
splrBtch: "渚涘簲鍟嗘壒娆�",
},
loc: {
- warehouseId: "浠撳簱",
- areaId: "搴撳尯",
+ warehouseId: "鎵�灞炰粨搴�",
+ areaId: "鎵�灞炲簱鍖�",
code: "缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
@@ -370,6 +371,10 @@
areaId: "搴撳尯",
locId: "搴撲綅",
},
+ locAreaMat: {
+ code: "閫昏緫缂栫爜",
+ depict: "閫昏緫鎻忚堪",
+ },
locAreaMatRela: {
areaId: "搴撳尯",
code: "缂栫爜",
--
Gitblit v1.9.1