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/zh.js | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 522cdfc..eaa5641 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -236,6 +236,7 @@
oneClickStorage:'涓�閿畬宸�',
quantityMount:'鏁伴噺閲戦',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -296,6 +297,7 @@
totalArea:'鎬诲昂瀵�',
childWidth:'鍗曠墖瀹�',
childHeight:'鍗曠墖楂�',
+ arc:'寮ч暱',
area:'鍗曠墖灏哄',
process:'宸ヨ壓娴佺▼',
orderDetail:'璁㈠崟璇︽儏',
@@ -930,6 +932,10 @@
returnQuantity :'杩斿簱鏁伴噺',
materialReturnType :'鏉愭枡杩斿簱绫诲瀷',
createTime :'杩斿簱鏃ユ湡',
+
+ surplusMaterialManagement :'浣欐枡绠＄悊',
+ additionOfSurplusMaterials :'浣欐枡鏂板',
+ excessMaterialOutflow :'浣欐枡鍑哄簱',
},
mainBasicData:{
BasicData :'鍩虹鏁版嵁',
@@ -951,6 +957,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