From bd8f3a15f17facd2f77521da844eaf76dca22bad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 22 三月 2024 10:02:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 7a47d90..4c38e6e 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -2,12 +2,12 @@
login:{
userErr:'璇疯緭鍏ヤ綘鐨勮处鍙�',
pwErr:'璇疯緭鍏ヤ綘鐨勫瘑鐮�',
- loginSuccessful:'鐧婚檰鎴愬姛',
+ loginSuccessful:'鐧诲綍鎴愬姛',
connectErr:'鏈嶅姟鍣ㄨ繛鎺ュけ璐�',
user:'鐢ㄦ埛',
password:'瀵嗙爜',
SysName:'鍖楃幓鑷姩鍖朎RP绠＄悊绯荤粺',
- login:'鐧婚檰',
+ login:'鐧诲綍',
register:'娉ㄥ唽',
},
main:{
@@ -50,6 +50,61 @@
ReviewSuccess:'瀹℃牳鎴愬姛'
}
},
+ product:{
+ ProductHomePage:'浜у搧棣栭〉',
+ create:'鍒涘缓',
+ msg:{
+ productLength:'璇锋坊鍔犱骇鍝佽鎯�',
+ lastGlass:'浜у搧璇︽儏鏈�鍚庝竴鏉′笉鏄幓鐠冿紝璇峰畬鍠�',
+ glassType:'璇烽�夋嫨浜у搧绫诲埆',
+ saveSuccess: '鍒涘缓鎴愬姛',
+ operateSuccess: '鎿嶄綔鎴愬姛',
+ operateFail: '鎿嶄綔澶辫触',
+ glassReview:'璇疯緭鍏ヤ骇鍝佹潗鏂欏睘鎬т笌宸ヨ壓灞炴��',
+ glassRepeat:'璇峰厛閫夋嫨闂撮殧鐗�',
+ HollowReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
+ firstGlass:"璇峰厛閫夋嫨浜у搧",
+ InterlayerReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
+ glassTypeTitle:'鏉愭枡灞炴��',
+ thickness:'*鍘氬害',
+ color:'*棰滆壊',
+ craft:'*宸ヨ壓灞炴��',
+ location:'*浣嶇疆',
+ lowELocation:'LOW-E闈�',
+ processAttribute:"宸ヨ壓灞炴��",
+ hollowThickness:'*涓┖鍘氬害',
+ hollowGasType:'*鍏呮皵鏂瑰紡:',
+ hollowType:'*灏佽兌',
+ hollowGlueDepth:'*榛樿鑳舵繁:',
+ hollow:'涓┖闂撮殧鐗�',
+ hollowUpdate:'涓┖闂撮殧鐗╀慨鏀�',
+ interlayerThickness:'*澶瑰眰鍘氬害',
+ interlayerType:'*绫诲瀷',
+ interlayerColor:'*棰滆壊',
+ interlayer:'澶瑰眰闂撮殧鐗�',
+ interlayerUpdate:'澶瑰眰闂撮殧鐗╀慨鏀�',
+ glassAttribute:'鍗曠墖鐜荤拑灞炴��:',
+ reset:'閲嶇疆',
+ processFlowAttribute:'宸ヨ壓娴佺▼灞炴��:',
+ sure:'纭',
+ update:'淇敼',
+ quickSearch:'蹇�熸煡璇�',
+ weightThickness:'璁￠噸鍘氬害',
+ allThickness:'鍘氬害',
+ remarks:'澶囨敞',
+ product:'浜у搧鍚嶇О:',
+ updateGlass:'淇敼鐜荤拑',
+ updateHollow:'淇敼涓┖',
+ updateInterlayer:'淇敼澶瑰眰',
+ delete: '鍒犻櫎',
+ create:'鍒涘缓',
+ review:'瀹℃牳',
+ cancelReview:'鍙嶅',
+ }
+
+
+ },
+
order:{
orderHomePage:'璁㈠崟棣栭〉',
orderReport:'璁㈠崟鎶ヨ〃',
@@ -91,6 +146,7 @@
bendRadius:'寮挗寮у害',
edgingType:'纾ㄨ竟绫诲瀷',
import:'瀵煎叆',
+ template:'妯℃澘',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -145,6 +201,16 @@
oldProcess:'鍘熸祦绋�',
newProcess:'娴佺▼',
reset:'閲嶇疆',
+ sure:'纭畾',
+ // upperLeft:'宸︿笂',
+ // upperRight:'鍙充笂',
+ // lowLeft:'宸︿笅',
+ // lowRight:'鍙充笅',
+ // TrademarkAttribute:'鍟嗘爣鍙傛暟',
+ // TrademarkOptions:'鍟嗘爣閫夐」',
+ // xImage:'X杞撮暅鍍�',
+ // yImage:'X杞撮暅鍍�'
+
},
workOrder:{
@@ -311,6 +377,8 @@
confirmOutbound:'纭鍑哄簱',
confirmReceiptOfGoods:'纭鍏ュ簱',
quantityToBeStockedIn:'寰呭叆搴撴暟閲�',
+ return:'杩斿洖',
+ reverseReviewList:'鍙嶅鍒楄〃',
@@ -377,7 +445,7 @@
totalArea:'鎬婚潰绉�',
singlePieceArea:'鍗曠墖闈㈢Н',
perimeter:'鍛ㄩ暱',
- returnToWarehouse:'閫�鍥�',
+ returnToWarehouse:'鎾ら攢',
},
--
Gitblit v1.8.0