From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/kr.js | 1125 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 678 insertions(+), 447 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index bbc3d64..7a9a01b 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -4,17 +4,17 @@
         pwErr:'牍勲皜氩堩樃毳� 鞛呺牓頃橃劯鞖�',
         loginSuccessful:'搿滉犯鞚� 靹标车',
         loginErr:'鞎勳澊霐� 霕愲姅 牍勲皜氩堩樃 鞓る',
-        connectErr:'搿滉犯鞚� 鞁滉皠 齑堦臣, 鞛攴胳澑 頃橃劯鞖�',
-        user:'靷毄鞛�',
+        connectErr:'靹滊矂 鞐瓣舶鞚� 鞗愴櫆頃橃 鞎婌姷雼堧嫟. 鞛犾嫓 頉� 雼れ嫓 鞁滊弰頃� 欤检劯鞖�.',
+        user:'靷毄鞛� 氇╇',
         password:'牍勲皜氩堩樃',
-        SysName:'氩犾澊氤� 鞛愲彊頇� ERP 甏�毽� 鞁滌姢韰�',
+        SysName:'NORTH GLASS ERP 甏�毽� 鞁滌姢韰�',
         login:'搿滉犯鞚�',
         register:'須岇洂臧�鞛�',
     },
     main:{
         connectErr:'靹滊矂 鞐瓣舶鞚� 鞗愴櫆頃橃 鞎婌姷雼堧嫟. 鞛犾嫓 頉� 雼れ嫓 鞁滊弰頃� 欤检劯鞖�.',
-        titleFirst:"頇橃榿頃╇媹雼� ",
-        titleLast:' NorthGlass ERP 鞁滌姢韰滌棎 鞓れ嫚 瓴冹潉 頇橃榿頃╇媹雼�.'
+        titleFirst:'頇橃榿頃╇媹雼�',
+        titleLast:'NORTH GLASS ERP 鞁滌姢韰滌棎 鞓れ嫚 瓴冹潉 頇橃榿頃╇媹雼�.'
     },
     error:{
         Code_401:'順勳灛 靷毄鞛愳棎瓴� 頃措嫻 甓岉暅鞚� 鞐嗢姷雼堧嫟.',
@@ -22,55 +22,64 @@
     },
     basicData:{
         create:'靸濎劚',
-        review:"鞀轨澑 ",
-        cancelReview:"鞛瞼韱�",
+        review:'鞀轨澑',
+        cancelReview:'旆唽鞀轨澑',
         save:'鞝�鞛�',
         add:'於旉皜',
         delete:'靷牅',
         edit:'韼胳',
-        cancel:'氍错毃頇�',
+        cancel:'旆唽',
         restore:'氤奠洂',
-        selectSame:'霃欖澕 頃 靹犿儩',
+        selectSame:'氇呾弓 靹犿儩',
         sameAfterwards:'鞚错泟 霃欖澕 鞝侅毄',
         clearSelection:'靹犿儩 頃挫牅',
         calculateAmount:'旮堨暋 瓿勳偘',
-        Number:'鞛愲彊 靾滊矆',
-        remarks:' 牍勱碃',
+        Number:'氩堩樃',
+        remarks:'牍勱碃',
         total:'頃╆硠',
         check:'靹犿儩',
-        operate:'臁办瀾',
+        operate:'鞛戨彊',
         search:'臁绊殞',
         startDate:'鞁滌瀾 鞁滉皠',
         endDate:'膦呺 鞁滉皠',
-        reportData:'氤搓碃靹� 鞚检瀽 ',
+        reportData:'氤搓碃靹� 鞚检瀽',
 
         confirmButtonText: '頇曥澑',
         cancelButtonText: '旆唽',
         creationTime:'靸濎劚鞁滉皠',
         insert: '鞁犼窚 於旉皜',
         update:'靾橃爼',
-        number:'鞚茧牗 氩堩樃',
+        number:'鞚茧牗氩堩樃',
         otherAmounts:'旮绊儉 旮堨暋',
-        errorSettlementArea:'鞓れ皑 瓴办牅 氅挫爜',
-        sizeReview:'旃橃垬 鞀轨澑',
+        errorSettlementArea:'鞓る 頃搓舶 甑棴',
+        sizeReview:'旃橃垬 瓴�靷�',
         reportForms:'氤搓碃靹�',
-        print:'於滊牓',
+        print:'頂勲靹胳姢 旃措摐 於滊牓',
         export:'雮措炒雮搓赴',
         empty:'齑堦赴頇�',
 
-        incrementalAll:'鞚错泟 歃濍秳',
-        incrementalChecked:'靹犿儩 頃 歃濍秳',
+        incrementalAll:'靹犿儩 頉� 鞐办啀鞝� 歃濌皜',
+        incrementalChecked:'靹犿儩 頃 鞐办啀鞝� 歃濌皜霅�',
         true:'鞓�',
         false:'鞎勲媹鞓�',
         computedSize:'瓿柬暀鞝� 響滉赴氩�',
-        paste:'攵欗榾雱j赴',
+        paste:'攵欖棳雱j赴',
 
         selected:'靹犿儩霅�',
         partiallySelected:'攵�攵� 靹犿儩',
         unchecked :'氙胳劆韮� 雿办澊韯�',
-        copy:'氤奠偓',
+        copy:'欤茧 氤奠牅',
+
+        orderRemarks:'璁㈠崟澶囨敞',
+        filmNumber:'浜у搧澶囨敞',
+        remarks1:'澶囨敞1',
+        remarks2:'澶囨敞2',
+        remarks3:'澶囨敞3',
+        remarks4:'澶囨敞4',
+        otherColumns:'鍏朵粬鍒�',
         msg:{
             max255:"斓滊寑 255鞛� 鞛呺牓 臧�電�",
+            max10:"鏈�澶氳緭鍏�10涓瓧绗�",
             range99999Dec2:
                 "0攵�韯� 99,999旯岇鞚� 靾瀽 鞛呺牓. 靻岇垬鞝� 霊橃Ц 鞛愲Μ旯岇 項堨毄",
             range99999Dec3:
@@ -79,22 +88,26 @@
                 "璇疯緭鍏�0-999999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
             greater0:"0氤措嫟 韥� 鞝曥垬毳� 鞛呺牓頃橃劯鞖�",
             checkoutLose:'瓴�歃� 鞁ろ尐',
-            saveSuccess:'鞝�鞛� 靹标车',
+            saveSuccess:'靸濎劚 鞕勲',
             saveFail:'鞝�鞛� 鞁ろ尐',
-            cancelReviewSuccess:'鞛瞼韱� 鞕勲',
+            cancelReviewSuccess:'旆唽 鞀轨澑 鞕勲',
             ReviewSuccess:'鞀轨澑 鞕勲',
 
             ServerConnectionError:'靹滊矂 鞐瓣舶 鞓る',
-            deleteSuccess:'靷牅 靹标车',
+            deleteSuccess:'靷牅 鞕勲',
             deleteFail:'靷牅 鞁ろ尐',
-            cancelReviewFail:'鞛瞼韱� 鞁ろ尐',
+            cancelReviewFail:'鞀轨澑 鞁ろ尐',
             cancelReviewFailWork:'鍙嶅澶辫触,璇锋鏌ユ槸鍚︽姤宸�',
-            reviewFail:'鞁偓 鞁ろ尐',
+            reviewFail:'瓴�靷� 鞁ろ尐',
             noProductDataInTheTable:'韰岇澊敫旍棎 鞝滍拡 雿办澊韯� 鞐嗢潓',
-            tableDataExceedsMaximumLimit:'韰岇澊敫� 雿办澊韯� 斓滊寑 鞝滍暅 齑堦臣',
+            tableDataExceedsMaximumLimit:'韰岇澊敫� 雿办澊韯� 斓滊寑 頃滊弰 齑堦臣',
             range9999Dec: "4鞛愲Μ 鞝曥垬 鞛呺牓頃橃劯鞖�",
-            quantityError: "靾橂焿 鞓る, 靸堧瓿� 頉� 鞝�鞛ロ晿靹胳殧",
+            quantityError: '靾橂焿 鞓る, 靸堧瓿犾龚 頉� 鞝�鞛ロ晿靹胳殧',
             dataDoesNotExist: "雿办澊韯� 鞐嗢潓",
+            greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+            greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+            notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+            notUpdate:"鍙傛暟鏈慨鏀�",
         }
     },
     product:{
@@ -102,84 +115,86 @@
             selectProduct:'鞝滍拡 氅旍澑 韼橃澊歆�',
             createProduct:'靸濎劚',
         },
-        coloredGlaze:'旃犾湢',
-        frostedSand:'靸岆敥',
-        coating:'旖旐寘 鞙犽Μ',
+        coloredGlaze:'靸� 鞙犾暯',
+        frostedSand:'攵堩埇氇� 鞙犽Μ',
+        coating:'旖旐寘',
         filmApplication:'頃勲 攵�彀�',
         sandblasting:'靸岆摐敫旊澕鞀ろ寘',
-        edgeGrinding:'鞐愳',
-        productName:'氇呾弓 ',
+        edgeGrinding:'鞐l',
+        productName:'氇呾弓',
         typeName:'靻岇啀 攵勲',
         query:'牍犽ジ 瓴�靸�',
-        creator:'靸濎劚鞛�',
+        creator:'鞛戩劚鞛�',
 
