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 |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 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 3634c1a..de6a7b9 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -83,6 +83,7 @@
             deleteSuccess:'校写邪谢懈褌褜 褍褋锌械褕薪芯',
             deleteFail:'袨褕懈斜泻邪 褍写邪谢械薪懈褟',
             cancelReviewFail:'袨褌屑械薪懈褌褜 锌褉芯胁械褉泻褍 芯褕懈斜泻邪',
+            cancelReviewFailWork:'袣芯薪褌褉褋褍写械斜薪芯械 褉邪蟹斜懈褉邪褌械谢褜褋褌胁芯 薪械 褍写邪谢芯褋褜',
             reviewFail:'袨褕懈斜泻邪 邪褍写懈褌邪',
             noProductDataInTheTable:'袛邪薪薪褘械 芯 锌褉芯写褍泻褌邪褏 芯褌褋褍褌褋褌胁褍褞褌 胁 褌邪斜谢懈褑械',
             tableDataExceedsMaximumLimit:'袛邪薪薪褘械 褌邪斜谢懈褑褘 锌褉械胁褘褕邪褞褌 屑邪泻褋懈屑邪谢褜薪褘泄 谢懈屑懈褌',
@@ -292,6 +293,7 @@
         totalArea:'袨斜褖懈泄 褉邪蟹屑械褉',
         childWidth:'楔懈褉懈薪邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
         childHeight:'袙褘褋芯褌邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
+        arc:'袛谢懈薪邪 写褍谐懈',
         area:'袪邪蟹屑械褉 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
         process:'孝械褏薪芯谢芯谐懈褔械褋泻懈泄 锌褉芯褑械褋褋',
         orderDetail:'袩芯写褉芯斜薪芯褋褌懈 蟹邪泻邪蟹邪',
@@ -945,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