From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/northglass-erp/src/lang/zh.js |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 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 d96e7a8..0ccf58d 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -92,6 +92,8 @@
             noProductDataInTheTable:'琛ㄦ牸涓棤浜у搧鏁版嵁',
             tableDataExceedsMaximumLimit:'琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�',
             range9999Dec: "璇疯緭鍏ュ洓浣嶆暣鏁�",
+            quantityError: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
+            dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
         }
     },
     product:{
@@ -133,7 +135,7 @@
            hollowThickness:'*涓┖鍘氬害',
            hollowGasType:'*鍏呮皵鏂瑰紡:',
            hollowType:'*灏佽兌',
-           hollowGlueDepth:'*榛樿鑳舵繁:',
+           hollowGlueDepth:'榛樿鑳舵繁:',
            hollow:'涓┖闂撮殧鐗�',
            hollowUpdate:'涓┖闂撮殧鐗╀慨鏀�',
            interlayerThickness:'*澶瑰眰鍘氬害',
@@ -375,6 +377,7 @@
         weight:'閲嶉噺',
         selectedQuantity:'閫変腑鏁伴噺',
         establishProcessCards:'寤虹珛娴佺▼鍗�',
+        createBySequenceNumber:'鎸夊簭鍙峰垱寤�',
         return:'杩斿洖',
         ProductionSchedulingOk:'宸叉帓浜�',
         ProductionSchedulingNo:'鏈帓浜�',
@@ -433,6 +436,8 @@
         landingSequence:'钀芥灦椤哄簭',
 
         labelStyle:'鏍囩鏍峰紡',
+        detailPrinting:'鏄庣粏鎵撳嵃',
+        detailsPrintedSeparately:'鏄庣粏鍒嗘灦鎵撳嵃',
         customLabelPrinting:'鑷畾涔夋爣绛炬墦鍗�',
         labelPrinting:'鏍囩鎵撳嵃',
         sortingSuccessful:'鎺掑簭鎴愬姛',
@@ -447,11 +452,19 @@
         mergePrinting:'鍚堝苟鎵撳嵃',
         printStatus:'鎵撳嵃娆℃暟',
         labelPrinting2:'鏍囩鎵撳嵃2',
+        finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
+        editablePrinting:'鍙紪杈戞墦鍗�',
+        invertSelection:'鍙嶉��',
+        sortSummary:'鎺掑簭姹囨��',
         addAutomatically:'鑷姩濉厖',
         selectFill:'閫変腑濉厖',
         engineeringPrinting:'宸ョ▼鎵撳嵃',
-
+        pleaseSelectProject:'璇烽�夋嫨宸ョ▼',
         mergeState:'鍚堝苟鐘舵��',
+        merge:'鍚堝苟',
+        printQuantity:'鎵撳嵃鏁�',
+        printWarn1:'鎵撳嵃鏁伴噺涓嶈兘澶т簬璁㈠崟鏁伴噺'
+
     },
     reportingWorks:{
         page:{
@@ -531,6 +544,7 @@
         thisCompletedQuantity:'鏈伐搴忓畬宸�',
         thisWornQuantity:'鏈伐搴忔鐮�',
         passAudit:'瀹℃牳閫氳繃',
+        patchCondition:'琛ョ墖鐘舵��',
 
 
         selectResponsibleTeam:'璇烽�夋嫨璐d换鐝粍',
@@ -543,7 +557,7 @@
         qualityInsTime:'璐ㄦ鏃堕棿',
         completedArea:'瀹屽伐闈㈢Н',
         wornArea:'娆$牬闈㈢Н',
-        pleaseGreaterThanOrEqual1:'璇疯緭鍏ュぇ浜庣瓑浜�',
+        pleaseGreaterThanOrEqual1:'璇疯緭鍏ュ皬浜庣瓑浜�',
         pleaseGreaterThanOrEqual2:'鐨勬暟瀛�',
         lossCount1:'鎹熻�楁暟',
         lossCount2:'涓嶈兘澶т簬',
@@ -558,6 +572,7 @@
         pleaseNumber7:'鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺',
         pleaseNumber8:'璇疯緭鍏ュ簭鍙�',
         pleaseNumber9:'姝g‘鐨勫畬宸ユ垨娆$牬鏁伴噺',
+        pleaseNumber10:'瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺',
     },
     productStock:{
         page:{
@@ -659,7 +674,11 @@
         endOperationOrderNumber:'璋冩嫧搴忓彿',
         typeClaim:'棰嗗嚭绫诲瀷',
         pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
-        boxNumber:'绠卞彿'
+
+        boxNumber:'绠卞彿',
+        msg1:'鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�',
+        msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
+        msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟'
     },
     customer:{
         page:{
@@ -766,6 +785,7 @@
         reworkProcess:'杩斿伐宸ュ簭',
         reworkType:'杩斿伐绫诲瀷',
         reworkArea:'杩斿伐闈㈢Н',
+        responsibilityInformation:'璐d换淇℃伅',
         PleaseSelectAReworkTeam:'璇烽�夋嫨杩斿伐鐝粍',
         TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'杩斿伐鏁伴噺涓嶈兘澶т簬娆$牬鏁伴噺',
         reworkQuantityCannotBeEmptyOr0:'杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0',
@@ -807,6 +827,7 @@
         ConfirmPasswordCannotBeEmpty:'纭瀵嗙爜涓嶈兘涓虹┖',
         TheTwoPasswordsAreNotTheSame:'涓ゆ瀵嗙爜涓嶇浉鍚�',
         OldPasswordError:'鏃у瘑鐮侀敊璇�',
+        roleSelection:'瑙掕壊閫夋嫨',
 
         userName:'鐢ㄦ埛鍚嶇О',
         changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
@@ -987,6 +1008,8 @@
         films :'鑶滅郴',
         pleaseEnterData :'璇疯緭鍏ユ暟鎹�',
         pleaseEnter :'璇疯緭鍏�',
+        msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
+        unit :'鍗曚綅',
     },
     ingredientsStock:{
         page:{
@@ -1040,6 +1063,7 @@
         surplusMaterialManagement :'浣欐枡绠$悊',
         additionOfSurplusMaterials :'浣欐枡鏂板',
         excessMaterialOutflow :'浣欐枡鍑哄簱',
+        pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
     },
     warehouseBasicData:{
         page:{
@@ -1053,8 +1077,18 @@
     },
     stockReport:{
         page:{
-            warehouseReport:"浠撳偍鎶ヨ〃"
-        }
+            warehouseReport:"浠撳偍鎶ヨ〃",
+            finishedProductReport:"鎴愬搧鎶ヨ〃",
+            materialReport:"鐗╂枡鎶ヨ〃",
+
+        },
+        finishedProductInventoryReport:"鎴愬搧鍏ュ簱鎶ヨ〃",
+        finishedProductOutboundReport:"鎴愬搧鍑哄簱鎶ヨ〃",
+        finishedProductTransferReport:"鎴愬搧璋冩嫧鎶ヨ〃",
+        finishedProductDeliveryReport:"鎴愬搧棰嗗嚭鎶ヨ〃",
+        materialAdditionReport:"鐗╂枡鏂板鎶ヨ〃",
+        materialOutboundReport:"鐗╂枡鍑哄簱鎶ヨ〃",
+        materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
     },
     components:{
         addNewSignature :'鏂板鏍囩鍚�',
@@ -1104,6 +1138,25 @@
         user :'鐢ㄦ埛鍒楄〃',
         role :'瑙掕壊鏉冮檺',
         userPassWord :'淇敼瀵嗙爜',
+        glassPrice:'鐜荤拑浠锋牸'
+    },
+
+    glassPrice:{
+        glassPriceComputed:'鐜荤拑鎶ヤ环',
+        priceSet:'浠锋牸璁剧疆',
+        priceList:'浠锋牸鍒楄〃',
+        msg:{
+            error1:'璇烽�夋嫨鍏ㄩ儴鍙傛暟',
+            error2:'姝よ啘绯诲凡缁忓瓨鍦紝璇烽噸鏂伴�夋嫨',
+            success:'鏁版嵁淇濆瓨鎴愬姛',
+            addProduce:'璇峰厛娣诲姞浜у搧'
+        },
+        glass:'鐜荤拑',
+        interlayer:'澶硅兌',
+        hollow:'涓┖',
+        process:'宸ヨ壓',
+        addProduce:'閫夋嫨浜у搧',
+        reorder:'杞鍗�'
     }
 
 

--
Gitblit v1.8.0