-        usingAbbreviations:'鞎届弓 靷毄',
+        usingAbbreviations:'鞎届柎 靷毄',
         msg:{
-            productLength:'鞝滍拡 靸侅劯 鞝曤炒 觳皜',
+            productLength:'鞝滍拡 靸侅劯 鞝曤炒 於旉皜',
             lastGlass:'鞝滍拡 靸侅劯 鞝曤炒鞚� 毵堨毵� 頃鞚� 鞙犽Μ 鞝滍拡鞚� 鞎勲嫏雼堧嫟. 雮挫毄鞚� 氤挫檮頃� 欤检劯鞖�.',
             glassType:'鞝滍拡 攵勲 靹犿儩',
             saveSuccess: '靸濎劚 鞕勲',
             operateSuccess: '鞛戩梾 靹标车',
-            operateFail: '鞛� 鞁ろ尐',
-            glassReview:'鞝滍拡 靻岇灛 靻嶌劚 氚� 瓿奠爼 靻嶌劚 鞛呺牓',
-            glassRepeat:'鞀ろ帢鞚挫劀 氚� 毹检爛 靹犿儩',
-            HollowReview:'欷戧车 鞀ろ帢鞚挫劀 氚� 鞝勳泊 靹犿儩',
+            operateFail: '鞛戩梾 鞁ろ尐',
+            glassReview:'鞝滍拡 鞛 靻嶌劚 氚� 頂勲靹胳姢 靻嶌劚 鞛呺牓',
+            glassRepeat:'臧勱博鞛� 毹检爛 靹犿儩',
+            HollowReview:'霌滊…雼れ毚 氚曥姢鞚� 欷戧车 臧勱博鞛� 鞝勳泊 靹犿儩',
             firstGlass:"鞝滍拡 毹检爛 靹犿儩",
-            InterlayerReview:'欷戧车 鞀ろ帢鞚挫劀 氚� 鞝勳泊 靹犿儩',
-            glassTypeTitle:'靻岇灛 靻嶌劚',
+            InterlayerReview:'霌滊…雼れ毚 氚曥姢鞚� 欷戧车 臧勱博鞛� 鞝勳泊 靹犿儩',
+            glassTypeTitle:'鞛鞝� 韸轨劚',
             thickness:'*霊愱粯',
             color:'*靸夓儊',
-            craft:'*瓿奠爼 靻嶌劚',
-            location:'*鞙勳箻',
+            craft:'*頂勲靹胳姢 靻嶌劚',
+            location:'靸來憸 鞙勳箻',
             lowELocation:'LOW-E 旖旐寘 氅�',
-            processAttribute:"*瓿奠爼 靻嶌劚",
-            hollowThickness:' *欷戧车 霊愱粯',
-            hollowGasType:'*於╈爠 臧�鞀� 氚╈嫕',
-            hollowType:'*鞁る',
-            hollowGlueDepth:'*旮半掣 鞁る煱韸� 旯婌澊',
-            hollow:'鞀ろ帢鞚挫劀 氚�',
-            hollowUpdate:'鞀ろ帢鞚挫劀 氚� 靾橃爼',
+            processAttribute:'頂勲靹胳姢 靻嶌劚',
+            hollowThickness:'鞚挫 鞙犽Μ 霊愱粯',
+            hollowGasType:'臧�鞀� 於╈爠 氚╈嫕',
+            hollowType:'鞁る 瓿奠爼',
+            hollowGlueDepth:'旮半掣 鞁る瀫韸� 旯婌澊',
+            hollow:'欷戧车 臧勱博鞛�',
+            hollowUpdate:'欷戧车 臧勱博鞛� 靾橃爼',
             interlayerThickness:'鞝侅傅 霊愱粯',
-            interlayerType:' *鞙犿槙',
-            interlayerColor:'*靸夓儊',
+            interlayerType:'*鞙犿槙',
+            interlayerColor:'靸夓儊',
             interlayer:'鞝侅傅 臧勱博鞛�',
             interlayerUpdate:'鞝侅傅 臧勱博鞛� 靾橃爼',
             glassAttribute:'雼澕 鞙犽Μ 韸轨劚',
             reset:'齑堦赴頇�',
-            processFlowAttribute:'瓿奠爼 旃措摐 靻嶌劚',
+            processFlowAttribute:'頂勲靹胳姢 靻嶌劚',
             sure:'頇曥澑',
             update:'靾橃爼',
             quickSearch:'牍犽ジ 瓴�靸�',
             weightThickness:'欷戨焿 霊愱粯',
             allThickness:'霊愱粯',
-            remarks:' 牍勱碃',
-            product:'鞝滍拡 氇呾弓',
+            remarks:'牍勱碃',
+            product:'鞝滍拡 甏�毽�',
             updateGlass:'鞙犽Μ 靾橃爼',
             updateHollow:'欷戧车 靾橃爼',
-            updateInterlayer:'鞝侅傅 靾橃爼',
+            updateInterlayer:'欷戩傅 靾橃爼',
             delete: '靷牅',
             create:'靸濎劚',
             review:'鞀轨澑',
-            cancelReview:'鞛瞼韱�',
+            cancelReview:'旆唽鞀轨澑',
             theProductHasBeenReviewedAndCannotBeDeleted:'鞀轨澑霅� 鞝滍拡鞚� 靷牅 攵堦皜',
 
-            productAbbreviation:'鞝滍拡 氇�',
+            productAbbreviation:'鞝滍拡氇� 於曥暯',
             productDuplication:'鞝滍拡 欷戨车',
+            msg1:'鍒涘缓浜烘槸锛�',
+            msg2:'鏃犳硶鎿嶄綔锛�',
         }
     },
     order:{
         page:{
             selectOrder:'欤茧 觳� 韼橃澊歆�',
-            createOrder:'靸濎劚',
-            orderReport:'欤茧 頃 氤搓碃靹�',
+            createOrder:'欤茧 氚滍枆',
+            orderReport:'欤茧 靸侅劯 氤搓碃靹�',
             orderSummaryReport:'齑� 欤茧 氤搓碃靹�',
             orderDetailsSummary:'欤茧 靸侅劯 歆戧硠',
             updateOrderCraft:'頂勲靹胳姢 臧愳偓'
         },
-        project:'頂勲鞝濏姼 氇�',
+        project:'頂勲鞝濏姼氇�',
         orderId:'韺愲Г 欤茧 氩堩樃',
-        money:'齑� 旮堨暋',
-        customers:"瓿犼皾 鞝曤炒",
+        money:'旮堨暋',
+        customers:'瓿犼皾靷�',
         deliveryDate:"雮╆赴 鞚检瀽",
         contractId:'瓿勳暯 氩堩樃',
         orderType:'欤茧 鞙犿槙',
@@ -187,70 +202,90 @@
         customerBatch:'瓿犼皾 搿滍姼 氩堩樃',
         orderClassify:'欤茧 攵勲',
         calculateType:'瓿勳偘 氚╈嫕',
-        contacts:'鞐瓣硠鞚�',
+        contacts:'雼措嫻鞛�',
         icon:'搿滉碃 鞓奠厴',
         salesman:'鞓侅梾 雼措嫻鞛�',
-        contactNumber:'霠澖觳�',
+        contactNumber:'鞐半澖觳�',
         packType:'韽灔 氚╈嫕',
-        alType:'鞎岆(氙鸽妱 鞀ろ帢鞚挫劀 氚╈嫕',
+        alType:'鞀ろ帢鞚挫劀 臧�瓿� 氚╈嫕',
         deliveryAddress:'氚办啞 欤检唽',
         processingNote:'臧�瓿� 韸龟赴 靷暛',
         technology:'瓿奠爼',
         amountReset:'旮堨暋 鞛劋鞝�',
-        OrderNum:'頃 氩堩樃',
+        OrderNum:'欤茧 氩堩樃',
         productId:'鞝滍拡 ID',
-        product:'鞝滍拡',
+        product:'鞝滍拡 甏�毽�',
         price:'雼皜',
         quantity:'靾橂焿',
         grossAmount:'齑� 旮堨暋',
-        width:'韽�',
-        height:'雴掛澊',
-        area:'氅挫爜',
+        width:'鞕勳牅頀� 韽�',
+        height:'鞕勳牅頀� 雴掛澊',
+        area:'氚办啞 歆�鞐�',
         trueArea:'鞁れ牅 雼┐鞝�',
-        trueGrossArea:'鞁れ牅 齑濍┐鞝� ',
-        computeArea:'鞝曥偘 雼┐鞝�',
-        computeGrossArea:'鞝曥偘 齑濍┐鞝�',
+        trueGrossArea:'鞁れ牅 齑濍┐鞝�',
+        computeArea:'瓿勳偘 雼┐鞝�',
+        computeGrossArea:'瓿勳偘 齑濍┐鞝�',
         shape:'順曥儊',
-        bendRadius:'鞐搓皶瓿‰',
-        edgingType:'鞐愳 鞙犿槙',
+        bendRadius:'甑巾灅 氚橃毽�',
+        edgingType:'鞐l 鞙犿槙',
         import:'雿办澊韯� 臧�鞝胳槫旮�',
         template:'鞏戩嫕',
 
         universalShape:'響滌 順曥儊',
         alien:'牍勳爼順�',
-        areaAmountPerPiece:'氅挫爜 旮堨暋(雼┐鞝�)',
+        areaAmountPerPiece:'氅挫爜 旮堨暋(鞛ル嫻)',
         areaAmountAge:'氅挫爜 旮堨暋(齑濍┐鞝�)',
-        errorValue:'項堨毄 鞓れ皑',
+        errorValue:'鞓る 臧�',
 
         details:'靸侅劯 氤搓赴',
-        workmanship:'瓿奠爼',
-        processCard:'瓿奠爼 旃措摐',
+        workmanship:'旮办垹',
+        processCard:'頂勲靹胳姢 旃措摐 甏�毽�',
         processingNotes:'頃奠嫭 臧�瓿� 鞖旉惮靷暛',
         perimeter:'霊橂爤 旮胳澊',
-        grossArea:'齑濍┐鞝�',
-        creator:'鞛戩梾 歆�鞁滌瀽',
-        totalThickness:'霊愱粯',
+        grossArea:'齑� 氅挫爜',
+        creator:'鞛戩劚鞛�',
+        totalThickness:'齑� 霊愱粯',
         levelOne:'鞝滍拡 雽�攵勲',
         levelTwo:'鞝滍拡 靻岆秳毳�',
-        orderDetailsReport:'欤茧 頃 氤搓碃靹�',
-        orderDetailsSummaryReport:'欤茧 歆戧硠 氤搓碃靹�',
+        orderDetailsReport:'欤茧 靸侅劯 氤搓碃靹�',
+        orderDetailsSummaryReport:'欤茧 靸侅劯 鞖旍暯 氤搓碃靹�',
         buildingNumber:'旄� 氩堩樃',
         saveHeader:'項る崝 鞝�鞛�',
 
         orderNotApproved:'氙胳姽鞚� 欤茧',
         orderHasBeenReceived:'鞛呹碃 鞕勲 欤茧',
-        printingNumber:' 於滊牓 須熿垬',
+        printingNumber:'於滊牓 須熿垬',
         processingOrder:'臧�瓿� 歆�鞁滌劀',
         sheet2:'臧�搿滍槙-雼れ傅 靸侅劯',
-        sheet4:'靹鸽順� 靸濎偘 歆�鞁滌劀',
+        sheet4:'雼澕 靾橃 韺愳潣 靸濎偘 氚� 臧�瓿�',
         sheet3:'於滉碃 鞝曤炒 鞐措瀸',
-        sheet5:'鞐搓皶 臧�瓿� 歆�鞁滌劀(雼澕)',
+        sheet5:'雼澕 瓿‰┐ 鞙犽Μ(雼澕 鞁滍姼)鞚� 靸濎偘 氚� 臧�瓿�',
         oneClickStorage:'鞚缄磩 鞕勲 觳橂Μ',
         oneClickReturn:'鞚缄磩 氚橂牑',
 
         quantityMount:'靾橂焿 旮办 旮堨暋',
         allAmount:'齑� 氅挫爜 旮堨暋',
-        orderTransfer:'欤茧 瓿奠垬 鞚搓磤',
+        orderTransfer:'欤茧 鞚搓磤',
+
+        graphic:'攴鸽灅頂�',
+        drawingNo:'攴鸽 氩堩樃',
+        upper:'鞙�',
+        down:'頃�',
+        horizontal:'臧�搿�',
+        vertical:'靹鸽',
+        exportDXF:'dxf 雮措炒雮搓赴',
+        selectFile:'韺岇澕 靹犿儩',
+        left:'鞕检',
+        right:'鞓るジ飒�',
+        edgeAngleCurvature:'氇劀毽� 鞎勴伂',
+        cuttingCorners:'氇劀毽� 鞛愲ゴ旮�',
+        fourCornerExcavation:'瓴办洂鞚� 韺岆偞雼�',
+
+        ownerForProduction:'靻岇湢',
+        surtax:'攵�臧�靹�',
+        valueAddedTax:'攵�臧�靹�',
+        cuttingTransport:'鞛嫧鞝勳啞',
+        colourCeramicGlaze:'褰╅噳鍥惧彿',
         transferPage:{
             oldOrderId:'旮办〈 欤茧 氩堩樃',
             newOrderId:'鞁犼窚 欤茧 氩堩樃',
@@ -265,103 +300,134 @@
             productCheck:'鞝滍拡鞚� 靹犿儩頃� 欤检劯鞖�.',
             tableLengthNot:'韰岇澊敫旍棎 雿办澊韯瓣皜 鞐嗢姷雼堧嫟',
             amountReset:'鞝�鞛� 鞝� 毵堨毎鞀� 鞓るジ飒� 氩勴娂 氅旊壌鞐愳劀 旮堨暋 鞛硠靷办潉 鞁ろ枆頃� 欤检劯鞖�.',
-            projectCheck: '頂勲鞝濏姼 氇呾弓 鞛呺牓 頃勳殧',
+            projectCheck: '頂勲鞝濏姼氇呾潉 鞛呺牓頃� 欤检劯鞖�.',
             customerCheck: '瓿犼皾靷ゼ 靹犿儩頃� 欤检劯鞖�',
             salasManCheck: '鞐呺 雼措嫻鞛愲ゼ 靹犿儩頃� 欤检劯鞖�.',
             calculateTypeCheck: '瓿勳偘 氚╈嫕鞚� 靹犿儩頃� 欤检劯鞖�.',
-            tableLengthMax:'韰岇澊敫� 雿办澊韯� 斓滊寑 項堨毄霟夓棎 霃勲嫭頄堨姷雼堧嫟.',
+            tableLengthMax:'韰岇澊敫� 雿办澊韯� 斓滊寑臧掛棎 霃勲嫭頄堨姷雼堧嫟.鞝堨皑',
             productStateCheck:'頃措嫻 鞝滍拡鞚� 鞎勳 鞀轨澑霅橃 鞎婌晿鞀惦媹雼�.',
             importMaxCheckFailFirst:'雿办澊韯� 臧�鞝胳槫旮�',
             importMaxCheckFailMid:'雿办澊韯半姅 斓滊寑 [$]旯岇 項堨毄霅╇媹雼�.',
-            importMaxCheckFailLast:'瓯�, 齑堦臣 鞁� 欤茧鞚� 攵勴暊頃橃棳 臧�鞝胳槫靹胳殧.',
+            importMaxCheckFailLast:'瓯�, 鞐煬 欤茧鞙茧 臧�鞝胳槫靹胳殧.',
             updateAmountSuccessfully:'旮堨暋 鞐呺嵃鞚错姼 鞕勲',
-            updateOrderState:'欤茧 靸來儨 鞐呺嵃鞚错姼 鞕�',
+            updateOrderState:'欤茧 靸來儨 鞐呺嵃鞚错姼 鞕勲',
 
             calculationAreaPrompt1:'臁挫灛',
             calculationAreaPrompt2:'鞝曥偘 雼┐鞝� 氙鸽',
             calculationAreaPrompt3:'鞐秬 頇曥澑',
             calculationAreaPrompt4:'瓿勳偘',
-            warning:'頇曥澑 鞖旍箔',
-            calculationAreaPrompt5:'欷戨车 欤茧 靸濎劚 瓿勳啀 歆勴枆',
+            warning:'瓴疥碃',
+            calculationAreaPrompt5:'欷戨车 欤茧 靸濎劚鞚� 瓿勳啀 歆勴枆頃橁父 鞗愴晿鞁媹旯�?',
 
             pleaseCancelTheFilteringFirst:'頃勴劙 頃挫牅 頉� 歆勴枆',
-            grossAreaIsNot0:'鞁れ礉氅挫爜 0 頃 臁挫灛',
-            differentSize:'氤疙寪/氤挫“韺� 靾橃爼 欤茧 - 鞛瞼韱� 頉� 毽厠 頃勳殧?',
+            grossAreaIsNot0:'鞁れ牅 齑� 氅挫爜鞚� 0鞛呺媹雼�.',
+            differentSize:'鞚� 欤茧鞐愲姅 靾橂彊鞙茧 靾橃爼霅� 靷澊歃堦皜 韽暔霅橃柎 鞛堨姷雼堧嫟. 靾橃爼霅� 欤茧鞚� 瓴�韱犿暅 頉� 靷澊歃堧ゼ 鞛劋鞝曧暣 欤检劯鞖�! 雼れ嫓 瓴�韱犿晿鞁滉矤鞀惦媹旯�?',
             updateOrderIdErrorGtMaxId:'欤茧氩堩樃 斓滊寑臧� 齑堦臣',
             updateOrderIdErrorIsExist:'旮办〈 欤茧氩堩樃 欷戨车',
             updateOrderIdErrorIsSame:'霃欖澕 欤茧氩堩樃 鞛呺牓',
             updateOrderIdErrorDiscrepancyInLength:'欤茧氩堩樃 鞛愲靾� 攵堨澕旃�',
             updateOrderIdErrorInputNumber:'靾瀽 鞛呺牓 頃勳殧',
             updateOrderIdErrorNotNo1:'觳� 氩堨Ц 頃 靾橃爼 攵堦皜',
-            updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
-        }
+            updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒',
+            pleaseProcessType:'璇烽�夋嫨纾ㄨ竟绫诲瀷',
+            pleaseUploadPicture1:"璇峰厛閫夋嫨瑕佷笂浼犵殑DWG鏂囦欢鎴栧浘鐗囨枃浠�",
+            pleaseUploadPicture2:"鍑嗗涓婁紶...",
+            pleaseUploadPicture3:"涓婁紶涓�...",
+            pleaseUploadPicture4:"涓婁紶瀹屾垚!",
+            pleaseUploadPicture5:"涓婁紶澶辫触!",
+            pleaseUploadPicture6:"璇烽�夋嫨DWG鏂囦欢鎴朖PG銆丳NG鏍煎紡鐨勫浘鐗囨枃浠�",
+            pleaseUploadPicture7:"鏂囦欢澶у皬涓嶈兘瓒呰繃50MB",
+            pleaseUploadPicture8:"宸查�夋嫨鏂囦欢:",
+            pleaseUploadPicture9:"鏂囦欢涓婁紶",
+            pleaseUploadPicture10:"鎷栨嫿鏂囦欢鍒版澶勬垨",
+            pleaseUploadPicture11:"鐐瑰嚮閫夋嫨鏂囦欢",
+            pleaseUploadPicture12:"浠呮敮鎸� .dwg銆�.jpg銆�.png 鏍煎紡鏂囦欢锛屼笖鏂囦欢澶у皬涓嶈秴杩�50MB",
+            pleaseUploadPicture13:"涓婁紶杩涘害",
+            pleaseUploadPicture14:"涓婁紶缁撴灉",
+            pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
+            pleaseUploadPicture16:"涓嬭浇",
+        },
+        preciseMode:'绮剧‘妯″紡',
+        ambiguityModels:'妯$硦妯″紡',
+        glassSizeRange:'鐜荤拑灏哄鑼冨洿',
+        glassQuantity:'灏忕墖鏁伴噺',
+        merge:'瀹屾暣妯″紡',
+        layer:'鍗曠墖妯″紡',
+        notFinish:'寰呭畬鎴�',
+        processCardCollect:'娴佺▼鍗℃眹鎬�',
+        fileUpload:'鏂囦欢涓婁紶'
 
     },
     searchOrder:{
-        createOrder:'欤茧 靸濎劚',
-        production:'臧�瓿� 歆�鞁滌劀',
-        process:'順勳灛 瓿奠爼',
-        storage:'鞛呹碃',
-        delivery:'於滉碃',
-        inventoryNum:'鞛碃 靾橂焿',
+        createOrder:'欤茧 氚滍枆',
+        production:'靸濎偘',
+        process:'鞛戩梾 鞝堨皑',
+        storage:'鞛呹碃 鞕勲',
+        delivery:'雮╉拡 甏�毽�',
+        inventoryNum:'鞛呹碃 靾橂焿',
         perimeter:'霊橂爤 旮胳澊',
         regularOrders:'鞝曥儊 欤茧',
-        cancelledOrders:'韽愱赴 欤茧',
+        cancelledOrders:'旆唽 欤茧',
         allOrders:'鞝勳泊 欤茧',
-        msg:'雿办澊韯� 靹犿儩 頃勳殧',
+        msg:'鞝勳泊 雿办澊韯半ゼ 靹犿儩頃� 頉� 鞛戩梾鞚� 鞁ろ枆頃� 欤检劯鞖�.',
         msgDelete:'鞀轨澑 欤茧 靷牅 攵堦皜',
         msgDeleteFail:'靷牅 鞁ろ尐',
-        msgDeleteSuccess:'靷牅 靹标车',
-        deleteConfirm:'靷牅 頇曥澑',
+        msgDeleteSuccess:'靷牅 鞕勲',
+        deleteConfirm:'欤茧 靷牅毳� 頇曥澑頃橃嫓瓴犾姷雼堦箤?',
         orderType:'欤茧 鞙犿槙',
-        processFlows:'瓿奠爼 旃措摐 歆勴枆毳�',
+        processFlows:'頂勲靹胳姢 頋愲',
         copy:'欤茧 氤奠牅',
         copyTitle:'項る崝 氤奠偓',
         msgList:{
             checkOrder:'欤茧 鞝曤炒臧� 臁绊殞霅橃 鞎婌晿鞀惦媹雼�. 毹检爛 欤茧鞚� 韥措Ν頃� 欤检劯鞖�',
-            isOptimize:'瓴疥碃! 頃措嫻 欤茧鞚� 斓滌爜頇� 鞛旐櫂 鞕勲 靸來儨搿� 霅橂弻毽� 靾� 鞐嗢姷雼堧嫟.',
+            isOptimize:'瓴疥碃! 頃措嫻 欤茧鞚� 斓滌爜頇旊悩鞐堨姷雼堧嫟.霅橂弻毽� 靾� 鞐嗢姷雼堧嫟!',
             isReportingWork:'鞛戩梾 鞁れ爜 霌彪 鞕勲霅� 欤茧鞚� 霅橂弻毽赴臧� 鞝滍暅 霅╇媹雼�.',
             isStorage:'鞛呹碃 鞕勲霅� 欤茧鞚� 鞁滌姢韰� 霅橂弻毽赴臧� 攵堦皜電� 頃╇媹雼�.',
-            BackSure:"頃措嫻 瓿奠爼 旃措摐毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?"
+            BackSure:'頃措嫻 頂勲靹胳姢毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?',
+            filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
         },
-        updateOrderId:"欤茧 氩堩樃 靾�",
+        updateOrderId:'欤茧 氩堩樃 靾橃爼',
         reportingTransfer:'鞛戩梾 鞁れ爜 鞚搓磤'
     },
     craft:{
         glassAddress:'毵堩偣',
-        glassChild:'靹滊笇 鞝滍拡',
+        glassChild:'雼寪 鞙犽Μ 氇呾弓',
         width:'鞕勳牅頀� 韽�',
         height:'鞕勳牅頀� 雴掛澊',
-        totalArea:'齑� 旃橃垬',
+        totalArea:'齑濍┐鞝�',
         childWidth:'雼寪 韽�',
         childHeight:'雼寪 雴掛澊',
         arc:'寮ч暱',
-        area:'雼寪 旃橃垬',
-        process:'瓿奠爼 旃措摐',
+        area:'氚办啞 歆�鞐�',
+        process:'鞛戩梾 鞝堨皑',
         orderDetail:'欤茧 靸侅劯',
-        updateCraft:'瓿奠爼 靾橃爼',
-        technologicalProcess:'瓿奠爼 旃措摐',
-        processAttribute:'瓿奠爼 靻嶌劚',
-        oldProcess:'鞗愲掣 瓿奠爼',
+        updateCraft:'頂勲靹胳姢 靾橃爼',
+        technologicalProcess:'旮办垹 頂勲靹胳姢',
+        processAttribute:'頂勲靹胳姢 靻嶌劚',
+        oldProcess:'鞗愲掣 頂勲靹胳姢',
         newProcess:'順勳灛 瓿奠爼',
         reset:'齑堦赴頇�',
         sure:'頇曥澑',
-        upperLeft:'膦岇儊 ',
+        upperLeft:'膦岇儊',
         upperRight:'鞖办儊',
         lowLeft:'膦岉晿',
-        lowRight:'鞖绊晿聽',
-        TrademarkAttribute:'搿滉碃 韺岆澕氙疙劙',
-        TrademarkOptions:'搿滉碃 鞓奠厴',
+        lowRight:'鞖绊晿',
+        TrademarkAttribute:'靸來憸 韺岆澕氙疙劙',
+        TrademarkOptions:'靸來憸 鞓奠厴',
         xImage:'X於� 氙鸽煬毵�',
         yImage:'Y於� 氙鸽煬毵�',
         modifyTrademark:'搿滉碃 靾橃爼',
-        tag:'毵堩偣 頇滌劚',
-        tag2:'QR旖旊摐 1',
-        tag3:'QR旖旊摐 2',
+        tag:'毵堩偣 頇滌劚頇�',
+        tag2:'QR旖旊摐 鞚胳噭1',
+        tag3:'QR旖旊摐 鞚胳噭2',
         xMargin:'X於� 鞐氨',
         yMargin:'Y於� 鞐氨',
-        location:'搿滉碃 鞙勳箻',
-        sort:'毽矂鞀� 氩る摐'
+        location:'靸來憸 鞙勳箻',
+        sort:'鞙犽Μ 甑巾灅 氚╈',
+        archRise:'鎷遍珮',
+        qr1Local:'浜岀淮鐮�1浣嶇疆',
+        qr2Local:'浜岀淮鐮�2浣嶇疆',
+        default:'榛樿'
 
     },
 
