From 896424535eedd5da407d2e1d58bda8e1ea588145 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 26 九月 2024 12:35:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 7deec49..f322edc 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -95,8 +95,10 @@
}
},
product:{
- ProductHomePage:'浜у搧棣栭〉',
- create:'鍒涘缓',
+ page:{
+ selectProduct:'浜у搧棣栭〉',
+ createProduct:'鍒涘缓',
+ },
coloredGlaze:'褰╅噳',
frostedSand:'钂欑爞',
coating:'闀�鑶�',
@@ -163,8 +165,14 @@
}
},
order:{
- orderHomePage:'璁㈠崟棣栭〉',
- orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ page:{
+ selectOrder:'璁㈠崟棣栭〉',
+ createOrder:'鍒涘缓',
+ orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+ orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+ updateOrderCraft:'宸ヨ壓瀹℃牳'
+ },
project:'椤圭洰鍚嶇О',
orderId:'閿�鍞崟鍙�',
money:'鎬婚噾棰�',
@@ -210,7 +218,7 @@
areaAmountPerPiece:'闈㈢Н閲戦锛堝崟鐗囷級',
areaAmountAge:'闈㈢Н閲戦锛堟�婚潰绉級',
errorValue:'璇樊鍊�',
- orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+
details:'璇︽儏',
workmanship:'宸ヨ壓',
processCard:'娴佺▼鍗�',
@@ -237,7 +245,7 @@
oneClickStorage:'涓�閿畬宸�',
quantityMount:'鏁伴噺閲戦',
- orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -630,6 +638,11 @@
},
customer:{
+ page:{
+ selectCustomer:'瀹㈡埛棣栭〉',
+ createCustomer:'瀹㈡埛鏂板',
+ selectCustomerOrder:'瀹㈡埛璁㈠崟'
+ },
pleaseEnterTheCustomerName:'璇疯緭鍏ュ鎴峰悕绉�',
pleaseEnterCustomerLevel:"璇疯緭鍏ュ鎴风瓑绾� ",
pleaseEnterTheAmountOfFunds:'璇疯緭鍏ラ噾棰濋搴�',
@@ -643,8 +656,6 @@
telephone:"鑱旂郴鐢佃瘽 ",
customerNumber:'瀹㈡埛缂栧彿',
customerName:"瀹㈡埛鍚嶇О ",
- customerHomePage:'瀹㈡埛棣栭〉',
- increaseCustomers:'瀹㈡埛鏂板',
resetting:'閲嶇疆',
customerOrders:'瀹㈡埛璁㈠崟',
orderAmount:'璁㈠崟閲戦',
@@ -653,6 +664,14 @@
pleaseEnterTheCustomerAbbreviation:'璇疯緭鍏ュ鎴风畝绉�',
},
delivery:{
+ page:{
+ selectDelivery:'鍙戣揣棣栭〉',
+ selectOrderList:"璁㈠崟鍙戣揣 ",
+ shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
+ shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
+ createDelivery:'鍙戣揣鍒涘缓',
+ deliveryReport:'鍙戣揣鎶ヨ〃'
+ },
delivery:'鍙戣揣',
place :'涓嬪崟',
technology:'宸ヨ壓',
@@ -677,13 +696,9 @@
shippingAddress:'閫佽揣鍦板潃',
deliveryReportDate:'鍙戣揣鎶ヨ〃鏃ユ湡',
shipper:"鍙戣揣鍛� ",
- shippingHomepage:'鍙戣揣棣栭〉',
- orderShipment:"璁㈠崟鍙戣揣 ",
deliveryNoteId:'鍙戣揣鍗曞彿',
deliveryNoteNumber:'鍙戣揣搴忓彿',
deliveryDate:"鍙戣揣鏃ユ湡 ",
- shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
- shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
contacts:'鑱旂郴浜�',
contactNumber:'鑱旂郴鐢佃瘽',
salesman:'閿�鍞憳',
@@ -758,6 +773,10 @@
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'鍩虹绫诲瀷',
+ searchGlassType:'鐜荤拑绫诲埆',
+ },
order:'璁㈠崟',
orderType:'璁㈠崟绫诲瀷',
orderClassify:'璁㈠崟鍒嗙被',
@@ -782,9 +801,7 @@
paymentTerms:'浠樻鏉′欢',
payMethod:'鏀舵鏂瑰紡',
delivery:'閫佽揣',
- basicType:'鍩虹绫诲瀷',
name:'鍚嶇О',
- glassCategory:'鐜荤拑绫诲埆',
level:'绫诲埆绛夌骇',
firstLevel:'涓�绾х被鍒�',
towLevel:'浜岀骇绫诲埆',
--
Gitblit v1.8.0