From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/ar.js | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 65e726a..9fec150 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -177,6 +177,8 @@
productAbbreviation:'丕禺鬲氐丕乇 丕賱賲賳鬲噩',
productDuplication:'鬲賰乇丕乇 丕賱賲賳鬲噩',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -283,6 +285,16 @@
valueAddedTax:'澧炲�肩◣',
cuttingTransport:'杩愯緭娑堝噺',
colourCeramicGlaze:'褰╅噳鍥惧彿',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
+
msg:{
productCheck:'丕賱乇噩丕亍 丕禺鬲賷丕乇 賲賳鬲噩',
tableLengthNot:'賱丕 鬲賵噩丿 亘賷丕賳丕鬲 賱賱噩丿賵賱',
@@ -352,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
@@ -397,7 +410,6 @@
qr2Local:'浜岀淮鐮�2浣嶇疆',
default:'榛樿'
-
},
workOrder:{
@@ -429,6 +441,8 @@
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
},
+ yesTitle:'鏈夋爣棰樻墦鍗�',
+ noTitle:'鏃犳爣棰樻墦鍗�',
buildingNumber:'妤煎彿',
longSide:'闀胯竟',
shortSide:'鐭竟',
@@ -563,7 +577,8 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
@@ -586,6 +601,9 @@
addReportingWork:"廿囟丕賮丞 鬲賯乇賷乇 噩丿賷丿",
qualityInspectionReview:"賲乇丕噩毓丞 賮丨氐 丕賱噩賵丿丞",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'乇賯賲 丕賱夭噩丕噩',
glassAddress:'毓賱丕賲丞 丕賱夭噩丕噩',
WorkReportingManagement:'廿丿丕乇丞 丕賱鬲賯丕乇賷乇',
@@ -663,7 +681,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
selectWorkReportingTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
successfulModificationOfWorkApplication:'鬲賲 鬲毓丿賷賱 丕賱鬲賯乇賷乇 亘賳噩丕丨',
@@ -915,6 +933,7 @@
printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
labelTemplate:'鏍囩妯℃澘锛�',
listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
+
},
rework:{
page:{
@@ -964,6 +983,7 @@
userId:'丕爻賲 丕賱賲爻鬲禺丿賲',
user:'賲爻鬲禺丿賲',
setUpRoles:'鬲毓賷賷賳 丕賱丿賵乇 丕賱賵馗賷賮賷',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'鬲睾賷賷乇 賰賱賲丞 丕賱賲乇賵乇',
OldPassword:'賰賱賲丞 丕賱賲乇賵乇 丕賱賯丿賷賲丞',
TheNewPassword:'賰賱賲丞 丕賱賲乇賵乇 丕賱噩丿賷丿丞',
@@ -1087,6 +1107,7 @@
finishedProductReport :'鬲賯乇賷乇 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
@@ -1105,11 +1126,13 @@
qualityReport:'鬲賯乇賷乇 丕賱噩賵丿丞',
productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yieldReport:'鬲賯乇賷乇 賲毓丿賱 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'丕賱毓賲賱賷丞',
inventoryArea:'賲賳胤賯丞 丕賱鬲禺夭賷賳',
pleaseSelectADateFirst:'丕賱乇噩丕亍 鬲丨丿賷丿 鬲丕乇賷禺 兀賵賱丕',
pleaseSelectAProcessFirst:'丕賱乇噩丕亍 鬲丨丿賷丿 丕賱毓賲賱賷丞 兀賵賱丕',
theFilteringTimeForExportCannotExceed180Days:'賱丕 賷賲賰賳 兀賳 賷鬲噩丕賵夭 賵賯鬲 丕賱鬲氐賮賷丞 丕賱賲氐丿乇 180 賷賵賲賸丕',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'鬲丕乇賷禺 丕賱胤賱亘',
deliveryDate:'鬲丕乇賷禺 丕賱鬲爻賱賷賲',
completedQuantity:'丕賱賰賲賷丞 丕賱賲賰鬲賲賱丞',
@@ -1134,7 +1157,9 @@
finishedProductReport :'鬲賯乇賷乇 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
@@ -1308,7 +1333,8 @@
userPassWord :'鬲睾賷賷乇 賰賱賲丞 丕賱賲乇賵乇',
glassPrice:'鐜荤拑浠锋牸',
glassOptimize:'鐜荤拑浼樺寲',
- finishedGlassShelf:'鎴愬搧鏂欐灦'
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
--
Gitblit v1.8.0