From 3fe19c705a4b0e32096b5c39c5489ea111a10e15 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 09:58:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 UI-Project/src/lang/zh.js |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index b829b82..b829bb3 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -212,6 +212,16 @@
         layoutnumber:'閽㈠寲鐗堝浘鍙�',
         numberglasses:'鐜荤拑鏁伴噺',
         specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+        temperedswitch:'閽㈠寲寮�鍏�',
+        dutyinformation:'鍊肩彮淇℃伅',
+        line:'绾胯矾',
+        process:'宸ュ簭',
+        team:'鐝粍',
+        basic:'璁惧',
+        makesure:'纭淇濆瓨',
+        cancel:'鍙栨秷',
+        temperingtotal:'閽㈠寲鐐夋暟锛�',
+        glasstotal:'鐜荤拑鎬绘暟锛�',
     },
     workOrder:{
         glassID:'鐜荤拑ID',
@@ -229,11 +239,30 @@
         takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
         breakage:'鐮存崯',
         takeout:'鎷胯蛋',
+        glasstype:'鐜荤拑绫诲瀷',
+        line:'绾胯矾',
+        status:'鐘舵��',
     },
     processCard:{
         intofurnace:'杩涚倝涓�',
         beforefurnace:'杩涚倝鍓�',
         outfurnace:'宸插嚭鐐夌幓鐠�',
+        print:'鎷胯蛋鎵撳嵃',
+        printing:'鎵撳嵃',
+        projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
+        inquire:'鏌ヨ',
+        project:'宸ョ▼鍙�',
+        awayprocess:'鎷胯蛋宸ュ簭',
+        awayequipment:'鎷胯蛋璁惧',
+        awayteam:'鎷胯蛋鐝粍',
+        flowcard:'娴佺▼鍗�',
+        layer:'灞傚彿',
+        temperinglayout:'鐐夊彿',
+        temperingfeed:'鐗囧簭',
+        width:'瀹�',
+        height:'楂�',
+        thickness:'鍘�',
+        glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
     },
     reportWork:{
         lowerbit:'涓嬬墖浣�',
@@ -411,7 +440,7 @@
         customerName: '瀹㈡埛鍚嶇О',
         project: '椤圭洰鍚嶇О',
         are: '闈㈢Н',
-        quantity: '鍖呰鏂瑰紡',
+        quantity: '鏁伴噺',
         warehousing: '鐘舵��',
         deliveryDate: '閫佽揣鏃堕棿',
         notstocked: '鏈叆搴�',
@@ -419,11 +448,25 @@
         allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
         completedquantity: '瀹屾垚鏁伴噺',
         scrapquantity: '鎶ュ簾鏁伴噺',
+        number: '鏁伴噺',
+        method: '鍔犲伐鏂瑰紡',
+        innumber: '宸插叆鏁伴噺',
+        productstatus: '鐢熶骇鐘舵��',
+        projectnumber: '宸ョ▼鍙�',
+        right: '姝e父',
+        stop: '缁堟',
+        inquire: '鏌ヨ',
+        starttime :'寮�濮嬫椂闂�',
+        endtime :'缁撴潫鏃堕棿',
+        loading :'姝e湪涓婄墖锛�',
     },
     reportmanage:{
         productiontime :'鐢熶骇鏃堕棿',
         starttime :'寮�濮嬫椂闂�',
         endtime :'缁撴潫鏃堕棿',
+        ctype :'娓呴�夋嫨绫诲瀷',
+        cstate :'娓呴�夋嫨鐘舵��',
+        cprocess :'娓呴�夋嫨宸ュ簭',
         all :'鍏ㄩ儴',
         completed :'瀹屽伐',
         broke :'鐮存崯',
@@ -450,11 +493,17 @@
         number :'搴忓彿',
         layer :'灞�',
         typebreakage :'鐮存崯绫诲瀷',
+        ptypebreakage :' 璇烽�夋嫨鐮存崯绫诲瀷',
         causebreakage :'鐮存崯鍘熷洜',
+        pcausebreakage :'璇烽�夋嫨鐮存崯鍘熷洜',
         responsibleprocess :'璐d换宸ュ簭',
         responsiblepersonnel :'璐d换浜哄憳',
+        presponsiblepersonnel :'璇疯緭鍏ヨ矗浠讳汉鍛�',
         responsibleteam :'璐d换鐝粍',
+        presponsibleteam :'璇烽�夋嫨璐d换鐝粍',
         responsibleequipment :'璐d换璁惧',
+        presponsibleequipment :'璇烽�夋嫨璐d换璁惧',
         remark :'澶囨敞',
-    },
+        premark :'璇疯緭鍏ュ娉�',
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0