From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/ru.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 9433c19..073c2ed 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -68,6 +68,8 @@
max255:"袙胁械写懈褌械 255 褋懈屑胁芯谢芯胁.",
range99999Dec2:
"袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 99999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
+ range99999Dec3:
+ "袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0-9999999 懈 褋芯褏褉邪薪懈褌械 写芯 褌褉械褏 写械褋褟褌懈褔薪褘褏 褌芯褔械泻.",
range999999Dec2:
"袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 999999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
greater0:"袙胁械写懈褌械 褑械谢芯械 褔懈褋谢芯 斜芯谢褜褕械 0",
@@ -228,6 +230,8 @@
sheet3:'娴忚鍙戣揣淇℃伅',
sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
oneClickStorage:'涓�閿畬宸�',
+
+ quantityMount:'鏁伴噺閲戦',
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
tableLengthNot:'袧械褌 写邪薪薪褘褏 褌邪斜谢懈褑褘',
@@ -252,6 +256,7 @@
calculationAreaPrompt5:'袩芯胁褌芯褉懈褌褜 蟹邪泻邪蟹 小芯蟹写邪褌褜',
pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
+ grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
}
},
@@ -287,6 +292,7 @@
totalArea:'袨斜褖懈泄 褉邪蟹屑械褉',
childWidth:'楔懈褉懈薪邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
childHeight:'袙褘褋芯褌邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
+ arc:'袛谢懈薪邪 写褍谐懈',
area:'袪邪蟹屑械褉 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
process:'孝械褏薪芯谢芯谐懈褔械褋泻懈泄 锌褉芯褑械褋褋',
orderDetail:'袩芯写褉芯斜薪芯褋褌懈 蟹邪泻邪蟹邪',
@@ -412,7 +418,8 @@
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
addAutomatically:'鑷姩濉厖',
- selectFill:'鑷姩濉厖'
+ selectFill:'鑷姩濉厖',
+ engineeringPrinting:'宸ョ▼鎵撳嵃'
},
reportingWorks:{
glassNumber:'number',
@@ -608,6 +615,8 @@
endOperationOrderNumber:'袧芯屑械褉 蟹邪泻邪蟹邪 薪邪 蟹邪胁械褉褕械薪懈械 芯锌械褉邪褑懈懈',
typeClaim:'孝懈锌 锌芯谢褍褔械薪懈褟',
+ pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+
},
customer:{
@@ -671,6 +680,10 @@
money:'小褍屑屑邪',
pleaseSelectTheSameCustomerProject:'璇烽�夋嫨鐩稿悓瀹㈡埛鐨勯」鐩�',
+ noMoney:'鏃犻噾棰�',
+ freightPrice:'杩愯垂鍗曚环',
+ freightQuantity:'杩愯垂鏁伴噺',
+ freight:'杩愯垂閲戦',
},
replenish:{
@@ -933,6 +946,41 @@
inconsistentParameters :'袨斜褟蟹邪褌械谢褜薪褘械 锌邪褉邪屑械褌褉褘 薪械 褋芯胁锌邪写邪褞褌',
strip :'小褌邪褌褜褟',
exportSelected :'协泻褋锌芯褉褌懈褉芯胁邪褌褜 胁褘写械谢械薪懈械',
+ },
+
+ menu:{
+ "1" :'袩褉芯写邪卸邪 懈 褉邪褋锌褉械写械谢械薪懈械',
+ "2" :'袩褉芯懈蟹胁芯写褋褌胁芯 懈 锌谢邪薪懈褉芯胁邪薪懈械',
+ "3" :'袟邪泻褍锌泻懈 懈 屑邪褌械褉懈邪谢褘',
+ "4" :'袩芯谢褜蟹芯胁邪褌械谢懈 懈 锌褉邪胁邪 写芯褋褌褍锌邪',
+
+ product :'校锌褉邪胁谢械薪懈械 褌芯胁邪褉薪褘屑懈 蟹邪锌邪褋邪屑懈',
+ order :'校锌褉邪胁谢械薪懈械 蟹邪泻邪蟹邪屑懈',
+ delivery :'校锌褉邪胁谢械薪懈械 写芯褋褌邪胁泻芯泄',
+ returns :'校锌褉邪胁谢械薪懈械 胁芯蟹胁褉邪褌芯屑',
+ Customer :'袠薪褎芯褉屑邪褑懈褟 芯 泻谢懈械薪褌邪褏',
+ workOrder :'校锌褉邪胁谢械薪懈械 褉邪斜芯褔械泄 写芯泻褍屑械薪褌邪褑懈械泄',
+ processCard :'校锌褉邪胁谢械薪懈械 泻邪褉褌邪屑懈 锌褉芯褑械褋褋芯胁',
+ reportingWorks :'校锌褉邪胁谢械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹褜褞',
+ rework :'校锌褉邪胁谢械薪懈械 锌械褉械褉邪斜芯褌泻芯泄',
+ replenish :'校锌褉邪胁谢械薪懈械 写芯锌芯谢薪懈褌械谢褜薪褘屑 褋褌械泻谢芯屑',
+ machine :'校锌褉邪胁谢械薪懈械 芯斜芯褉褍写芯胁邪薪懈械屑',
+ bOM :'校锌褉邪胁谢械薪懈械 BOM',
+ report :'校锌褉邪胁谢械薪懈械 芯褌褔械褌邪屑懈',
+ ProductStock :'袟邪锌邪褋褘 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
+ ingredientsStock :'袟邪锌邪褋褘 屑邪褌械褉懈邪谢芯胁',
+ ingredients :'袦邪褌械褉懈邪谢褜薪褘械 写邪薪薪褘械',
+ trader :'校锌褉邪胁谢械薪懈械 锌芯褋褌邪胁褖懈泻邪屑懈',
+ stockReport :'孝邪斜谢懈褑邪 蟹邪锌邪褋芯胁',
+ purchaseOrder :'袟邪泻褍锌芯褔薪褘械 蟹邪泻邪蟹褘',
+ purchaseStorage :'袟邪泻褍锌泻懈 薪邪 褋泻谢邪写械',
+ purchaseReturn :'袙芯蟹胁褉邪褌 锌芯泻褍锌芯泻',
+ orderBasicData :'袨褋薪芯胁褘 蟹邪泻邪蟹邪',
+ productionBasicData :'袨褋薪芯胁邪 锌褉芯懈蟹胁芯写褋褌胁邪',
+ warehouseBasicData :'袘邪蟹邪 蟹邪锌邪褋芯胁',
+ user :'小锌懈褋芯泻 锌芯谢褜蟹芯胁邪褌械谢械泄',
+ role :'袩褉邪胁邪 薪邪 褉芯谢褜',
+ userPassWord :'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
}
--
Gitblit v1.8.0