From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 52b0289..e97f90b 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -76,6 +76,7 @@
remarks2:'澶囨敞2',
remarks3:'澶囨敞3',
remarks4:'澶囨敞4',
+ otherColumns:'鍏朵粬鍒�',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
max10:"鏈�澶氳緭鍏�10涓瓧绗�",
@@ -327,7 +328,24 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
- updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒',
+ pleaseProcessType:'璇烽�夋嫨纾ㄨ竟绫诲瀷',
+ pleaseUploadPicture1:"璇峰厛閫夋嫨瑕佷笂浼犵殑DWG鏂囦欢鎴栧浘鐗囨枃浠�",
+ pleaseUploadPicture2:"鍑嗗涓婁紶...",
+ pleaseUploadPicture3:"涓婁紶涓�...",
+ pleaseUploadPicture4:"涓婁紶瀹屾垚!",
+ pleaseUploadPicture5:"涓婁紶澶辫触!",
+ pleaseUploadPicture6:"璇烽�夋嫨DWG鏂囦欢鎴朖PG銆丳NG鏍煎紡鐨勫浘鐗囨枃浠�",
+ pleaseUploadPicture7:"鏂囦欢澶у皬涓嶈兘瓒呰繃50MB",
+ pleaseUploadPicture8:"宸查�夋嫨鏂囦欢:",
+ pleaseUploadPicture9:"鏂囦欢涓婁紶",
+ pleaseUploadPicture10:"鎷栨嫿鏂囦欢鍒版澶勬垨",
+ pleaseUploadPicture11:"鐐瑰嚮閫夋嫨鏂囦欢",
+ pleaseUploadPicture12:"浠呮敮鎸� .dwg銆�.jpg銆�.png 鏍煎紡鏂囦欢锛屼笖鏂囦欢澶у皬涓嶈秴杩�50MB",
+ pleaseUploadPicture13:"涓婁紶杩涘害",
+ pleaseUploadPicture14:"涓婁紶缁撴灉",
+ pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
+ pleaseUploadPicture16:"涓嬭浇",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
@@ -337,6 +355,7 @@
layer:'鍗曠墖妯″紡',
notFinish:'寰呭畬鎴�',
processCardCollect:'娴佺▼鍗℃眹鎬�',
+ fileUpload:'鏂囦欢涓婁紶'
},
searchOrder:{
@@ -364,7 +383,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
@@ -576,13 +596,16 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
print2:'6琛�3鍒�',
+ glassId:'鐜荤拑缂栧彿',
+ polysId:'灏忕墖搴忓彿',
msg:{
msg1:'娴佺▼鍗″垱寤哄け璐�',
msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
@@ -679,7 +702,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'璇烽�夋嫨璐ｄ换鐝粍',
selectWorkReportingTeam:'璇烽�夋嫨璐ｄ换鐝粍',
successfulModificationOfWorkApplication:'鎶ュ伐淇敼鎴愬姛',
@@ -913,6 +936,7 @@
pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+ orderAdd:'璁㈠崟娣诲姞',
},
replenish:{
@@ -998,10 +1022,19 @@
changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
+ userLog:{
+ page:{
+ userListLog:'鏃ュ織棣栭〉',
+ },
+ loginName:'鐧诲綍鍚�',
+ userName:'鐢ㄦ埛鍚�',
+ loginDate:'鐧诲綍鏃堕棿',
+ },
orderBasicData:{
page:{
searchOrderBasicData:'鍩虹绫诲瀷',
searchGlassType:'鐜荤拑绫诲埆',
+ searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
},
glassCategory:'鐜荤拑绫诲埆',
order:'璁㈠崟',
@@ -1042,6 +1075,9 @@
laminatingProcessB:'涓┖鍚庡悎鐗囧伐搴�',
laminatingProcessC:'澶硅兌宸ュ簭',
laminatingProcessD:'涓┖宸ュ簭',
+ please1:'璇烽�夋嫨绫诲埆',
+ please2:'璇疯緭鍏ュ悕绉�',
+ please3:'璇疯緭鍏ュ埆鍚�',
},
machine:{
page:{
@@ -1157,7 +1193,8 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
},
productionBasicData:{
@@ -1332,7 +1369,8 @@
userPassWord :'淇敼瀵嗙爜',
glassPrice:'鐜荤拑浠锋牸',
glassOptimize:'鐜荤拑浼樺寲',
- finishedGlassShelf:'鎴愬搧鏂欐灦'
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
--
Gitblit v1.8.0