From 726f5da27afc22ea1d8bd5fe730a0722ab8a97c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 09:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 224e10b..b829b82 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -83,6 +83,7 @@
updatanull:'璇ュ伐绋嬫湭淇濆瓨鍒颁笂鐗囪〃锛�',
glassnull:'鏇存柊鐜荤拑鐘舵�佹椂鍙戠敓閿欒',
deletemessage:'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+ layoutSequence:'搴忓彿',
},
sorter:{
gridnumber:'鏍呮牸鍙�',
@@ -205,6 +206,12 @@
down:'涓嬩竴椤�',
now:'褰撳墠椤垫樉绀�',
tit:'鏉℃暟鎹�',
+ temperingqueries:'閽㈠寲鏌ヨ',
+ specifytempering:'鎸囧畾閽㈠寲',
+ projectnumber:'宸ョ▼鍙�',
+ layoutnumber:'閽㈠寲鐗堝浘鍙�',
+ numberglasses:'鐜荤拑鏁伴噺',
+ specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -410,7 +417,44 @@
notstocked: '鏈叆搴�',
inboundstatus: '閮ㄥ垎鍏ュ簱鐘舵��',
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
-
-
- }
+ completedquantity: '瀹屾垚鏁伴噺',
+ scrapquantity: '鎶ュ簾鏁伴噺',
+ },
+ reportmanage:{
+ productiontime :'鐢熶骇鏃堕棿',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ all :'鍏ㄩ儴',
+ completed :'瀹屽伐',
+ broke :'鐮存崯',
+ takeout :'鎷胯蛋',
+ dreportwork :'鏈姤宸�',
+ pendingwork :'寰呮姤宸�',
+ reportwork :'宸叉姤宸�',
+ incise :'鍒囧壊',
+ edging :'纾ㄨ竟',
+ steel :'閽㈠寲',
+ inquire :'鏌ヨ',
+ signingwork :'鎶ュ伐',
+ reporteam :'鎶ュ伐鐝粍',
+ reportingequipment :'鎶ュ伐璁惧',
+ line :'绾胯矾',
+ process :'宸ュ簭',
+ glassID :'鐜荤拑ID',
+ projectnumber :'宸ョ▼鍙�',
+ layoutID :'閽㈠寲鐗堝浘ID',
+ productiontime :'鐢熶骇鏃堕棿',
+ type :'绫诲瀷',
+ state :'鐘舵��',
+ processcards :'娴佺▼鍗�',
+ number :'搴忓彿',
+ layer :'灞�',
+ typebreakage :'鐮存崯绫诲瀷',
+ causebreakage :'鐮存崯鍘熷洜',
+ responsibleprocess :'璐ｄ换宸ュ簭',
+ responsiblepersonnel :'璐ｄ换浜哄憳',
+ responsibleteam :'璐ｄ换鐝粍',
+ responsibleequipment :'璐ｄ换璁惧',
+ remark :'澶囨敞',
+ },
}
\ No newline at end of file
--
Gitblit v1.8.0