From 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 16:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 9faee8f..33b193a 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -255,10 +255,10 @@
orderHasBeenReceived:'璁㈠崟宸插叆搴�',
printingNumber:'鎵撳嵃娆℃暟',
processingOrder:'鍔犲伐鍗�',
- sheet2:'妯増-澶氬眰鏄庣粏',
- sheet4:'鐢熶骇鍔犲伐鍗曠旱鐗�',
+ sheet2:'妯増-澶氬眰鏄庣粏(鎺ㄨ崘)',
+ sheet4:'绾电増-鎴愬搧淇℃伅',
sheet3:'娴忚鍙戣揣淇℃伅',
- sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
+ sheet5:'绾电増-鍗曠墖寮挗',
oneClickStorage:'涓�閿畬宸�',
oneClickReturn:'涓�閿��鍥�',
@@ -576,7 +576,8 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
@@ -679,7 +680,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'璇烽�夋嫨璐ｄ换鐝粍',
selectWorkReportingTeam:'璇烽�夋嫨璐ｄ换鐝粍',
successfulModificationOfWorkApplication:'鎶ュ伐淇敼鎴愬姛',
@@ -1105,6 +1106,7 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
productionReport:'鐢熶骇鎶ヨ〃',
workInProgressReport:'鍦ㄥ埗鍝佹槑缁嗘姤琛�',
@@ -1116,6 +1118,8 @@
orderPlanDecomposition:'璁㈠崟璁″垝鍒嗚В鎶ヨ〃',
secondaryBrokenReport:'娆＄牬鎶ヨ〃',
crossProcessBreakdown:'璺ㄥ伐搴忔鐮存姤琛�',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
teamOutput:'鐝粍浜ч噺鎶ヨ〃',
splittingDetails:'鍒嗘灦鏄庣粏鎶ヨ〃',
TaskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
@@ -1129,6 +1133,7 @@
pleaseSelectADateFirst:'璇峰厛閫夋嫨鏃ユ湡',
pleaseSelectAProcessFirst:'璇峰厛閫夋嫨宸ュ簭',
theFilteringTimeForExportCannotExceed180Days:'瀵煎嚭鐨勭瓫閫夋椂闂翠笉鑳借秴杩�180澶�',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'涓嬪崟鏃堕棿',
deliveryDate:'浜よ揣鏃ユ湡',
completedQuantity:'宸插畬鎴愭暟閲�',
@@ -1153,7 +1158,8 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
},
productionBasicData:{
--
Gitblit v1.8.0