From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/ru.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 8ea5dce..8ac9c1d 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:'袛邪薪薪褘械 褌邪斜谢懈褑褘 锌褉械胁褘褕邪褞褌 屑邪泻褋懈屑邪谢褜薪褘泄 谢懈屑懈褌',
@@ -330,6 +331,7 @@
transferOrder:'孝褉邪薪褋褎械褉薪褘泄 芯褉写械褉',
perimeter:'袙薪械褕薪懈泄 泻褉邪泄',
deleteNo:'校写邪谢械薪懈械 薪械褍写邪褔薪褘褏 锌褉芯胁械褉芯泻, 褔褌芯斜褘 锌褉芯胁械褉懈褌褜, 褉邪蟹写械谢械薪褘 谢懈 芯薪懈',
+ msg:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 胁褋械 写邪薪薪褘械'
},
processCard:{
@@ -949,16 +951,16 @@
},
menu:{
- salesAndDistribution :'袩褉芯写邪卸邪 懈 褉邪褋锌褉械写械谢械薪懈械',
- productionPlanning :'袩褉芯懈蟹胁芯写褋褌胁芯 懈 锌谢邪薪懈褉芯胁邪薪懈械',
- materialManage :'袟邪泻褍锌泻懈 懈 屑邪褌械褉懈邪谢褘',
- userManage :'袩芯谢褜蟹芯胁邪褌械谢懈 懈 锌褉邪胁邪 写芯褋褌褍锌邪',
+ "1" :'袩褉芯写邪卸邪 懈 褉邪褋锌褉械写械谢械薪懈械',
+ "2" :'袩褉芯懈蟹胁芯写褋褌胁芯 懈 锌谢邪薪懈褉芯胁邪薪懈械',
+ "3" :'袟邪泻褍锌泻懈 懈 屑邪褌械褉懈邪谢褘',
+ "4" :'袩芯谢褜蟹芯胁邪褌械谢懈 懈 锌褉邪胁邪 写芯褋褌褍锌邪',
product :'校锌褉邪胁谢械薪懈械 褌芯胁邪褉薪褘屑懈 蟹邪锌邪褋邪屑懈',
order :'校锌褉邪胁谢械薪懈械 蟹邪泻邪蟹邪屑懈',
delivery :'校锌褉邪胁谢械薪懈械 写芯褋褌邪胁泻芯泄',
returns :'校锌褉邪胁谢械薪懈械 胁芯蟹胁褉邪褌芯屑',
- customer :'袠薪褎芯褉屑邪褑懈褟 芯 泻谢懈械薪褌邪褏',
+ Customer :'袠薪褎芯褉屑邪褑懈褟 芯 泻谢懈械薪褌邪褏',
workOrder :'校锌褉邪胁谢械薪懈械 褉邪斜芯褔械泄 写芯泻褍屑械薪褌邪褑懈械泄',
processCard :'校锌褉邪胁谢械薪懈械 泻邪褉褌邪屑懈 锌褉芯褑械褋褋芯胁',
reportingWorks :'校锌褉邪胁谢械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹褜褞',
@@ -967,7 +969,7 @@
machine :'校锌褉邪胁谢械薪懈械 芯斜芯褉褍写芯胁邪薪懈械屑',
bOM :'校锌褉邪胁谢械薪懈械 BOM',
report :'校锌褉邪胁谢械薪懈械 芯褌褔械褌邪屑懈',
- productStock :'袟邪锌邪褋褘 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
+ ProductStock :'袟邪锌邪褋褘 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
ingredientsStock :'袟邪锌邪褋褘 屑邪褌械褉懈邪谢芯胁',
ingredients :'袦邪褌械褉懈邪谢褜薪褘械 写邪薪薪褘械',
trader :'校锌褉邪胁谢械薪懈械 锌芯褋褌邪胁褖懈泻邪屑懈',
--
Gitblit v1.8.0