@@ -376,123 +442,130 @@
         deleteOk:'靷牅 靹标车',
         transferOrder:'鞛戩梾 歆�鞁滌劀 靸濎劚',
         perimeter:'霊橂爤 旮胳澊',
-        deleteNo:'靷牅 鞁ろ尐, 霝� 頃犽嫻霅� 鞁滍姼電� 靷牅 攵堦皜',
+        deleteNo:'靷牅 鞁ろ尐. 頂勲靹胳姢 旃措摐臧� 氤搓碃霅橃棃電旍 頇曥澑頃橃劯鞖� (頂茧摐氚�)',
         msg:'鞝勳泊 雿办澊韯半ゼ 靹犿儩頃� 頉� 鞛戩梾鞚� 鞁ろ枆頃� 欤检劯鞖�.',
         msgSelect:'欤茧 氩堩樃毳� 氚橂摐鞁� 靹犿儩頃挫暭 頃╇媹雼�.'
 
     },
     processCard:{
         page:{
-            selectProcessCard:'瓿奠爼 旃措摐 甏�毽�',
-            selectAddProcess:'霝� 頃犽嫻',
-            productionScheduling:'氚办箻 鞁ろ枆',
+            selectProcessCard:'頂勲靹胳姢 旃措摐 甏�毽�',
+            selectAddProcess:'霝� 攵勴暊',
+            productionScheduling:'靸濎偘 鞚检爼 韼胳劚',
             selectPrintProject:'頂勲鞝濏姼 於滊牓',
             selectPrintFlowCard:"於滊牓",
-            splittingDetails:"霝� 頃犽嫻 臁绊殞",
+            splittingDetails:'頂勲爤鞛勲硠 靸侅劯 氤搓碃靹�',
             addProcessCard:"霝� 頃犽嫻 於旉皜",
-            printFlowCard:"瓿奠爼 旃措摐 於滊牓",
-            selectDetailProcessCard:"瓿奠爼 旃措摐 靸侅劯 臁绊殞"
+            printFlowCard:'頂勲靹胳姢 旃措摐 於滊牓',
+            selectDetailProcessCard:'頂勲靹胳姢 旃措摐 靸侅劯 臁绊殞'
 
         },
-        processId:'瓿奠爼 旃措摐 氩堩樃',
+        yesTitle:'鏈夋爣棰樻墦鍗�',
+        noTitle:'鏃犳爣棰樻墦鍗�',
+        buildingNumber:'妤煎彿',
+        longSide:'闀胯竟',
+        shortSide:'鐭竟',
+        printCompound:'闇�瑕佸悓鏋剁殑灞�',
+        flashback:'鍊掑簭',
+        processId:'頂勲靹胳姢 旃措摐 氩堩樃',
         founder:'攵勲鞍 鞛戩梾鞛�',
         layoutStatus:'臧�瓿� 氚办箻 靸來儨',
         splitFrame:'霝� 頃犽嫻',
-        processCardManagement:'瓿奠爼 旃措摐 甏�毽�',
+        processCardManagement:'頂勲靹胳姢 旃措摐 甏�毽�',
         quantityToDivided:'攵勲鞍 雽�旮� 毵れ垬',
         areaToDivided:'攵勲鞍 雽�旮� 氅挫爜',
         totalThickness:'齑� 霊愱粯',
         glassThickness:'鞙犽Μ 霊愱粯',
         weight:'欷戨焿',
         selectedQuantity:'靹犿儩 毵れ垬',
-        establishProcessCards:'瓿奠爼 旃措摐 靸濎劚',
-        createBySequenceNumber:'鎸夊簭鍙峰垱寤�',
-        return:' 霃岇晞臧�旮�',
-        ProductionSchedulingOk:'氚办箻 鞕勲',
-        ProductionSchedulingNo:'氙鸽鞍旃�',
+        establishProcessCards:'頂勲靹胳姢 旃措摐 靸濎劚',
+        createBySequenceNumber:'靾滌劀雽�搿� 毵岆摛旮�',
+        return:'氚橅拡',
+        ProductionSchedulingOk:'鞓堨爼霅� 靸濎偘',
+        ProductionSchedulingNo:'鞓堨爼霅橃 鞎婌潃 靸濎偘',
         orderQuantity:'欤茧 毵れ垬',
         orderArea:'欤茧 氅挫爜',
-        productionSchedulingQuantity:'氚办箻 毵れ垬',
-        quantityToScheduled:'氚办箻 雽�旮� 毵れ垬',
-        areaToScheduled:'氚办箻 雽�旮� 氅挫爜',
-        plannedProductionQuantity:'氚办箻 鞕勲 毵れ垬',
-        plannedProductionArea:'氚办箻 鞕勲 氅挫爜',
+        productionSchedulingQuantity:'鞓堨爼霅� 毵れ垬',
+        quantityToScheduled:'鞓堨爼霅橃 鞎婌潃 毵れ垬',
+        areaToScheduled:'鞓堨爼霅� 氅挫爜',
+        plannedProductionQuantity:'鞓堨爼霅� 毵れ垬',
+        plannedProductionArea:'鞓堨爼霅� 氅挫爜',
         reviewedState:'鞀轨澑 靸來儨',
-        reviewed:'鞀轨澑鞛�',
+        reviewed:'鞀轨澑 雼措嫻鞛�',
         schedulingId:'靸濎偘 氚办箻 氩堩樃',
-        notes:' 牍勱碃',
-        scheduling:'氚办箻 鞁ろ枆',
+        notes:'牍勱碃',
+        scheduling:'靸濎偘 鞀れ紑欷�',
         schedulingOk:'鞓るジ飒� 雿办澊韯� 毹检爛 靹犿儩',
         schedulingNo:'鞏戩潣 鞝曥垬 鞛呺牓 頃勳殧',
         schedulingQuantity:'臧�鞖� 靾橂焿 鞚错晿 鞛呺牓',
         schedulingArea:'鞕检 雿办澊韯� 毹检爛 靹犿儩',
         schedulingTime:'鞕检 雼澕 雿办澊韯� 靹犿儩 頃勳殧',
-        schedulingTimeOk:'攵勲鞍 雽�旮� 靾橂焿 鞚错晿 鞛呺牓',
-        schedulingTimeNo:'鞝�鞛ロ暊 雿办澊韯半ゼ 毹检爛 靹犿儩頃� 欤检劯鞖�.',
-        schedulingTimeQuantity:'鞖办浮 雿办澊韯� 鞝勳泊搿� 瓿奠爼旃措摐 靸濎劚 頉� 鞝�鞛�',
-        checkProductionScheduling:'氚办箻 雿办澊韯� 觳错伂 頃勳殧',
+        schedulingTimeOk:'雮橂垖 靾橂焿氤措嫟 鞛戧卑雮� 臧欖潃 靾瀽毳� 鞛呺牓頃橃劯鞖�',
+        schedulingTimeNo:'鞝�鞛ロ暊 雿办澊韯半ゼ 毹检爛 靹犿儩頃橃劯鞖�',
+        schedulingTimeQuantity:'頂勲靹胳姢 旃措摐毳� 靸濎劚頃橃棳 鞓るジ飒届潣 氇摖 雿办澊韯半ゼ 鞝�鞛ロ晿靹胳殧',
+        checkProductionScheduling:'鞀れ紑欷勲 雿办澊韯� 靹犿儩頃橃劯鞖�',
         saveCorrespondingValues:'頃措嫻 臧� 鞛呺牓 頉� 鞝�鞛�',
-        selectProductionSchedulingProcess:'氚办箻 瓿奠爼 靹犿儩 頃勳殧',
-        deleteThisData:'雿办澊韯� 靷牅 頇曥澑',
-        schedulingQuantityNoQuantityScheduled:'氚办箻 毵れ垬電� 氚办箻 雽�旮� 毵れ垬毳� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        selectProductionSchedulingProcess:'鞀れ紑欷勲 頂勲靹胳姢 靹犿儩 頃勳殧',
+        deleteThisData:'雿办澊韯半ゼ 靷牅頃橃嫓瓴犾姷雼堦箤?',
+        schedulingQuantityNoQuantityScheduled:'靸濎偘 靾橂焿鞚� 鞓堨暯 靾橂焿氤措嫟 韥� 靾� 鞐嗢姷雼堧嫟.',
         typesettingSuccess:'霠堨澊鞎勳泝 靹标车',
         modifySuccessfully:'靾橃爼 靹标车',
         composing:'霠堨澊鞎勳泝',
         composingOk:'霠堨澊鞎勳泝 臧�電�',
         composingNo:'霠堨澊鞎勳泝 攵堦皜',
         typesetter:'霠堨澊鞎勳泝 鞕勲',
-        revoke:'鎾ら攢鍙帓鐗�',
-        scheduledStartTime:'瓿勴殟 鞁滌瀾 鞁滉皠',
-        planEndTime:'瓿勴殟 膦呺 鞁滉皠',
+        revoke:'臁绊寪 頃挫牅',
+        scheduledStartTime:'鞓堨爼霅� 鞁滌瀾 鞁滉皠',
+        planEndTime:'鞓堨爼霅� 膦呺 鞁滉皠',
         customerId:'瓿犼皾 旖旊摐',
-        customerName:'瓿犼皾 氇呾弓',
-        technologyNumber:'靻岉幐 靾滌劀',
+        customerName:'瓿犼皾靷獏',
+        technologyNumber:'靹鸽秬 臁瓣皝 靾�',
         otherRemarks:'鞗愴寪 鞖旉惮 靷暛',
 
         pleaseSelectTheSavedDataFirst:'鞝�鞛ロ暊 雿办澊韯半ゼ 毹检爛 靹犿儩頃� 欤检劯鞖�.',
-        pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt:'鞖办浮 雿办澊韯� 鞝勳泊搿� 瓿奠爼旃措摐 靸濎劚 頉� 鞝�鞛�',
-        glassAddress:'靻岉幐 毵堩偣',
+        pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt:'鞓るジ飒届潣 氇摖 雿办澊韯半ゼ 頂勲靹胳姢 旃措摐毳� 靸濎劚頃橃棳 鞝�鞛ロ晿靹胳殧',
+        glassAddress:'毵堩偣',
         splitFrameTime:'霝� 頃犽嫻 鞁滉皠',
-        print:'瓿奠爼 旃措摐 於滊牓',
+        print:'頂勲靹胳姢 旃措摐 於滊牓',
         printLabel:'霛茧波 於滊牓',
         printSetup:'霛茧波 靹れ爼',
         specificationQuantity:'攴滉博氤� 靾橂焿',
         singlePieceProductName:'雼澕 鞁滍姼 鞝滍拡氇�',
         productType:'鞝滍拡 鞙犿槙',
         whetherToScheduleProduction:'靸濎偘 鞚检爼  韼胳劚 鞐秬',
-        deleteNo:'靷牅 鞁ろ尐. 瓿奠爼 鞛戩梾 氤搓碃 頇曥澑 頃勳殧',
-        deleteNoProcedure:'靷牅 鞁ろ尐. 頉勳啀 瓿奠爼 鞛戩梾 氤搓碃 頇曥澑 頃勳殧',
+        deleteNo:'靷牅 鞁ろ尐. 頂勲靹胳姢 旃措摐臧� 氤搓碃霅橃棃電旍 頇曥澑頃橃劯鞖� (頂茧摐氚�)',
+        deleteNoProcedure:'靷牅 鞁ろ尐. 雼れ潓 鞛戩梾鞚� 氤搓碃霅橃棃電旍 頇曥澑頃╇媹雼�.',
         pleaseCheckTheRequiredData:'頃勳殧頃� 雿办澊韯半ゼ 觳错伂頃� 欤检劯鞖�',
         notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
         landingSequence:'霝� 頃橃皑 靾滌劀',
 
         labelStyle:'霛茧波 霐旍瀽鞚�',
-        detailPrinting:'鏄庣粏鎵撳嵃',
-        detailsPrintedSeparately:'鏄庣粏鍒嗘灦鎵撳嵃',
-        customLabelPrinting:'旎れ姢韰� 霛茧波 於滊牓',
+        detailPrinting:'氇呾劯 鞚胳噭',
+        detailsPrintedSeparately:'靸侅劯 攵勴暊 鞚胳噭',
+        customLabelPrinting:'毵烄钉 霛茧波 於滊牓',
         labelPrinting:'霛茧波 於滊牓',
         sortingSuccessful:'鞝曤牞 靹标车',
         sorting:'鞝曤牞',
         pleaseSelect:'靹犿儩 頃勳殧',
-        processCardDetails:'瓿奠爼 旃措摐 靸侅劯',
+        processCardDetails:'頂勲靹胳姢 旃措摐 靸侅劯',
         thisIsTheIndoorSurface:'鞁る偞 旄‰┐ 響滌嫓',
         thisSideIsOutsideTheRoom:'鞁れ櫢 旄‰┐ 響滌嫓',
         finishedProductLabel:'鞕勳牅頀� 霛茧波',
         halfProductLabel:'氚橃牅頀� 霛茧波',
-        pleaseSelectCustomPrintLabelStyle:'旎れ姢韰� 霛茧波 霐旍瀽鞚� 靹犿儩',
+        pleaseSelectCustomPrintLabelStyle:'毵烄钉 霛茧波 霐旍瀽鞚� 靹犿儩',
         mergePrinting:'氤戫暕 於滊牓',
-        printStatus:' 於滊牓 須熿垬',
-        labelPrinting2:'霛茧波 於滊牓 ',
-        finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
-        editablePrinting:'鍙紪杈戞墦鍗�',
-        invertSelection:'鍙嶉��',
-        sortSummary:'鎺掑簭姹囨��',
+        printStatus:'於滊牓 須熿垬',
+        labelPrinting2:'霛茧波 於滊牓 2',
+        finishedProductPrinting2:'鞕勳牅頀� 鞚胳噭 2',
+        editablePrinting:'韼胳 臧�電ロ暅 鞚胳噭',
+        invertSelection:'氚� 靹犿儩',
+        sortSummary:'鞝曤牞 頃╈偘',
         addAutomatically:'鞛愲彊 毂勳毎旮�',
         selectFill:'靹犿儩 頃 毂勳毎旮�',
         engineeringPrinting:'頂勲鞝濏姼 於滊牓',
         pleaseSelectProject:'頂勲鞝濏姼 靹犿儩 頃勳殧',
         mergeState:'氤戫暕 靸來儨',
-        merge:'氤戫暕 ',
+        merge:'氤戫暕',
         printQuantity:'於滊牓 毵れ垬',
         printWarn1:'於滊牓 毵れ垬電� 欤茧 毵れ垬毳� 齑堦臣 攵堦皜',
         depthShelf:"鏋跺瓙绾垫繁(mm)",
@@ -500,12 +573,48 @@
         IntervalThickness:"闂撮殧鍘氬害(mm)",
         LongestLargestMax:"闀胯竟鏈�澶�(mm)",
         LongestShortestMax:"闀胯竟鏈�鐭�(mm)",
-        quantityMax:"鏈�澶ф暟閲�",
+        quantityMax:'鞛呺牓 靾橂焿',
         shortestLongest:"鐭竟鏈�澶�(mm)",
         shortestSide:"鐭竟鏈�鐭�(mm)",
         intelligentBranching:"歆�電ロ槙 攵勲Μ",
-        reset:"鞛劋鞝�",
+        reset:'齑堦赴頇�',
+        combinedFrame:"項� 雽�",
+        shelfNumber:'雽� 順�',
+        totalSequenceNumber:'齑濍矆順�',
+        cancelMerger:'頃╇硲 旆唽',
+        projectMsg1:'璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿',
+        orderPrint:'欤茧靹� 鞚胳噭',
+        numberLabelPrintingOperations:'霛茧波 鞚胳噭 須熿垬',
+        numberTimesProcessCardPrinted:'頂勲靹胳姢 旃措摐 鞚胳噭 須熿垬',
+        projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
+        layoutNumber:'鐗堝浘鍙�',
+        addFlowCardMsg1:'璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�',
+        addFlowCardMsg2:'璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�',
+        okFlowCard:'宸插垎鏋�',
+        noFlowCard:'鏈垎鏋�',
+        mainWidth:'瀹介珮',
+        mainHeight:'楂樺',
+        terminationQuantity:'鐢熶骇缁堟鏁伴噺',
+        terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
+        maxCompleted:'缁堟鏁伴噺',
+        terminationNo:'鍙栨秷缁堟',
+        updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
+        termination:'缁堟',
 
+        quantity:'宸ョ▼鐢ㄦ暟閲�',
+        print1:'11鍒�4琛�',
+        print2:'6琛�3鍒�',
+        glassId:'鐜荤拑缂栧彿',
+        polysId:'灏忕墖搴忓彿',
+        msg:{
+            msg1:'娴佺▼鍗″垱寤哄け璐�',
+            msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
+            msg3:'鎵�閫夋暟鎹殑鏁伴噺鎬诲拰',
+            msg4:'涓庤鍗曟暟閲�',
+            msg5:'涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛�',
+            msg6:'鏄惁鍚堝苟?',
+            msg7:'鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�',
+        }
     },
     reportingWorks:{
         page:{
@@ -513,108 +622,129 @@
             addReportingWork:"瓿奠垬 氤搓碃 於旉皜",
             qualityInspectionReview:"瓴�頀� 鞀轨澑",
         },
+        msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+        saveWorkStorage:'鎶ュ伐鍏ュ簱',
+        mannerPacking:'鍖呰鏂瑰紡',
         glassNumber:'鞚茧牗氩堩樃',
-        glassAddress:'鞙犽澕韺� 毵堩偣',
-        WorkReportingManagement:'鞛戩梾 鞁れ爜 氤搓碃',
-        addReportingWorks:'瓿奠垬 氤搓碃 於旉皜',
+        glassAddress:'毵堩偣',
+        WorkReportingManagement:'鞐呺 氤搓碃 甏�毽�',
+        addReportingWorks:'鞐呺 氤搓碃 於旉皜',
         qualityInspectionReview:'瓴�頀� 鞀轨澑',
-        early:'臁办“ 攴茧',
-        nightShift:'鞎缄皠 攴�',
-        numberProcessCards:'瓿奠爼 旃措摐 毵れ垬',
-        reportableQuantityOk:'氤搓碃 臧�電� 毵れ垬',
+        early:'鞓れ爠 攴茧',
+        nightShift:'鞎缄皠 攴茧',
+        numberProcessCards:'頂勲靹胳姢 旃措摐 靾�',
+        reportableQuantityOk:'氤搓碃 臧�電� 靾橂焿',
         completedQuantity:'鞕勲 靾橂焿',
-        quantityBroken:'攵堧焿 毵れ垬',
+        quantityBroken:'攵堧焿 靾橂焿',
         completed:'鞕勲 觳橂Μ霅�',
         onceBroken:'攵堧焿 觳橂Μ霅�',
-        available:'鞛櫆鞖� 臧�電�',
-        returnProcess:'氚橃啞 瓿奠爼',
+        available:'靷毄臧�電�',
+        returnProcess:'氚橅拡 頂勲靹胳姢',
         breakageType:'攵堧焿 鞙犿槙',
         breakageReason:'攵堧焿 鞗愳澑',
-        responsibleProcess:'毂呾瀯 瓿奠爼',
+        responsibleProcess:'毂呾瀯 頂勲靹胳姢',
         responsibleEquipment:'毂呾瀯 靹る箘',
-        responsibleTeam:'毂呾瀯 氚橃“',
+        responsibleTeam:'毂呾瀯 韺�',
         responsiblePersonnel:'毂呾瀯 鞛戩梾鞛�',
         increase:'於旉皜',
-        lossCount:'靻愳嫟 靾橃瀽',
-        completedNumber:'鞕勲 ',
+        lossCount:'靻愳嫟 靾�',
+        completedNumber:'鞕勲霅� 靾橂焿',
         sumOf:'頃╆硠',
-        greaterThanNo:'斓滊寑臧掛潉 齑堦臣頃� 靾� 鞐嗢姶',
-        selectProcessCardData:'瓿奠爼 旃措摐 雿办澊韯� 靹犿儩 頃勳殧',
+        greaterThanNo:'齑堦臣 攵堦臣',
+        selectProcessCardData:'頂勲靹胳姢 旃措摐 雿办澊韯� 靹犿儩 頃勳殧',
         selectWorkReportingEquipment:'氤搓碃 靹る箘 靹犿儩 頃勳殧',
         atLeastOneFinishedAndWornEligible:'靻愳嫟 靾橂焿瓿� 鞕勲 靾橂焿鞚� 0氤措嫟 韥� 頃鞚� 斓滌唽 頃� 臧� 鞚挫儊 鞛呺牓頃橃劯鞖�',
         successfulJobApplication:'氤搓碃 靹标车',
-        actualQuantity:'鞁れ牅 氤搓碃 臧�電� 靾橂焿',
-        thisProcessQuantity:'鞛戩梾 氤搓碃 靾橂焿',
-        reReportingWork:'頇旊┐ 靸堧 瓿犾龚 頉� 鞛嫓霃勴暣 欤检劯鞖�',
-        correctFormatProcessCard:'瓿奠爼 旃措摐 順曥嫕 鞓る',
-        processCardCorrectNumberDigits:'鞓皵毳� 鞛愲靾橃潣 瓿奠爼 旃措摐毳� 鞛呺牓頃橃劯鞖�',
-        selectProcess:'瓿奠爼 靹犿儩 頃勳殧',
-        firstProcessNotReview:'觳� 瓿奠爼 瓴�頀� 靸濍灥',
-        thisProcessNotProcessCard:' 頃措嫻 瓿奠爼 旃措摐鞐� 瓿奠爼 氙疙彫頃�',
-        noDataThisProcessCard:'瓿奠爼 旃措摐 雿办澊韯� 氙胳“須�',
-        serialNumber:'鞚茧牗 氩堩樃',
-        quantityNotPreviousProcessNum:'瓿奠爼 靾橂焿鞚� 鞚挫爠 瓿奠爼 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        actualQuantity:'鞁れ牅 氤搓碃 臧�電� 毵れ垬',
+        thisProcessQuantity:'氤搓碃鞕勲霅� 毵れ垬',
+        reReportingWork:'頇旊┐ 靸堧瓿犾龚 頉� 鞛嫓霃�',
+        correctFormatProcessCard:'頂勲靹胳姢 旃措摐 順曥嫕 鞓る',
+        processCardCorrectNumberDigits:'鞓皵毳� 鞛愲靾橃潣 頂勲靹胳姢 旃措摐毳� 鞛呺牓頃橃劯鞖�',
+        selectProcess:'頂勲靹胳姢 靹犿儩 頃勳殧',
+        firstProcessNotReview:'觳矆歆� 頂勲靹胳姢電� 瓴�韱犿暊 頃勳殧臧� 鞐嗢姷雼堧嫟.',
+        thisProcessNotProcessCard:'鞚� 鞝堨皑電� 頂勲靹胳姢 旃措摐鞐� 靻嶍晿歆� 鞎婌姷雼堧嫟.',
+        noDataThisProcessCard:'鞚� 頂勲靹胳姢 旃措摐鞐� 雽�頃� 雿办澊韯半ゼ 彀眷潉 靾� 鞐嗢姷雼堧嫟.',
+        serialNumber:'鞚茧牗氩堩樃',
+        quantityNotPreviousProcessNum:'靾橂焿鞚� 鞚挫爠 鞛戩梾 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
         enterTheSerialNumber:'鞚茧牗氩堩樃毳� 鞛呺牓頃� 欤检劯鞖�',
-        correctQuantity:'鞝曧檿頃� 鞏戫拡 順轨潃 攵堧焿 靾橂焿 鞛呺牓',
-        processCardArea:'瓿奠爼 旃措摐 氅挫爜',
+        correctQuantity:'鞝曧檿頃� 鞏戫拡, 攵堧焿路韺岇啇 靾橂焿',
+        processCardArea:'頂勲靹胳姢 旃措摐 氅挫爜',
         deviceType:'氤搓碃 靹る箘',
         pleaseDevice:'靹る箘 靹犿儩',
-        previousProcess:'靸侅渼 瓿奠爼',
-        numberReported:'氤搓碃 臧�電� 毵れ垬',
-        teamsType:'氤搓碃 氚橃“',
-        selectTeam:'氤搓碃 氚橃“ 靹犿儩',
+        previousProcess:'鞚挫爠 頂勲靹胳姢',
+        numberReported:'靾橂焿鞚� 氤搓碃頃� 靾� 鞛堨姷雼堧嫟.',
+        teamsType:'氤搓碃 韺�',
+        selectTeam:'韺�鞚� 靹犿儩頃挫<靹胳殧.',
         classes:'攴茧 臁�',
         selectClasses:'攴茧 臁� 靹犿儩',
-        nextProcess:'頃橃渼 瓿奠爼',
+        nextProcess:'雼れ潓 頂勲靹胳姢',
         reportingWorkTime:'氤搓碃 鞚检瀽',
         damageList:'韺岇啇 鞚措牓 氇╇',
         qualityInspector:'瓴�靷洂',
         qualityInsStatus:'瓴�頀� 靸來儨',
-        previousProcessQuantity:'靸侁车鞝� 鞕勲 毵れ垬',
+        previousProcessQuantity:'鞚挫爠 頂勲靹胳姢 靾橂焿',
         selectBreakageType:'攵堧焿 鞙犿槙 靹犿儩',
         selectBreakageReason:'攵堧焿 鞗愳澑 靹犿儩 頃勳垬',
-        selectResponsibleProcess:'雼措嫻 瓿奠爼鞚� 靹犿儩頃橃劯鞖�',
+        selectResponsibleProcess:'雼措嫻 頂勲靹胳姢毳� 靹犿儩頃橃劯鞖�',
         selectResponsibleEquipment:'雼措嫻 靹る箘毳� 靹犿儩頃橃劯鞖�',
-        availableOkReturnProcess:'鞛櫆鞖� 鞁� 氚橃啞 瓿奠爼 靹犿儩',
+        availableOkReturnProcess:'鞚措 靹犿儩頃� 頃鞚� 靷毄頃橃劯鞖�. 氚橅拡 鞝堨皑毳� 靹犿儩頃� 欤检劯鞖�.',
         enterIntegerGreaterThan:'0氤措嫟 韥� 鞝曥垬毳� 鞛呺牓頃橃劯鞖�',
         enterIntegerGreaterThanEqualTo:'0 齑堦臣 鞝曥垬 鞛呺牓',
         saveAndReview:'鞝�鞛� 頉� 鞀轨澑',
         reportingWorkId:'鞁れ爜 氤搓碃 氩堩樃',
-        reportingProcess:'鞁れ爜 氤搓碃 瓿奠爼',
+        reportingProcess:'鞁れ爜 氤搓碃 頂勲靹胳姢',
         glassChild:'雼寪 鞙犽Μ 氇呾弓',
         thisCompletedQuantity:'氤� 瓿奠爼 鞕勲',
         thisWornQuantity:'氤� 瓿奠爼 攵堧焿',
         passAudit:'鞀轨澑 鞕勲',
-        patchCondition:'氤挫儊 鞝堨皑 靸來儨',
+        patchCondition:'韺箻 靸來儨',
         changeFailed:'靾橃爼 鞁ろ尐,  鞁れ爜 氤搓碃 鞚搓磤 欤茧 鞐秬 頇曥澑頃� 欤检劯鞖�',
+        hiddenVal:'闅愯棌',
 
-
+        futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+        longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
         selectResponsibleTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
         selectWorkReportingTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
         successfulModificationOfWorkApplication:'鞛戩梾 氤搓碃 靾橃爼 靹标车',
-        theProcessCardNumberCannotBeEmpty:'瓿奠爼 旃措摐 氩堩樃電� 頃勳垬 鞛呺牓 頃鞛呺媹雼�.',
+        theProcessCardNumberCannotBeEmpty:'頂勲靹胳姢 旃措摐 氩堩樃電� 頃勳垬 鞛呺牓 頃鞛呺媹雼�.',
         unqualified:'氙戈瞼靷�',
         qualified:'瓴�靷� 鞕勲',
         thisProcess:'順勳灛 瓿奠爼',
-        qualityInsTime:'瓴�靷� 鞁滉皠',
-        completedArea:'鞏戫拡 氅挫爜',
+        qualityInsTime:'頀堨 瓴�靷� 鞁滉皠',
+        completedArea:'鞕勲 氅挫爜',
         wornArea:'攵堧焿 氅挫爜',
-        pleaseGreaterThanOrEqual1:'鈮レ瀰霠�',
-        pleaseGreaterThanOrEqual2:'鞚� 靾橃瀽',
-        lossCount1:'靻愳嫟 靾橃瀽',
-        lossCount2:'斓滊寑臧掛潉 齑堦臣頃� 靾� 鞐嗢姶',
-        pleaseCheckTheOrderNumber1:'欤茧 鞚茧牗氩堩樃 鞛戩梾 瓴�靷�',
-        pleaseCheckTheOrderNumber2:'氤搓碃 靾橂焿 攵堨澕旃橃澑歆� 頇曥澑',
+        pleaseGreaterThanOrEqual1:'鈮レ瀰霠�("鞚挫儊" 鞛呺牓)',
+        pleaseGreaterThanOrEqual2:'X 靾瀽',
+        lossCount1:'靻愳嫟 靾瀽',
+        lossCount2:'齑堦臣頃� 靾� 鞐嗢潓',
+        pleaseCheckTheOrderNumber1:'欤茧氩堩樃毳� 頇曥澑頃橃劯鞖�',
+        pleaseCheckTheOrderNumber2:'氤搓碃霅� 鞛戩梾鞚� 靾橁皜 霃欖澕頃滌 鞐秬',
         pleaseNumber1:'鞚茧牗 氩堩樃',
-        pleaseNumber2:'靻岉幐 靾滌劀',
-        pleaseNumber3:'鞁れ牅 氤搓碃 臧�電� 靾橂焿',
-        pleaseNumber4:'鞛戩梾 氤搓碃 靾橂焿',
+        pleaseNumber2:'靹鸽秬 臁瓣皝 靾�',
+        pleaseNumber3:'鞁れ牅 氤搓碃 臧�電� 毵れ垬',
+        pleaseNumber4:'氤搓碃霅� 靾橂焿',
         pleaseNumber5:'頇旊┐ 靸堧 瓿犾龚 頉� 鞛嫓霃勴暣 欤检劯鞖�',
-        pleaseNumber6:'鞚茧牗 氩堩樃',
-        pleaseNumber7:'瓿奠爼 靾橂焿鞚� 鞚挫爠 瓿奠爼 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        pleaseNumber6:'鞚茧牗氩堩樃',
+        pleaseNumber7:'靾橂焿鞚� 鞚挫爠 頂勲靹胳姢 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
         pleaseNumber8:'鞚茧牗氩堩樃毳� 鞛呺牓頃� 欤检劯鞖�',
-        pleaseNumber9:'鞝曧檿頃� 鞏戫拡 順轨潃 攵堧焿 靾橂焿 鞛呺牓',
-        pleaseNumber10:'鞏戫拡 靾橂焿鞚� 瓿奠爼 旃措摐 齑濍焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟.',
+        pleaseNumber9:'鞝曧檿頃� 鞏戫拡 順轨潃 攵堧焿 靾橂焿',
+        pleaseNumber10:'鞏戫拡 靾橂焿鞚� 頂勲靹胳姢 旃措摐 齑濍焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟.',
+        pleaseNumber11:'瀹屽伐+娆$牬鏁伴噺涓嶈兘澶т簬鍙畬宸ユ暟閲�',
+        pleaseNumber12:'鏈伐搴忔姤宸ユ暟:',
+        pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
+        pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
+        pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+        pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+        woodenBox:'鏈ㄧ:',
+        brandreth:'閾佹灦',
+        tilting:'鍊掓灦',
+        secondaryBreakage:'搴忓彿娆$牬鐩稿悓',
+        checkedBreakage:'閫変腑娆$牬鐩稿悓',
+        unreviewed:'鏈鏍�',
+        notunreviewed:'瀹℃牳鏈�氳繃',
+        notQualified:'鏃犻渶璐ㄦ',
     },
     productStock:{
         page:{
@@ -625,79 +755,79 @@
             finishedProductOut:'鞕勳牅頀� 於滉碃',
             finishedGoodsIssue:'鞕勳牅頀� 鞚胳稖',
             transferRecord:'鞚搓磤 旮半',
-            takeOutRecord:'鞚胳稖 旮半'
+            takeOutRecord:'於滉碃 旮半'
         },
         inventoryQuery:'鞛碃 臁绊殞',
-        finishedProductWarehousing:"鞕勳牅頀� 鞛呹碃 ",
+        finishedProductWarehousing:'鞕勳牅頀� 鞛呹碃',
         finishedProductOutbound:'鞕勳牅頀� 於滉碃',
-        finishedProductOrderReturn:"鞕勳牅頀� 欤茧 氚橅拡 ",
-        reportForms:"氤搓碃靹� ",
-        remarks:" 牍勱碃",
+        finishedProductOrderReturn:'鞕勳牅頀� 欤茧 氚橅拡',
+        reportForms:'氤搓碃靹�',
+        remarks:'牍勱碃',
         outbound:'於滉碃',
         orderTransfer:'欤茧 鞚搓磤',
-        finishedProductPickup:"鞕勳牅頀� 鞚胳稖 ",
-        finishedProductRework:" 鞕勳牅頀� 鞛皜瓿� ",
+        finishedProductPickup:'鞕勳牅頀� 於滉碃',
+        finishedProductRework:'鞕勳牅頀� 鞛皜瓿�',
         pleaseEnterTheStorageLocation:'鞝�鞛� 鞙勳箻 鞛呺牓 頃勳殧',
-        pleaseEnterANote:"牍勱碃 頃勲摐 鞛呺牓 頃勳殧 ",
+        pleaseEnterANote:'牍勱碃霝� 鞛呺牓 頃勳殧',
         completedQuantity:'鞕勲 靾橂焿',
-        finishedProductInventory:"鞕勳牅頀� 鞛碃 ",
+        finishedProductInventory:'鞕勳牅頀� 鞛碃',
         confirmOutbound:'於滉碃 頇曥澑',
         confirmReceiptOfGoods:'鞛呹碃 頇曥澑',
         quantityToBeStockedIn:'鞛呹碃 鞓堨爼 靾橂焿',
-        return:' 霃岇晞臧�旮�',
-        reverseReviewList:'鞛姽鞚� 雽�靸� 氇╇',
+        return:'氚橅拡',
+        reverseReviewList:'氇╇ 瓴�韱�',
         receivedSuccessfully:'鞛呹碃 靹标车',
-        deliverySuccessful:"於滉碃 靹标车 ",
-        successfullyRetrieved:'鞚胳稖 鞕勲',
+        deliverySuccessful:'雮╉拡 靹标车',
+        successfullyRetrieved:'於滉碃 鞕勲',
         reworkSuccessful:'鞛皜瓿� 鞕勲',
-        transferSuccessful:'鞚搓磤 鞕勲',
-        reviewSuccessful:'鞀轨澑 鞕勲',
-        invalidSuccessfully:'氚橃瀰 鞕勲',
+        transferSuccessful:'靸來樃 甑愴櫂 鞕勲',
+        reviewSuccessful:'瓴�韱� 鞕勲',
+        invalidSuccessfully:'氚橅拡 鞕勲',
         reverseReviewSuccessful:'鞛瞼韱� 鞕勲',
-        confirmWithdrawal:'鞚胳稖 頇曥澑',
-        pickingOutRecords:'鞚胳稖 旮半',
-        confirmTransfer:'鞚搓磤 頇曥澑',
-        transferRecords:'鞚搓磤 旮半',
-        reworkConfirmation:'鞛皜瓿� 頇曥澑',
-        reworkRecords:'鞛皜瓿� 旮半',
-        warehousingRecords:'鞛呹碃 旮半',
-        outboundRecords:'於滉碃 旮半',
-        pleaseSelectTheTypeOfWithdrawal:'鞚胳稖 鞙犿槙鞚� 靹犿儩頃橃劯鞖�',
+        confirmWithdrawal:'於滉碃頇曥澑',
+        pickingOutRecords:'於滉碃旮半',
+        confirmTransfer:'靸來樃 甑愴櫂 頇曥澑',
+        transferRecords:'靸來樃 甑愴櫂 旮半',
+        reworkConfirmation:'鞛瀾鞐� 頇曥澑',
+        reworkRecords:'鞛瀾鞐� 旮半',
+        warehousingRecords:'鞛呹碃旮半',
+        outboundRecords:'於滉碃旮半',
+        pleaseSelectTheTypeOfWithdrawal:'於滉碃鞙犿槙鞚� 靹犿儩頃橃劯鞖�',
         pleaseSelectTheTypeOfRework:'鞛皜瓿� 鞙犿槙鞚� 靹犿儩頃橃劯鞖�',
-        receivedQuantity:'鞚胳稖 靾橂焿',
+        receivedQuantity:'於滉碃靾橂焿',
         reworkQuantity:'鞛皜瓿惦焿',
-        transferQuantity:'鞚搓磤霟�',
-        receivedReworkedQuantity:'鞚胳稖/鞝滉皜瓿惦焿',
+        transferQuantity:'靸來樃 甑愴櫂 靾橂焿',
+        receivedReworkedQuantity:'於滉碃/鞛瀾鞐呺焿',
         inventoryQuantity:'鞛碃靾橂焿',
-        availableQuantity:'臧�鞖� 靾橂焿',
+        availableQuantity:'臧�鞖╈垬霟�',
         newOrderNumber:'鞁犼窚 欤茧 鞚茧牗氩堩樃',
         newOrderId:'鞁犼窚 欤茧 氩堩樃',
-        transferOrderNumber:'鞚搓磤 欤茧氩堩樃',
+        transferOrderNumber:'靸來樃 甑愴櫂 欤茧氩堩樃',
         operationOrderNumber:'鞛戩梾 歆�鞁� 氩堩樃',
-        inventoryArea:'鞛碃 氤搓磤 甑棴',
+        inventoryArea:'鞛碃 歆�鞐�',
         dataVerificationFailed:'雿办澊韯� 瓴�歃� 鞁ろ尐',
         unselectedData:'雿办澊韯� 氙胳劆韮�',
         pleaseEnterAPositiveInteger:'鞏戩潣 鞝曥垬 鞛呺牓 頃勳殧',
-        pleaseEnterTheOrderIdForTheTransfer:'鞚搓磤 欤茧 氩堩樃毳� 鞛呺牓頃橃劯鞖�',
-        pleaseEnterTheOrderNumberForTheTransfer:'鞚搓磤 欤茧 鞚茧牗氩堩樃毳� 鞛呺牓頃橃劯鞖�',
-        pheTransferQuantityCannotBeGreaterThanTheOrderQuantity:'鞚搓磤 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
-        transferQuantityCannotBeEmptyOr0:'鞚搓磤 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢姷雼堧嫟',
-        theClaimedQuantityCannotBeGreaterThanTheOrderQuantity:'鞚胳稖 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
-        claimedQuantityCannotBeEmptyOr0:'鞚胳稖 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢姷雼堧嫟',
-        theReworkQuantityCannotBeGreaterThanTheOrderQuantity:'鞛皜瓿� 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
-        reworkQuantityCannotBeEmptyOr0:'鞛皜瓿� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢潓',
+        pleaseEnterTheOrderIdForTheTransfer:'鞚挫爠頃� 欤茧 氩堩樃毳� 鞛呺牓頃橃劯鞖�',
+        pleaseEnterTheOrderNumberForTheTransfer:'鞚挫爠頃� 欤茧 鞚茧牗氩堩樃毳� 鞛呺牓頃橃劯鞖�',
+        pheTransferQuantityCannotBeGreaterThanTheOrderQuantity:'靸來樃 甑愴櫂頃� 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        transferQuantityCannotBeEmptyOr0:'靸來樃 甑愴櫂頃� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢姷雼堧嫟',
+        theClaimedQuantityCannotBeGreaterThanTheOrderQuantity:'觳惮 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        claimedQuantityCannotBeEmptyOr0:'觳惮 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢姷雼堧嫟',
+        theReworkQuantityCannotBeGreaterThanTheOrderQuantity:'鞛瀾鞐� 靾橂焿鞚� 欤茧 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
+        reworkQuantityCannotBeEmptyOr0:'鞛瀾鞐� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢潓',
         storageTime:'鞛呹碃 鞚检嫓',
-        outboundTime:'於滉碃 鞚检嫓',
+        outboundTime:'頀堨爤 鞚检嫓',
         modificationTime:'靾橃爼 鞚检嫓',
         productionDate:'氍胳劀 鞛戩劚 鞚检瀽',
-        statementDate:'氤搓碃靹� 鞚检瀽 ',
+        statementDate:'氤搓碃靹� 鞚检瀽',
         approvedDate:'鞀轨澑 鞚检瀽',
         creator:'鞛戩劚鞛�',
-        reviewed:'鞀轨澑鞛�',
+        reviewed:'鞀轨澑 雼措嫻鞛�',
         documentStatus:'氍胳劀 靸來儨',
         status:'鞀轨澑 靸來儨',
         totalNumberOfOrders :'齑� 欤茧 毵れ垬',
-        quantityAlreadyInStock:'鞛呹碃 鞕勲 毵れ垬 ',
+        quantityAlreadyInStock:'鞛呹碃 鞕勲 靾橂焿',
         totalArea:'齑濍┐鞝�',
         singlePieceArea:'雼┐鞝�',
         perimeter:'霊橂爤 旮胳澊',
@@ -705,22 +835,28 @@
         entryFailure:'鞛呹碃 鞁ろ尐',
         entry:'鞛呹碃',
         failedToRetrieve:'於滉碃 鞁ろ尐',
-        deliveryFailed:'於滉碃 鞁ろ尐',
+        deliveryFailed:'氚办啞 鞁ろ尐',
         reworkFailed:'鞛瀾鞐� 鞁ろ尐',
         transferFailed:'鞚挫啞 鞁ろ尐',
         approved:'鞀轨澑 鞕勲',
-        notPassed:'氙胳姽鞚� 欤茧',
+        notPassed:'鞁ろ尐',
         cancellationFailed:'氍错毃頇� 氤店惮 鞁ろ尐',
-        voidFailed:'氍错毃頇� 鞁ろ尐',
-        staterOperationOrderNumber:'鞚挫啞 韺愲Г 鞝勴憸 氩堩樃',
-        endOperationOrderNumber:'鞚挫啞 鞚茧牗氩堩樃',
+        voidFailed:'旆唽 鞁ろ尐',
+        staterOperationOrderNumber:'韺愲Г 欤茧 氩堩樃 鞝勲嫭',
+        endOperationOrderNumber:'靾滌劀 氩堩樃 鞝勲嫭',
         typeClaim:'於滉碃 鞙犿槙',
         pleaseEnterTheBoxNumber:'氚曥姢 氩堩樃 鞛呺牓 鞖旍箔',
 
         boxNumber:'旎厡鞚措剤 氩堩樃',
-        msg1:'於滉碃 鞝勴憸 觳橂Μ 鞕勲, 頇旊┐ 靸堧瓿犾龚',
-        msg2:'於滉碃 鞝勴憸 鞛碃 靾橂焿 氙胳“須�',
-        msg3:'鞛呹碃霟夓潃 欤茧 齑濍焿 齑堦臣 攵堦皜'
+        msg1:'斓滊寑 5MB 鞚措偞 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧',
+        msg2:'JPG 霕愲姅 PNG 順曥嫕鞚� 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧',
+        msg3:'JPG 霕愲姅 PNG 順曥嫕鞚� 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧 . 斓滊寑 5MB',
+        boxingPrinting:'瑁呯鎵撳嵃',
+        packing:'瑁呯璋冩灦',
+        msgPacking:'瑁呯璋冩灦鎴愬姛',
+        boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+        msg4:'鍙戣揣鍗曞凡鍒涘缓',
+        msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
     },
     customer:{
         page:{
@@ -729,18 +865,18 @@
             selectCustomerOrder:'瓿犼皾 欤茧'
         },
         pleaseEnterTheCustomerName:'瓿犼皾靷獏 鞛呺牓',
-        pleaseEnterCustomerLevel:"瓿犼皾 霌标笁 鞛呺牓 ",
-        pleaseEnterTheAmountOfFunds:'鞁犾毄 頃滊弰鞎� 鞛呺牓',
-        pleaseEnterTheContactAddress:"欤检唽 鞛呺牓 ",
-        pleaseEnterTheContactPerson:"雼措嫻鞛� 鞛呺牓 ",
-        pleaseEnterTheContactPhoneNumber:"鞐半澖觳� 鞛呺牓",
-        customerGrade:'瓿£皾 霌标笁',
-        moneyLimit:"旮堨暋 頃滊弰 ",
-        address:"欤检唽 ",
-        contacts:'鞐瓣硠鞚�',
-        telephone:"鞐半澖觳� ",
+        pleaseEnterCustomerLevel:'瓿犼皾 霌标笁 鞛呺牓',
+        pleaseEnterTheAmountOfFunds:'頂勲鞝濏姼 氇呾弓 鞛呺牓 頃勳殧',
+        pleaseEnterTheContactAddress:'鞐半澖觳� 欤检唽 鞛呺牓',
+        pleaseEnterTheContactPerson:'雼措嫻鞛� 鞛呺牓',
+        pleaseEnterTheContactPhoneNumber:'鞐半澖觳� 氩堩樃 鞛呺牓',
+        customerGrade:'瓿犼皾 霌标笁',
+        moneyLimit:'旮堨暋 頃滊弰',
+        address:'欤检唽',
+        contacts:'雼措嫻鞛�',
+        telephone:'鞝勴檾氩堩樃',
         customerNumber:'瓿犼皾 氩堩樃',
-        customerName:"瓿犼皾靷獏 ",
+        customerName:'瓿犼皾靷獏',
         resetting:'齑堦赴頇�',
         customerOrders:'瓿犼皾 欤茧',
         orderAmount:'欤茧 旮堨暋',
@@ -748,56 +884,59 @@
         customerAbbreviation:'瓿犼皾靷� 鞎届弓',
         pleaseEnterTheCustomerAbbreviation:'瓿犼皾靷� 鞎届弓鞚� 鞛呺牓頃� 欤检劯鞖�.',
         msgList:{
-            notCustomerInfo:'瓿犼皾 鞝曤炒 臁绊殞 鞁ろ尐',
+            notCustomerInfo:'瓿犼皾 鞝曤炒毳� 彀眷潉 靾� 鞐嗢姷雼堧嫟.',
         }
     },
     delivery:{
         page:{
             selectDelivery:'於滉碃 雽�鞁滊炒霌�',
             selectOrderList:"欤茧 於滉碃 觳橂Μ ",
-            shipmentDetailsReport:"於滉碃 靸侅劯 氤搓碃靹� ",
-            shipmentProductClassificationReport:"頀堧氤� 於滉碃 氤搓碃靹� ",
+            shipmentDetailsReport:'於滉碃 靸侅劯 氤搓碃靹�',
+            shipmentProductClassificationReport:'頀堧氤� 於滉碃 氤搓碃靹�',
             createDelivery:'鍙戣揣鍒涘缓',
             deliveryReport:'鍙戣揣鎶ヨ〃'
         },
-        delivery:'於滉碃',
+        delivery:'雮╉拡 甏�毽�',
         place :'欤茧 靸濎劚',
         technology:'瓿奠爼',
         produce:'靸濎偘',
-        traveler:'瓿奠爼 旃措摐',
+        traveler:'頂勲靹胳姢 旃措摐',
         warehousing:'鞛呹碃',
-        unpaidQuantity:"氙胳稖瓿� 毵れ垬 ",
+        unpaidQuantity:'氙胳稖瓿� 毵れ垬',
         availableStock:'臧�鞖� 鞛碃',
-        deliveryQuantity:'於滉碃 靾橂焿',
+        deliveryQuantity:'於滉碃 毵れ垬',
         pleaseEnterTheAmountOfFunds:'頂勲鞝濏姼 氇呾弓 鞛呺牓 頃勳殧',
-        pleaseSelectPaymentTerms:"瓴办牅 臁瓣贝 靹犿儩 頃勳殧 ",
-        pleaseEnterThePaymentMethod:"靾橁笀 氚╈嫕 鞛呺牓 頃勳殧 ",
-        pleaseSelectTheSameCustomerOrder:'霃欖澕 瓿犼皾靷� 欤茧 靹犿儩 鞖旍箔',
+        pleaseSelectPaymentTerms:'瓴办牅 臁瓣贝 靹犿儩 頃勳殧',
+        pleaseEnterThePaymentMethod:'瓴办牅 氚╇矔鞚� 鞛呺牓頃橃劯鞖�',
+        pleaseSelectTheSameCustomerOrder:'霃欖澕 瓿犼皾 欤茧鞚� 靹犿儩頃橃劯鞖�',
         deliveryNoteSubmittedSuccessfully:"於滉碃 鞝勴憸 鞝滌稖 鞕勲",
-        pleaseEnterANumericalValueGreaterThanOrEqualTo0:'0 鞚挫儊鞚� 靾橃箻毳� 鞛呺牓頃橃劯鞖�',
+        pleaseEnterANumericalValueGreaterThanOrEqualTo0:'0 鞚挫儊鞚� 臧掛潉 鞛呺牓頃橃劯鞖�',
         theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity:"氚滌啞 靾橂焿鞚� 鞛碃霟夓潉 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟",
         theShipmentQuantityCannotBeEmptyOr0:"氚滌啞 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢姷雼堧嫟",
         paymentTerms:'瓴办牅 臁瓣贝',
-        paymentDate:"鞛呹笀 鞚检瀽 ",
+        paymentDate:'鞛呹笀 鞚检瀽',
         selectDate:'雮犾 靹犿儩',
-        paymentMethod:"靾橁笀 氚╈嫕 ",
+        paymentMethod:'瓴办牅 氚旊矔',
         shippingAddress:'氚办啞 欤检唽',
-        deliveryReportDate:'於滉碃 氤搓碃靹� 旮办鞚� ',
-        shipper:"於滉碃 雼措嫻鞛� ",
-        deliveryNoteId:'於滉碃 鞝勴憸 氩堩樃',
-        deliveryNoteNumber:'於滉碃 鞚茧牗氩堩樃',
-        deliveryDate:"於滉碃 鞚检瀽 ",
-        contacts:'鞐瓣硠鞚�',
-        contactNumber:'霠澖觳�',
+        deliveryReportDate:'於滉碃 氤搓碃鞚�',
+        shipper:'氚办啞鞐呾泊',
+        deliveryNoteId:'於滉碃 鞝勴憸 ID',
+        deliveryNoteNumber:'於滉碃 氩堩樃',
+        deliveryDate:'雮╆赴 鞚检瀽',
+        contacts:'雼措嫻鞛�',
+        contactNumber:'鞐半澖觳�',
         salesman:'鞓侅梾 雼措嫻鞛�',
         money:'旮堨暋',
 
-        pleaseSelectTheSameCustomerProject:'霃欖澕 瓿犼皾靷� 頂勲鞝濏姼 靹犿儩 鞖旍箔',
+        pleaseSelectTheSameCustomerProject:'霃欖澕頃� 瓿犼皾鞚� 頂勲鞝濏姼毳� 靹犿儩頃橃劯鞖�',
         noMoney:'旮堨暋 氙戈赴鞛�',
         freightPrice:'鞖挫啞 雼皜',
         freightQuantity:'鞖挫啞 靾橂焿',
         freight:'鞖挫啞 牍勳毄',
-        pleaseMsg1:'欤茧 雮� 於旉皜 雼皜 氙戈赴鞛� 頃 臁挫灛',
+        pleaseMsg1:'欤茧靹� 旮绊儉旮堨暋 雼皜臧� 旮办瀰霅橃 鞎婌晿鞀惦媹雼�',
+        print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+        print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+        orderAdd:'璁㈠崟娣诲姞',
 
     },
     replenish:{
@@ -807,33 +946,37 @@
             printReplenishFlowCard:"氤挫晥韺� 於滊牓"
         },
 
