From caf567becb6378f848b3b930821a4b38cb7564a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 12:43:20 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/ru.js |   92 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 92 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 7f6b65b..de6a7b9 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -57,10 +57,21 @@
         print:'袩械褔邪褌褜',
         export:'协泻褋锌芯褉褌',
         empty:'袨褔懈褋褌懈褌褜',
+
+        incrementalAll:'涔嬪悗閫掑',
+        incrementalChecked:'閫変腑閫掑',
+        true:'鏄�',
+        false:'鍚�',
+        computedSize:'绉戝璁℃暟',
+        paste:'绮樿创',
         msg:{
             max255:"袙胁械写懈褌械 255 褋懈屑胁芯谢芯胁.",
             range99999Dec2:
                 "袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 99999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
+            range99999Dec3:
+                "袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0-9999999 懈 褋芯褏褉邪薪懈褌械 写芯 褌褉械褏 写械褋褟褌懈褔薪褘褏 褌芯褔械泻.",
+            range999999Dec2:
+                "袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 999999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
             greater0:"袙胁械写懈褌械 褑械谢芯械 褔懈褋谢芯 斜芯谢褜褕械 0",
             checkoutLose:'袩褉芯胁械褉泻邪 薪械 锌褉芯褕谢邪',
             saveSuccess:'小芯褏褉邪薪懈褌褜 褍褋锌械褕薪芯',
@@ -72,6 +83,7 @@
             deleteSuccess:'校写邪谢懈褌褜 褍褋锌械褕薪芯',
             deleteFail:'袨褕懈斜泻邪 褍写邪谢械薪懈褟',
             cancelReviewFail:'袨褌屑械薪懈褌褜 锌褉芯胁械褉泻褍 芯褕懈斜泻邪',
+            cancelReviewFailWork:'袣芯薪褌褉褋褍写械斜薪芯械 褉邪蟹斜懈褉邪褌械谢褜褋褌胁芯 薪械 褍写邪谢芯褋褜',
             reviewFail:'袨褕懈斜泻邪 邪褍写懈褌邪',
             noProductDataInTheTable:'袛邪薪薪褘械 芯 锌褉芯写褍泻褌邪褏 芯褌褋褍褌褋褌胁褍褞褌 胁 褌邪斜谢懈褑械',
             tableDataExceedsMaximumLimit:'袛邪薪薪褘械 褌邪斜谢懈褑褘 锌褉械胁褘褕邪褞褌 屑邪泻褋懈屑邪谢褜薪褘泄 谢懈屑懈褌',
@@ -91,6 +103,8 @@
         typeName:'袣邪褌械谐芯褉懈褟',
         query:'袘褘褋褌褉褘泄 蟹邪锌褉芯褋',
         creator:'小芯蟹写邪褌械谢褜',
+
+        usingAbbreviations:'袠褋锌芯谢褜蟹芯胁邪薪懈械 褋芯泻褉邪褖械薪懈泄',
         msg:{
             productLength:'袩芯卸邪谢褍泄褋褌邪, 写芯斜邪胁褜褌械 锌芯写褉芯斜薪褍褞 懈薪褎芯褉屑邪褑懈褞 芯 锌褉芯写褍泻褌械',
             lastGlass:'袩芯褋谢械写薪械泄 写械褌邪谢褜褞 锌褉芯写褍泻褌邪 褟胁谢褟械褌褋褟 薪械 褋褌械泻谢芯. 袩芯卸邪谢褍泄褋褌邪, 蟹邪泻芯薪褔懈褌械.',
@@ -141,6 +155,7 @@
             theProductHasBeenReviewedAndCannotBeDeleted:'袩褉芯写褍泻褑懈褟 锌褉芯胁械褉械薪邪 懈 薪械 屑芯卸械褌 斜褘褌褜 褍写邪谢械薪邪',
 
             productAbbreviation:'袩褉芯写褍泻褑懈褟',
+            productDuplication:'浜у搧閲嶅',
         }
     },
     order:{
@@ -206,6 +221,18 @@
         orderDetailsSummaryReport:'小胁芯写薪褘泄 芯褌褔械褌 芯 蟹邪泻邪蟹邪褏',
         buildingNumber:'袧芯屑械褉 褝褌邪卸邪',
         saveHeader:'袠蟹屑械薪懈褌褜 蟹邪谐芯谢芯胁芯泻 褌邪斜谢懈褑褘',
+
+        orderNotApproved:'璁㈠崟鏈鏍�',
+        orderHasBeenReceived:'璁㈠崟宸插叆搴�',
+        printingNumber:'鎵撳嵃娆℃暟',
+        processingOrder:'鍔犲伐鍗�',
+        sheet2:'妯増-澶氬眰鏄庣粏',
+        sheet4:'鐢熶骇鍔犲伐鍗曠旱鐗�',
+        sheet3:'娴忚鍙戣揣淇℃伅',
+        sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
+        oneClickStorage:'涓�閿畬宸�',
+
+        quantityMount:'鏁伴噺閲戦',
         msg:{
             productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
             tableLengthNot:'袧械褌 写邪薪薪褘褏 褌邪斜谢懈褑褘',
@@ -228,6 +255,9 @@
             calculationAreaPrompt4:'袪邪褋褔械褌',
             warning:'袩芯写褋泻邪蟹泻邪',
             calculationAreaPrompt5:'袩芯胁褌芯褉懈褌褜 蟹邪泻邪蟹 小芯蟹写邪褌褜',
+
+            pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
+            grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
         }
 
     },
