From 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 16:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/ru.js | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 30a5aa6..1d880d2 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -177,7 +177,8 @@
productAbbreviation:'袩褉芯写褍泻褑懈褟',
productDuplication:'浜у搧閲嶅',
- default:'榛樿'
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -284,6 +285,16 @@
valueAddedTax:'澧炲�肩◣',
cuttingTransport:'杩愯緭娑堝噺',
colourCeramicGlaze:'褰╅噳鍥惧彿',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
+
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
tableLengthNot:'袧械褌 写邪薪薪褘褏 褌邪斜谢懈褑褘',
@@ -326,6 +337,7 @@
layer:'鍗曠墖妯″紡',
notFinish:'寰呭畬鎴�',
processCardCollect:'娴佺▼鍗℃眹鎬�',
+
},
searchOrder:{
createOrder:'袙褘锌懈褋邪褌褜 蟹邪泻邪蟹',
@@ -426,7 +438,10 @@
addProcessCard:"鍒嗘灦鏂板",
printFlowCard:"娴佺▼鍗℃墦鍗�",
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
+
},
+ yesTitle:'鏈夋爣棰樻墦鍗�',
+ noTitle:'鏃犳爣棰樻墦鍗�',
buildingNumber:'妤煎彿',
longSide:'闀胯竟',
shortSide:'鐭竟',
@@ -561,7 +576,8 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
@@ -584,6 +600,9 @@
addReportingWork:"袧芯胁褘械 芯褌蟹褘胁褘",
qualityInspectionReview:"袩褉芯胁械褉泻邪 泻邪褔械褋褌胁邪",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'number',
glassAddress:'小褌械泻谢褟薪薪邪褟 屑邪褉泻懈褉芯胁泻邪',
WorkReportingManagement:'校锌褉邪胁谢械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹褜褞',
@@ -661,7 +680,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
selectWorkReportingTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
successfulModificationOfWorkApplication:'袠蟹屑械薪械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹懈 褍褋锌械褕薪芯',
@@ -963,6 +982,7 @@
userId:'袠写械薪褌懈褎懈泻邪褌芯褉 锌芯谢褜蟹芯胁邪褌械谢褟',
user:'袩芯谢褜蟹芯胁邪褌械谢懈',
setUpRoles:'袧邪褋褌褉芯泄泻邪 褉芯谢械泄',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
OldPassword:'小褌邪褉褘泄 锌邪褉芯谢褜',
TheNewPassword:'袧芯胁褘泄 锌邪褉芯谢褜',
@@ -1086,6 +1106,7 @@
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
@@ -1104,11 +1125,13 @@
qualityReport:'袨褌褔械褌 芯 泻邪褔械褋褌胁械',
productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yieldReport:'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'袨锌械褉邪褑懈懈',
inventoryArea:'小泻谢邪写褋泻邪褟 锌谢芯褖邪写褜',
pleaseSelectADateFirst:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 写邪褌褍.',
pleaseSelectAProcessFirst:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯褑械写褍褉褍.',
theFilteringTimeForExportCannotExceed180Days:'袙褉械屑褟 芯褌斜芯褉邪 薪械 屑芯卸械褌 锌褉械胁褘褕邪褌褜 180 写薪械泄.',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'袙褉械屑褟 蟹邪泻邪蟹邪',
deliveryDate:'袛邪褌邪 锌芯褋褌邪胁泻懈',
completedQuantity:'袣芯谢懈褔械褋褌胁芯 胁褘锌芯谢薪械薪薪褘褏',
@@ -1133,7 +1156,9 @@
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
--
Gitblit v1.8.0