-        patchManagement:'氤挫订 鞝堩幐 甏�毽�',
-        addPatches:"氤挫晥韺� 於旉皜 ",
-        printPatches:'氤挫晥韺� 於滊牓',
-        patchNumber:'氤挫晥韺� 氩堩樃',
+        patchManagement:'韺箻 甏�毽�',
+        addPatches:'韺箻 於旉皜',
+        printPatches:'韺箻 於滊牓',
+        patchNumber:'韺箻 氩堩樃',
         mark:'毵堩偣',
-        sliceMarking:'鞙犽澕韺� 毵堩偣',
+        sliceMarking:'鞙犽Μ韺� 毵堩偣',
+        printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
+        labelTemplate:'鏍囩妯℃澘锛�',
+        listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
 
     },
     rework:{
         page:{
             selectRework:"鞛皜瓿� 甏�毽�",
-            addRework:"鞛皜瓿� 於旉皜",
+            addRework:'鞛瀾鞐� 於旉皜',
             printReworkFlowCard:"鞛皜瓿� 於滊牓"
         },
         reworkManagement:'鞛瀾鞐� 甏�毽�',
-        addRework:"鞛皜瓿� 於旉皜 ",
-        printRework:'鞛皜瓿� 於滊牓',
-        reworkNumber:'鞛皜瓿� 氩堩樃',
-        reworkTeam:'鞛皜瓿� 韺�',
-        reasonForRework:"鞛皜瓿� 靷湢 ",
-        reworkProcess:'鞛皜瓿� 瓿奠爼',
-        reworkType:'鞛皜瓿� 鞙犿槙',
-        reworkArea:'鞛皜瓿� 氅挫爜',
+        addRework:'鞛瀾鞐� 於旉皜',
+        printRework:'鞛瀾鞐� 於滊牓',
+        reworkNumber:'鞛瀾鞐� 氩堩樃',
+        reworkTeam:'鞛瀾鞐� 韺�',
+        reasonForRework:'鞛瀾鞐� 靷湢',
+        reworkProcess:'鞛瀾鞐� 頂勲靹胳姢',
+        reworkType:'鞛瀾鞐� 鞙犿槙',
+        reworkArea:'鞛瀾鞐� 鞓侅棴',
         responsibilityInformation:'璐d换淇℃伅',
-        PleaseSelectAReworkTeam:'鞛皜瓿� 韺�鞚� 靹犿儩頃� 欤检劯鞖�',
-        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'鞛皜瓿� 靾橂焿鞚� 攵堧焿 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢潓',
-        reworkQuantityCannotBeEmptyOr0:'鞛皜瓿� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢潓',
+        PleaseSelectAReworkTeam:'鞛瀾鞐� 韺�鞚� 靹犿儩頃� 欤检劯鞖�',
+        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'鞛瀾鞐� 靾橂焿鞚� 觳矆歆� 韺岇啇 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢潓',
+        reworkQuantityCannotBeEmptyOr0:'鞛瀾鞐� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢潓',
+        msg1:'璇峰~鍏ラ渶瑕佸悎骞剁殑灞�',
     },
 
 
