From bab2a5491fd54c758b3225c5d5cf2a6f3ca85182 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 03 十二月 2024 17:13:12 +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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 7502338..d562521 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -464,6 +464,7 @@
merge:'鍚堝苟',
printQuantity:'鎵撳嵃鏁�',
printWarn1:'鎵撳嵃鏁伴噺涓嶈兘澶т簬璁㈠崟鏁伴噺'
+
},
reportingWorks:{
page:{
@@ -544,6 +545,7 @@
thisWornQuantity:'协褌芯 锌褉芯褑械褋褋 锌芯胁褉械卸写械薪懈械 ',
passAudit:'袩褉芯胁械褉泻邪 锌褉芯褕谢邪',
patchCondition:'琛ョ墖鐘舵��',
+
selectResponsibleTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
selectWorkReportingTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
@@ -706,10 +708,10 @@
},
delivery:{
page:{
- selectDelivery:'鍙戣揣棣栭〉',
- selectOrderList:"璁㈠崟鍙戣揣 ",
- shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
- shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
+ selectDelivery:'袨褌锌褉邪胁泻邪 袧邪褔邪谢褜薪邪褟 褋褌褉邪薪懈褑邪',
+ selectOrderList:"袨褌锌褉邪胁泻邪 蟹邪泻邪蟹芯胁 ",
+ shipmentDetailsReport:"小锌械褑懈褎懈泻邪褑懈褟 芯褌谐褉褍蟹泻懈 ",
+ shipmentProductClassificationReport:"袨褌褔械褌 芯 泻谢邪褋褋懈褎懈泻邪褑懈懈 芯褌谐褉褍卸械薪薪芯泄 锌褉芯写褍泻褑懈懈 ",
createDelivery:'鍙戣揣鍒涘缓',
deliveryReport:'鍙戣揣鎶ヨ〃'
},
@@ -795,7 +797,7 @@
roleList:'袩械褉褋芯薪邪卸懈 袧邪褔邪谢褜薪邪褟 褋褌褉邪薪懈褑邪',
},
id:'ID',
- characterHomepage:'瑙掕壊棣栭〉',
+ characterHomepage:'袩械褉褋芯薪邪卸懈 袧邪褔邪谢褜薪邪褟 褋褌褉邪薪懈褑邪',
role:'袪芯谢褜',
roleAdd:'校胁械谢懈褔械薪懈械 褉芯谢懈',
menu:'袦械薪褞',
@@ -807,7 +809,6 @@
PleaseEnterANewRole:'袙胁械写懈褌械 薪芯胁褍褞 褉芯谢褜.',
AddANewRole:'袛芯斜邪胁懈褌褜 褉芯谢褜',
CannotBeEmptyAndTheLengthCannotExceed255:'袨薪 薪械 写芯谢卸械薪 斜褘褌褜 锌褍褋褌褘屑 懈 薪械 写芯谢卸械薪 锌褉械胁褘褕邪褌褜 255',
-
},
user:{
page:{
@@ -874,7 +875,7 @@
},
machine:{
page:{
- selectMachine:'璁惧绠＄悊',
+ selectMachine:'孝懈锌 懈褋褏芯写褟褖械谐芯 屑邪褌械褉懈邪谢邪',
addMachine:"校胁械谢懈褔械薪懈械 泻芯谢懈褔械褋褌胁邪 芯斜芯褉褍写芯胁邪薪懈褟",
maintenanceAndRepair:"孝械褏薪懈褔械褋泻芯械 芯斜褋谢褍卸懈胁邪薪懈械 懈 褉械屑芯薪褌",
addMaintenanceAndRepair:"孝械褏薪懈褔械褋泻芯械 芯斜褋谢褍卸懈胁邪薪懈械 懈 褉械屑芯薪褌"
@@ -1157,4 +1158,6 @@
addProduce:'閫夋嫨浜у搧',
reorder:'杞鍗�'
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0