@@ -263,6 +293,7 @@
         totalArea:'袨斜褖懈泄 褉邪蟹屑械褉',
         childWidth:'楔懈褉懈薪邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
         childHeight:'袙褘褋芯褌邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
+        arc:'袛谢懈薪邪 写褍谐懈',
         area:'袪邪蟹屑械褉 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
         process:'孝械褏薪芯谢芯谐懈褔械褋泻懈泄 锌褉芯褑械褋褋',
         orderDetail:'袩芯写褉芯斜薪芯褋褌懈 蟹邪泻邪蟹邪',
@@ -370,9 +401,11 @@
         deleteNo:'袨褕懈斜泻邪 褍写邪谢械薪懈褟, 锌褉芯胁械褉褜褌械 芯斜褉邪褌薪褍褞 褋胁褟蟹褜 泻邪褉褌褘 锌褉芯褑械褋褋邪',
         deleteNoProcedure:'袨褕懈斜泻邪 褍写邪谢械薪懈褟, 锌褉芯胁械褉褜褌械 芯斜褉邪褌薪褍褞 褋胁褟蟹褜 芯锌械褉邪褑懈懈',
         pleaseCheckTheRequiredData:'袙褘斜械褉懈褌械 薪械芯斜褏芯写懈屑褘械 写邪薪薪褘械.',
+        landingSequence:'Landing sequence',
 
         labelStyle:'小褌懈谢褜 屑械褌泻懈',
         customLabelPrinting:'袧邪褋褌褉芯泄泻邪 锌械褔邪褌懈 胁泻谢邪写芯泻',
+        labelPrinting:'鏍囩鎵撳嵃',
         sortingSuccessful:'小芯褉褌懈褉芯胁邪褌褜 褍褋锌械褕薪芯',
         sorting:'小芯褉褌懈褉芯胁泻邪',
         pleaseSelect:'袙褘斜械褉懈褌械',
@@ -382,8 +415,15 @@
         finishedProductLabel:'袦邪褉泻懈褉芯胁泻邪 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
         halfProductLabel:'袦邪褉泻懈褉芯胁泻邪 锌芯谢褍褎邪斜褉懈泻邪褌芯胁',
         pleaseSelectCustomPrintLabelStyle:'袙褘斜械褉懈褌械 写褉褍谐芯泄 褋褌懈谢褜 褝褌懈泻械褌泻懈',
+        mergePrinting:'小谢懈褟薪懈械 锌械褔邪褌懈',
+        printStatus:'鎵撳嵃娆℃暟',
+        labelPrinting2:'鏍囩鎵撳嵃2',
+        addAutomatically:'鑷姩濉厖',
+        selectFill:'鑷姩濉厖',
+        engineeringPrinting:'宸ョ▼鎵撳嵃'
     },
     reportingWorks:{
+        glassNumber:'number',
         glassAddress:'小褌械泻谢褟薪薪邪褟 屑邪褉泻懈褉芯胁泻邪',
         WorkReportingManagement:'校锌褉邪胁谢械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹褜褞',
         addReportingWorks:'袧芯胁褘械 芯褌蟹褘胁褘',
@@ -576,6 +616,8 @@
         endOperationOrderNumber:'袧芯屑械褉 蟹邪泻邪蟹邪 薪邪 蟹邪胁械褉褕械薪懈械 芯锌械褉邪褑懈懈',
         typeClaim:'孝懈锌 锌芯谢褍褔械薪懈褟',
 
+        pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+
 
     },
     customer:{
@@ -638,6 +680,12 @@
         salesman:'袩褉芯写邪卸',
         money:'小褍屑屑邪',
 
+        pleaseSelectTheSameCustomerProject:'璇烽�夋嫨鐩稿悓瀹㈡埛鐨勯」鐩�',
+        noMoney:'鏃犻噾棰�',
+        freightPrice:'杩愯垂鍗曚环',
+        freightQuantity:'杩愯垂鏁伴噺',
+        freight:'杩愯垂閲戦',
+
     },
     replenish:{
         patchManagement:'校锌褉邪胁谢械薪懈械 褋褌械泻谢褟薪薪褘屑懈 锌谢邪褋褌懈薪邪屑懈',
@@ -695,6 +743,10 @@
         ConfirmPasswordCannotBeEmpty:'袩邪褉芯谢褜 锌芯写褌胁械褉卸写械薪懈褟 薪械 屑芯卸械褌 斜褘褌褜 锌褍褋褌褘屑',
         TheTwoPasswordsAreNotTheSame:'袛胁邪 褉邪蟹薪褘褏 锌邪褉芯谢褟.',
         OldPasswordError:'小褌邪褉邪褟 芯褕懈斜泻邪 锌邪褉芯谢褟',
+
+        userName:'鐢ㄦ埛鍚嶇О',
+        changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
+        userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
     },
     orderBasicData:{
         order:'袟邪泻邪蟹褘',
@@ -727,6 +779,11 @@
         level:'袣邪褌械谐芯褉懈褟',
         firstLevel:'袣邪褌械谐芯褉懈褟 I',
         towLevel:'袣邪褌械谐芯褉懈褟 II',
+        alias:'袠屑褟',
+        msg1:'涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 5MB!',
+        msg2:'涓婁紶澶村儚鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!',
+        selectFile:'閫夊彇鏂囦欢',
+        msg3:'鍙兘涓婁紶jpg/png鏂囦欢,涓斾笉瓒呰繃5m',
     },
     machine:{
         basicId:'袧芯屑械褉 芯斜芯褉褍写芯胁邪薪懈褟',
@@ -890,6 +947,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