@@ -841,26 +984,26 @@
         page:{
             roleList:'搿� 頇�',
         },
-        id:'ID',
-        characterHomepage:'搿� 頇�',
-        role:'搿�',
-        roleAdd:'搿� 於旉皜',
+        id:'鞛碃 氩堩樃',
+        characterHomepage:'鞐暊 頇堩帢鞚挫',
+        role:'鞐暊 甓岉暅',
+        roleAdd:'鞐暊 於旉皜',
         menu:"氅旊壌",
         page1:'韼橃澊歆�',
         permission:'甓岉暅',
         rolePermissions:'鞐暊 甓岉暅',
         permissionSelection:"甓岉暅 靹犿儩",
-        ConfirmModifyingRolePermissions:'搿� 甓岉暅 靾橃爼鞚� 頇曥澑頃橃嫓瓴犾姷雼堦箤? ',
-        PleaseEnterANewRole:'靸� 搿� 氇呾潉 鞛呺牓頃� 欤检劯鞖�',
-        AddANewRole:'搿� 靸濎劚',
-        CannotBeEmptyAndTheLengthCannotExceed255:'瓿惦氨 攵堦皜, 255鞛� 鞚措偞 鞛呺牓',
+        ConfirmModifyingRolePermissions:'鞐暊 甓岉暅 靾橃爼鞚� 頇曥澑頃橃嫓瓴犾姷雼堦箤?',
+        PleaseEnterANewRole:'靸堧鞖� 鞐暊鞚� 鞛呺牓頃� 欤检劯鞖�',
+        AddANewRole:'鞐暊 靸濎劚',
+        CannotBeEmptyAndTheLengthCannotExceed255:'臧� 瓿惦氨 攵堦皜, 255鞛� 鞚措偞 鞛呺牓',
     },
     user:{
         page:{
             userList:'靷毄鞛� 頇�',
         },
         userId:'靷毄鞛� ID',
-        user:'靷毄鞛�',
+        user:'靷毄鞛� 氇╇',
         setUpRoles:'鞐暊 靹れ爼',
         setProcess:'璁剧疆宸ュ簭',
         changePassword:'牍勲皜氩堩樃 氤�瓴�',
@@ -875,47 +1018,56 @@
         OldPasswordError:'順勳灛 牍勲皜氩堩樃臧� 鞓皵毳挫 鞎婌姷雼堧嫟.',
         roleSelection:'瑙掕壊閫夋嫨',
 
-        userName:'靷毄鞛� 氇呾弓',
-        changeUserName:'靷毄鞛� 氇呾弓 靾橃爼',
+        userName:'靷毄鞛� 氇�',
+        changeUserName:'靷毄鞛� 氇� 靾橃爼',
         userNameCannotBeEmpty:'靷毄鞛� 鞚措鞚� 頃勳垬 鞛呺牓 頃鞛呺媹雼�',
+    },
+    userLog:{
+        page:{
+            userListLog:'鏃ュ織棣栭〉',
+        },
+        loginName:'鐧诲綍鍚�',
+        userName:'鐢ㄦ埛鍚�',
+        loginDate:'鐧诲綍鏃堕棿',
     },
     orderBasicData:{
         page:{
             searchOrderBasicData:'旮半掣 鞙犿槙',
             searchGlassType:'鞙犽Μ 攵勲',
+            searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
         },
         glassCategory:'鞙犽Μ 攵勲',
-        order:'欤茧靹�',
+        order:'欤茧 甏�毽�',
         orderType:'欤茧 鞙犿槙',
         orderClassify:'欤茧 攵勲',
         icon:'搿滉碃 鞓奠厴',
         packType:'韽灔 氚╈嫕',
-        alType:'鞎岆(氙鸽妱 鞀ろ帢鞚挫劀 氚╈嫕',
+        alType:'鞎岆(氙鸽妱 臧勱博鞛� 氚╈嫕',
         saleMan:'鞓侅梾 雼措嫻鞛�',
-        product:'鞝滍拡',
+        product:'鞝滍拡 甏�毽�',
         stuffThickness:'靻岇灛 霊愱粯',
         stuffColor:'靻岇灛 靸夓儊',
-        stuffCraft:'瓿奠爼 靻嶌劚',
+        stuffCraft:'頂勲靹胳姢 靻嶌劚',
         stuffPosition:'鞙犽Μ 鞙勳箻',
         stuffLowE:'lowe',
         InterlayerThickness:'鞝侅傅 霊愱粯',
-        InterlayerType:'鞝侅傅 鞙犿槙',
+        InterlayerType:'鞝侅傅 鞛 膦呺',
         InterlayerColor:'鞝侅傅 靸夓儊',
-        process:'瓿奠爼 旃措摐',
+        process:'鞛戩梾 鞝堨皑',
         hollowThickness:'鞚挫 鞙犽Μ 霊愱粯',
         hollowGasType:'臧�鞀� 於╈爠 氚╈嫕',
         hollowType:'鞁る 瓿奠爼',
-        hollowGlueDepth:'旮半掣 鞁る瀫韸� 霊愱粯',
+        hollowGlueDepth:'旮半掣 鞁る瀫韸� 旯婌澊',
         paymentTerms:'瓴办牅 臁瓣贝',
-        payMethod:'靾橁笀 氚╈嫕',
-        delivery:'雮╉拡',
-        name:'氇呾弓 ',
+        payMethod:'瓴办牅 氚╈嫕',
+        delivery:'雮╉拡 甏�毽�',
+        name:'頀堧獏',
         level:'攵勲 霌标笁',
         firstLevel:'1彀� 攵勲',
         towLevel:'2彀� 攵勲',
-        alias:'鍒悕',
-        msg1:'斓滊寑 5MB 鞚措偞 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧 ',
-        msg2:'JPG 霕愲姅 PNG 順曥嫕鞚� 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧!',
+        alias:'氤勳弓',
+        msg1:'斓滊寑 5MB 鞚措偞 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧',
+        msg2:'JPG 霕愲姅 PNG 順曥嫕鞚� 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧',
         selectFile:'韺岇澕 靹犿儩',
         msg3:'JPG 霕愲姅 PNG 順曥嫕鞚� 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧 . 斓滊寑 5MB',
         commonProcess:'鏅�氬伐搴�',
@@ -923,6 +1075,9 @@
         laminatingProcessB:'欷戧车 頉� 鞝戫暕 瓿奠爼',
         laminatingProcessC:'鞝侅傅 瓿奠爼',
         laminatingProcessD:'欷戧车 鞙犽Μ 鞝滌“ 瓿奠爼',
+        please1:'璇烽�夋嫨绫诲埆',
+        please2:'璇疯緭鍏ュ悕绉�',
+        please3:'璇疯緭鍏ュ埆鍚�',
     },
     machine:{
         page:{
@@ -932,16 +1087,16 @@
             addMaintenanceAndRepair:"鞝曤箘/靾橂Μ 鞁犼窚 霌彪"
         },
         basicId:'靹る箘 氩堩樃',
-        basicName:'靹る箘氇�',
-        basicCategory:'靻岇啀 瓿奠爼 ',
+        basicName:'攵勲',
+        basicCategory:'鞛戩梾 鞝堨皑',
         type:'鞙犿槙',
         faultTime:'瓿犾灔 氚滌儩 鞚检瀽',
         faultReason:'瓿犾灔 鞗愳澑',
         maintenanceTime:'鞝曤箘 鞚检瀽',
         maintenanceIllustrate:'鞝曤箘 靹る獏',
-        startTime:'靾橂Μ/鞝曤箘 鞁滌瀾 鞁滉皠',
+        startTime:'旎ろ寘 鞁滌瀾 鞁滉皠',
         stopTime:'靾橂Μ/鞝曤箘 膦呺 鞁滉皠',
-        process:'靻岇啀 瓿奠爼 ',
+        process:'鞛戩梾 鞝堨皑',
         personnel:'靾橂Μ/鞝曤箘 雼措嫻鞛�',
         cost:'牍勳毄',
         equipmentSituation:'靹る箘 靸來儨',
@@ -951,83 +1106,94 @@
         maintenanceAndRepairEdit:'鞝曤箘/靾橂Μ 雮挫棴 靾橃爼',
         service:'靾橂Μ',
         maintain:'鞝曤箘',
-        faultCount:'靾橂Μ 牍勳毄',
-        maintenanceCount:'鞝曤箘 須熿垬',
+        faultCount:'靾橂Μ 須熿垬',
+        maintenanceCount:'鞝愱瞼 須熿垬',
         faultLastTime:'斓滌 靾橂Μ 鞁滉皠',
         maintenanceLastTime:'斓滌 鞝曤箘 鞁滉皠',
         faultCost:'靾橂Μ 牍勳毄',
         maintenanceCost:'鞝曤箘 牍勳毄',
         deviceEditing:'靹る箘 鞝曤炒 靾橃爼',
-        standardName:'響滌 氇呾弓 ',
+        standardName:'響滌 氇呾弓',
         purchaseTime:'甑瀰 鞁滌爯',
         installationTime:'靹れ箻 鞚检嫓',
         maintenanceCycle:'鞝曤箘 欤缄赴',
         cutting:'旎ろ寘',
-        edgeGrinding:'鞐愳',
+        edgeGrinding:'鞐l',
         tempering:'臧曧檾',
     },
     report:{
         page:{
             productionReport:'靸濎偘 氤搓碃靹�',
             workInProgress:'鞛车頀� 氤搓碃靹�',
-            processToBeCompleted:'瓿奠爼 氙胳檮耄� 氤搓碃靹�',
+            processToBeCompleted:'鞕勲頃挫暭 頃� 頂勲靹胳姢 氤搓碃靹�',
             productionSchedule:'靸濎偘路於滉碃 歆勲弰 氤搓碃靹�',
-            processCardProgress:'瓿奠爼 旃措摐 歆勴枆 氤搓碃靹�',
-            orderPlanDecomposition:'靾橃< 瓿勴殟 攵勴暣 氤搓碃靹�',
+            processCardProgress:'頂勲靹胳姢 旃措摐 歆勴枆 氤搓碃靹�',
+            orderPlanDecomposition:'欤茧 瓿勴殟 攵勳劃 氤搓碃靹�',
             damageReport:'攵堧焿 韺岇啇 氤搓碃靹�',
             crossProcessBreaking:'瓿奠爼 臧� 攵堧焿 氤搓碃靹�',
-            teamOutput:'鞛戩梾氚� 靸濎偘霟� 氤搓碃靹�',
+            teamOutput:'韺� 靸濎偘 氤搓碃靹�',
             splittingDetailsOutside:'靹犽皹 氤� 靸侅劯 氤搓碃靹�',
             taskCompletionStatus:'鞛戩梾 鞕勲 順勴櫓 氤搓碃靹�',
             rawMaterialRequisition:'鞗愴寪 於滉碃 氤搓碃靹�',
-            qualityReport:'頀堨 瓴�靷� 氤搓碃靹�',
-            productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
+            qualityReport:'頀堨 氤搓碃靹�',
+            productionScheduling:'靸濎偘 鞚检爼 韼胳劚',
             yield:'鞏戫拡毳� 氤搓碃靹�',
             finishedProductReport :'鞕勳牅頀� 氤搓碃靹�',
+            orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
         },
+        allProcess:'鍏ㄩ儴',
+        teamsGroupsName:'涓婂伐搴忔姤宸�',
+        WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+        processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
         productionReport:'靸濎偘 氤搓碃靹�',
-        workInProgressReport:'鞛车頀� 氤搓碃靹�',
-        processToBeCompleted:'瓿奠爼 氙胳檮耄� 氤搓碃靹�',
-        productionAndShippingProgress:'靸濎偘路於滉碃 歆勲弰 氤搓碃靹�',
-        processCardProgress:'瓿奠爼 旃措摐 歆勴枆 氤搓碃靹�',
-        orderPlanDecomposition:'靾橃< 瓿勴殟 攵勴暣 氤搓碃靹�',
+        workInProgressReport:'歆勴枆 欷戩澑 鞝滍拡 氤搓碃靹�',
+        processToBeCompleted:'鞕勲頃挫暭 頃� 頂勲靹胳姢 氤搓碃靹�',
+        productionAndShippingProgress:'靸濎偘 氚� 雮╉拡 歆勴枆 氤搓碃靹�',
+        processCardProgress:'頂勲靹胳姢 旃措摐 歆勴枆 氤搓碃靹�',
+        orderPlanDecomposition:'欤茧 瓿勴殟 攵勳劃 氤搓碃靹�',
         secondaryBrokenReport:'攵堧焿 韺岇啇 氤搓碃靹�',
         crossProcessBreakdown:'瓿奠爼 臧� 攵堧焿 氤搓碃靹�',
-        teamOutput:'鞛戩梾氚� 靸濎偘霟� 氤搓碃靹�',
-        splittingDetails:'靹犽皹 氤� 靸侅劯 氤搓碃靹�',
+        teamOutput:'韺� 靸濎偘 氤搓碃靹�',
+        splittingDetails:'頂勲爤鞛勲硠 靸侅劯 氤搓碃靹�',
         TaskCompletionStatus:'鞛戩梾 鞕勲 順勴櫓 氤搓碃靹�',
         rawMaterialRequisition:'鞗愴寪 於滉碃 氤搓碃靹�',
-        qualityReport:'頀堨 瓴�靷� 氤搓碃靹�',
-        productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
+        qualityReport:'頀堨 氤搓碃靹�',
+        productionScheduling:'靸濎偘 鞚检爼 韼胳劚',
         yieldReport:'鞏戫拡毳� 氤搓碃靹�',
+        yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
         workingProcedure:'瓿奠爼',
-        inventoryArea:'鞛碃 氅挫爜',
+        inventoryArea:'鞛碃 歆�鞐�',
         pleaseSelectADateFirst:'雮犾毳� 靹犿儩頃橃劯鞖�',
         pleaseSelectAProcessFirst:'瓿奠爼鞚� 靹犿儩頃橃劯鞖�',
-        theFilteringTimeForExportCannotExceed180Days:'雮措炒雮搓赴 頃勴劙 旮瓣皠鞚� 180鞚检潉 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟.',
+        theFilteringTimeForExportCannotExceed180Days:'雮措炒雮搓赴 頃勴劙毵� 旮瓣皠鞚� 180鞚检潉 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟.',
+        theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
         orderTime :'欤茧 鞚检嫓',
-        deliveryDate:'雮╆赴 鞚检瀽 ',
+        deliveryDate:'雮╆赴 鞚检瀽',
         completedQuantity:'鞕勲 靾橂焿',
         completedArea:'鞕勲 氅挫爜',
         unfinishedQuantity :'氙胳檮耄� 靾橂焿',
         unfinishedArea:'氙胳檮耄� 氅挫爜',
         inventoryNum:'鞛呹碃 靾橂焿',
-        shippedQuantity :'於滉碃 靾橂焿',
-        area:'於滉碃 氅挫爜',
+        shippedQuantity :'雮╉拡 靾橂焿',
+        area:'氚办啞 歆�鞐�',
         noDataFoundForThisOrder:'頃措嫻 欤茧 雿办澊韯� 鞐嗢潓',
         startTime:'旎ろ寘 鞁滌瀾 鞁滉皠',
         daysDifference :'靸濎偘 靻岇殧 鞚检垬',
-        accomplish:'觳惮靹� 鞐秬 ',
+        accomplish:'觳惮靹� 鞐秬',
         receivedNo:'氙胳瀰瓿� 靾橂焿',
         projectNo :'頂勲鞝濏姼 氩堩樃',
-        quantityClaimed :'於滉碃 靾橂焿',
-        areaClaimed :'於滉碃 氅挫爜',
-        dateClaimed :'於滉碃 鞚检瀽',
-        quantityMax :'韴瀰 靾橂焿',
-        patchNum :'氤挫订 靾橂焿',
+        quantityClaimed :'靾橂牴頃� 靾橂焿',
+        areaClaimed :'靾橂牴 歆�鞐�',
+        dateClaimed :'靾橂牴 鞚检瀽',
+        quantityMax :'鞛呺牓 靾橂焿',
+        patchNum :'韺箻 靾橂焿',
         finished :'鞏戫拡毳�',
         finishedProductReport :'鞕勳牅頀� 氤搓碃靹�',
         workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+        StorageArea:'鍏ュ簱闈㈢Н',
+        shippedArea:'鍙戣揣闈㈢Н',
+        thicknessArea:'骞虫柟姣背'
+
     },
     productionBasicData:{
         page:{
@@ -1037,14 +1203,14 @@
             addTeamGroup:"鞛戩梾臁� 鞁犼窚 霌彪"
         },
         basicDataQuery :'旮办磮 雿办澊韯� 臁绊殞',
-        newTypeOfSecondaryDamageAdded :'2彀� 韺岇啇 鞙犿槙 於旉皜',
+        newTypeOfSecondaryDamageAdded :'靸堧鞖� 2彀� 韺岇啇 鞙犿槙',
         reasonForSecondaryFailureAdded :'2彀� 韺岇啇 鞗愳澑 於旉皜',
-        teamAdditionAndAddition :'鞛戩梾臁� 鞁犼窚 霌彪',
-        id:'ID',
+        teamAdditionAndAddition :'攴鸽9 鞁犼窚 霌彪',
+        id:'鞛碃 氩堩樃',
         basicName:'攵勲',
         basicDataEdit:'旮办磮 雿办澊韯� 靾橃爼',
-        teamName:'鞛戩梾臁� 氇呾弓',
-        processInvolved:'靻岇啀 瓿奠爼 ',
+        teamName:'韺� 鞚措',
+        processInvolved:'鞛戩梾 鞝堨皑',
     },
     ingredients:{
         page:{
@@ -1054,14 +1220,15 @@
         materialInformation :'鞛愳灛 鞝曤炒',
         materialAddition :'鞛愳灛 霌彪',
         originalFilm :'鞗愴寪',
-        accessories :'攵�氚旍灛',
+        accessories :'攵�鞛愳灛',
         materialCode :'鞛愳灛 旖旊摐',
         pleaseSelectACategory :'攵勲 靹犿儩',
-        films :'旖旐寘 瓿勳棿',
+        films :'旖旐寘 鞙犿槙',
         pleaseEnterData :'雿办澊韯� 鞛呺牓',
         pleaseEnter :'鞛呺牓',
-        msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
+        msg1 :'斓滊寑 5MB 鞚措偞 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫<靹胳殧',
         unit :'鍗曚綅',
+        msg2 :'璇ョ墿鏂欏凡瀛樺湪',
     },
     ingredientsStock:{
         page:{
@@ -1080,32 +1247,32 @@
         returnToStorage :'氚橅拡鞛呹碃',
         inventory :'鞛碃',
         engineering :'瓿奠爼',
-        inventoryOrganization :'鞛碃 臁办',
+        inventoryOrganization :'鞛碃 鞝曤Μ',
         id :'鞛碃 氩堩樃',
         projectNo :'頂勲鞝濏姼 氩堩樃',
         planQuantity :'瓿勴殟 靾橂焿',
         qualityGuaranteePeriod :'鞙犿喌旮绊暅',
-        pleaseSelectInventoryOrganization :'鞛碃 臁办 靹犿儩',
+        pleaseSelectInventoryOrganization :'鞛碃 甑劚 靹犿儩',
         pleaseEnterTheQuantity :'靾橂焿 鞛呺牓',
-        pleaseDateOfManufacture :'鞝滌“鞚检瀽 靹犿儩 ',
-        materialOutboundId :'於滉碃 鞝勴憸 氩堩樃',
-        materialRequisitionPersonnel :'鞛愳灛 靾橂牴鞛�',
-        materialRequisitionTeam :'靾橂牴 鞛戩梾氚�',
+        pleaseDateOfManufacture :'鞝滌“鞚检瀽 靹犿儩',
+        materialOutboundId :'於滉碃 靻§灔 氩堩樃',
+        materialRequisitionPersonnel :'鞛愳灛 靾橂牴鞚�',
+        materialRequisitionTeam :'鞛愳灛 甏�毽� 韺�',
         outboundType :'於滉碃 鞙犿槙',
         warehouseManager :'彀疥碃 甏�毽瀽',
         materialRequisitionDate :'鞛愳灛 靾橂牴 鞚检瀽',
         reviewed :'鞀轨澑 雼措嫻鞛�',
         reviewedTime :'鞀轨澑 鞁滉皠',
-        outboundQuantity :'於滉碃 靾橂焿',
+        outboundQuantity :'頀堨爤 靾橂焿',
         materialOutboundType :'鞛愳灛 於滉碃 鞙犿槙',
-        pleaseOutboundType :' 於滉碃 鞙犿槙鞚� 靹犿儩頃� 欤检嫮鞁滌槫',
+        pleaseOutboundType :'於滉碃 鞙犿槙鞚� 靹犿儩頃� 欤检嫮鞁滌槫',
         pleaseMaterialRequisitionPersonnel :'鞛愳灛 靾橂牴鞛愲ゼ 鞛呺牓頃� 欤检嫮鞁滌槫',
-        pleaseMaterialRequisitionTeam :'靾橂牴 鞛戩梾氚橃潉 鞛呺牓頃� 欤检嫮鞁滌槫',
-        pleaseOrderId :'韺愲Г 鞝勴憸 氩堩樃毳� 鞛呺牓頃� 欤检嫮鞁滌槫',
-        theOutboundQuantityCannotBeGreaterThanTheAvailableQuantity :'於滉碃 靾橂焿鞚� 臧�鞖� 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟 ',
+        pleaseMaterialRequisitionTeam :'靾橂牴 鞛戩梾韺�鞚� 鞛呺牓頃� 欤检嫮鞁滌槫',
+        pleaseOrderId :'韺愲Г 欤茧 氩堩樃毳� 鞛呺牓頃� 欤检嫮鞁滌槫',
+        theOutboundQuantityCannotBeGreaterThanTheAvailableQuantity :'於滉碃 靾橂焿鞚� 臧�鞖� 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟',
         theOutboundQuantityCannotBeEmptyOrEqualTo0 :'於滉碃 靾橂焿鞚� 牍勳柎 鞛堦卑雮� 0鞚� 霅� 靾� 鞐嗢姷雼堧嫟',
         theReturnQuantityCannotBeEmptyOrEqualTo0 :'氚橅拡 靾橂焿鞚� 牍勳柎 鞛堦卑雮� 0鞚� 霅� 靾� 鞐嗢姷雼堧嫟',
-        returningId :'氚橅拡 鞝勴憸 氩堩樃',
+        returningId :'氚橅拡 鞓侅垬歃� 氩堩樃',
         returningType :'氚橅拡 鞙犿槙',
         returningAdd :'氚橅拡 霌彪',
         returnQuantity :'氚橅拡 靾橂焿',
@@ -1115,14 +1282,18 @@
         surplusMaterialManagement :'浣欐枡绠$悊',
         additionOfSurplusMaterials :'浣欐枡鏂板',
         excessMaterialOutflow :'浣欐枡鍑哄簱',
-        pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
+        pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷',
+        pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+        msg1:'搴撳瓨瀛樺湪澶氭潯',
+        msg2:'鏁伴噺涓嶅璇锋鏌�',
+        msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
     },
     warehouseBasicData:{
         page:{
             warehouseSearchBasicData:"鞛碃 旮办磮 雿办澊韯�"
         },
         BasicData :'旮办磮 雿办澊韯�',
-        operateTypeName :'氇呾弓 ',
+        operateTypeName :'氇呾弓',
         operateType :'氤勳弓',
         type :'鞙犿槙',
         takeOut :'於滉碃',
@@ -1143,20 +1314,22 @@
         materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
         optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
         optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+        finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+        finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
     },
     components:{
-        addNewSignature :'霛茧波 氇呾弓 於旉皜',
+        addNewSignature :'霛茧波氇� 於旉皜',
         addColumnNames :'鞐� 鞚措 於旉皜',
-        message :'20鞛� 鞚措偞 牍勳柎鞛堨 鞎婌潃 氍胳瀽 鞛呺牓',
+        message :'瓿惦氨鞚� 鞎勲媽 20鞛� 鞚措偞鞚� 氍胳瀽毳� 鞛呺牓頃橃劯鞖�',
         activeName :'霛茧波 氇╇',
-        orderHeader :'欤茧 項る嫟',
+        orderHeader :'欤茧 靸侂嫧',
         finishedProduct :'鞕勳牅頀�',
         semiFinishedProducts :'氚橃牅頀�',
         pleaseClickToSelectARowFirst :'頄� 靹犿儩 頉� 鞁ろ枆',
         otherProcessing :'旮绊儉 臧�瓿�',
         inconsistentParameters :'頃勳垬 毵り皽氤�靾� 攵堨澕旃�',
-        strip :'瓯�',
-        exportSelected :'靹犿儩  雮措炒雮搓赴',
+        strip :'臁瓣皝',
+        exportSelected :'雮措炒雮搓赴 靹犿儩霅�',
     },
 
     menu:{
@@ -1167,16 +1340,16 @@
 
         product :'鞝滍拡 甏�毽�',
         order :'欤茧 甏�毽�',
-        delivery :'於滍晿 甏�毽�',
+        delivery :'雮╉拡 甏�毽�',
         returns :'氚橅拡 甏�毽�',
         customer :'瓿犼皾 鞝曤炒',
         workOrder :'鞛戩梾 歆�鞁� 甏�毽�',
-        processCard :'瓿奠爼 旃措摐 甏�毽�',
-        reportingWorks :'鞛戩梾 鞁れ爜 氤搓碃',
+        processCard :'頂勲靹胳姢 旃措摐 甏�毽�',
+        reportingWorks :'鞛戩梾 氤搓碃 甏�毽�',
         rework :'鞛瀾鞐� 甏�毽�',
-        replenish :'氤挫订 鞝堩幐 甏�毽�',
+        replenish :'韺箻 甏�毽�',
         machine :'靹る箘 甏�毽�',
-        BOM :'鞛愳灛 靻岇殧霟� 甏�毽�',
+        BOM :'鞛愳灛 氇呾劯靹� 甏�毽�',
         report :'氤搓碃靹� 甏�毽�',
         productStock :'鞕勳牅頀� 鞛碃',
         ingredientsStock :'鞛愳灛 鞛碃',
@@ -1184,34 +1357,92 @@
         trader :'瓿店笁鞐呾泊 甏�毽�',
         stockReport :'彀疥碃 氤搓碃靹�',
         purchaseOrder :'甑Г 欤茧',
-        purchaseStorage :'甑Г 鞛呹碃',
-        purchaseReturn :'甑Г 氚橅拡',
-        orderBasicData :'欤茧 旮办磮 雿办澊韯�',
-        productionBasicData :'靸濎偘 旮办磮 雿办澊韯�',
-        warehouseBasicData :'鞛碃 旮办磮 雿办澊韯�',
+        purchaseStorage :'甑Г 氚� 鞛呹碃',
+        purchaseReturn :'甑Г 氚� 氚橅拡',
+        orderBasicData :'欤茧 旮办',
+        productionBasicData :'靸濎偘 旮办',
+        warehouseBasicData :'鞛碃 旮办',
         user :'靷毄鞛� 氇╇',
         role :'鞐暊 甓岉暅',
         userPassWord :'牍勲皜氩堩樃 氤�瓴�',
-        glassPrice:'鐜荤拑浠锋牸',
-        glassOptimize:'鐜荤拑浼樺寲'
+        glassPrice:'鞙犽Μ 臧�瓴�',
+        glassOptimize:'鞙犽Μ 斓滌爜頇�',
+        finishedGlassShelf:'鎴愬搧鏂欐灦',
+        userLog:'鐧诲綍鏃ュ織'
     },
 
     glassPrice:{
-        glassPriceComputed:'鐜荤拑鎶ヤ环',
-        priceSet:'浠锋牸璁剧疆',
-        priceList:'浠锋牸鍒楄〃',
+        glassPriceComputed:'鞙犽Μ 瓴爜',
+        priceSet:'臧�瓴� 靹れ爼',
+        priceList:'臧�瓴� 氇╇',
         msg:{
             error1:'璇烽�夋嫨鍏ㄩ儴鍙傛暟',
             error2:'姝よ啘绯诲凡缁忓瓨鍦紝璇烽噸鏂伴�夋嫨',
             success:'鏁版嵁淇濆瓨鎴愬姛',
             addProduce:'璇峰厛娣诲姞浜у搧'
         },
-        glass:'鐜荤拑',
-        interlayer:'鞝侅傅 鞝戫暕',
-        hollow:'欷戧车',
-        process:'瓿奠爼',
-        addProduce:'閫夋嫨浜у搧',
-        reorder:'杞鍗�'
+        glass:'鞙犽Μ',
+        interlayer:'鞝侅傅 臧勱博鞛�',
+        hollow:'欷戧车 臧勱博鞛�',
+        process:'鞛戩梾 鞝堨皑',
+        addProduce:'鞝滍拡 靹犿儩',
+        reorder:'鞚挫洈 欤茧',
+        unit:'氅旐儉/m虏'
+    },
+
+    finishedGlassShelf:{
+        finishedGlassShelfInformation:'鏂欐灦搴撳瓨',
+        finishedGlassShelfEmit:'鏂欐灦鍑哄簱',
+        finishedGlassShelfWithdraw:'鏂欐灦鍏ュ簱',
+        createFinishedGlassShelf:'鏂欐灦鏂板',
+        msg:{
+            errorNotNull1:'鏂欐灦缂栧彿涓嶈兘涓虹┖',
+            errorNotNull2:'鏂欐灦鍚嶇О涓嶈兘涓虹┖',
+            errorNotNull3:'鏁伴噺涓嶈兘涓虹┖',
+            errorNotNull4:'鍗曚环涓嶈兘涓虹┖',
+            errorNotNull5:'鍗曚綅涓嶈兘涓虹┖',
+            errorNotNull6:'鏈�澶ф壙閲嶄笉鑳戒负绌�',
+            errorNotNull7:'鏈�澶у涓嶈兘涓虹┖',
+            errorNotNull8:'鏈�澶ч珮涓嶈兘涓虹┖',
+            pleaseWithdrawTime:'璇疯緭鍏ュ綊杩樻棩鏈�',
+            error1:'宸插瓨鍦ㄥ綊杩樻暟鎹棤娉曞垹闄�!',
+            error2:'璇烽�変腑涓�琛屾暟鎹�!',
+            error3:'宸插叏閮ㄥ綊杩�!',
+
+        },
+        glassShelfNumber:'鏂欐灦缂栧彿',
+        glassShelfName:'鏂欐灦鍚嶇О',
+        availableQuantity:'鐜版湁鏁伴噺',
+        totalQuantity:'鎬绘暟閲�',
+        maxWidth:'鏈�澶у',
+        maxHeight:'鏈�澶ч珮',
+        maxWeight:'鏈�澶ф壙閲�',
+        withdrawQuantity:'褰掕繕鏁伴噺',
+        withdrawTime:'褰掕繕鏃ユ湡',
+        operator:'缁忓姙浜�',
+        withdraw:'褰掕繕',
+        emitId:'鍑哄簱缂栧彿',
+        withdrawId:'鍏ュ簱缂栧彿',
+        returnDelivery:'杩斿洖鍙戣揣',
+        withdrawQuantity1:'寰呭綊杩樻暟閲�',
+        summary:'姹囨��',
+        detail:'鏄庣粏',
+    },
+    bom:{
+        orderBOM:'璁㈠崟BOM',
+        productBOM:'浜у搧BOM',
+        materialBOM:'鐗╂枡BOM',
+        msg:{
+            msg1:'璇峰厛閫夋嫨涓�涓骇鍝佹爣绛�',
+        },
+        bomType:'绫诲瀷',
+        consume:'娑堣�楅噺',
+        price:'浣跨敤浠锋牸',
+        price1:'浠锋牸',
+        usageType:'浣跨敤绫诲瀷',
+        bomPrice:'BOM鎴愭湰',
+        other:'鍏跺畠',
+
     }
 
 

--
Gitblit v1.8.0