From 6c03d677d3db904af768dc0b925367b5892d739a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:42 +0800
Subject: [PATCH] 成品料架管理修改语言
---
north-glass-erp/northglass-erp/src/lang/en.js | 42 +++++
north-glass-erp/northglass-erp/src/lang/zh.js | 42 +++++
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue | 16 +-
north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue | 4
north-glass-erp/northglass-erp/src/lang/ar.js | 42 +++++
north-glass-erp/northglass-erp/src/lang/ru.js | 42 +++++
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue | 26 +-
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue | 28 ++--
north-glass-erp/northglass-erp/src/lang/kr.js | 42 +++++
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue | 36 ++--
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue | 24 +-
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue | 34 ++--
north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue | 8
13 files changed, 293 insertions(+), 93 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 2943aad..d497828 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -1207,6 +1207,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'兀囟賮 丕爻賲 噩丿賷丿',
@@ -1257,7 +1259,8 @@
role :'兀匕賵賳丕鬲 丕賱丿賵乇',
userPassWord :'鬲睾賷賷乇 賰賱賲丞 丕賱賲乇賵乇',
glassPrice:'鐜荤拑浠锋牸',
- glassOptimize:'鐜荤拑浼樺寲'
+ glassOptimize:'鐜荤拑浼樺寲',
+ finishedGlassShelf:'鎴愬搧鏂欐灦'
},
glassPrice:{
@@ -1277,6 +1280,43 @@
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:'寰呭綊杩樻暟閲�',
}
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index dbb0e50..2a95ce8 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -1208,6 +1208,8 @@
materialReturnReport:"Material return report",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'Add label name',
@@ -1258,7 +1260,8 @@
role :'Role',
userPassWord :'User Pass Word',
glassPrice:'Glass Price',
- glassOptimize:'鐜荤拑浼樺寲'
+ glassOptimize:'鐜荤拑浼樺寲',
+ finishedGlassShelf:'鎴愬搧鏂欐灦'
},
glassPrice:{
@@ -1278,6 +1281,43 @@
addProduce:'Select product',
reorder:'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:'寰呭綊杩樻暟閲�',
}
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 71f7ed0..ca2be4d 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -1217,6 +1217,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'霛茧波氇� 於旉皜',
@@ -1267,7 +1269,8 @@
role :'鞐暊 甓岉暅',
userPassWord :'牍勲皜氩堩樃 氤�瓴�',
glassPrice:'鞙犽Μ 臧�瓴�',
- glassOptimize:'鞙犽Μ 斓滌爜頇�'
+ glassOptimize:'鞙犽Μ 斓滌爜頇�',
+ finishedGlassShelf:'鎴愬搧鏂欐灦'
},
glassPrice:{
@@ -1287,6 +1290,43 @@
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:'寰呭綊杩樻暟閲�',
}
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index a0ca7d7..1ddb33b 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -1206,6 +1206,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'袛芯斜邪胁懈褌褜 懈屑褟 屑械褌泻懈',
@@ -1256,7 +1258,8 @@
role :'袩褉邪胁邪 薪邪 褉芯谢褜',
userPassWord :'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
glassPrice:'笑械薪邪 褋褌械泻谢邪.',
- glassOptimize:'鐜荤拑浼樺寲'
+ glassOptimize:'鐜荤拑浼樺寲',
+ finishedGlassShelf:'鎴愬搧鏂欐灦'
},
glassPrice:{
@@ -1276,6 +1279,43 @@
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:'寰呭綊杩樻暟閲�',
}
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 828b5dc..c69ace4 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -1225,6 +1225,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'鏂板鏍囩鍚�',
@@ -1275,7 +1277,8 @@
role :'瑙掕壊鏉冮檺',
userPassWord :'淇敼瀵嗙爜',
glassPrice:'鐜荤拑浠锋牸',
- glassOptimize:'鐜荤拑浼樺寲'
+ glassOptimize:'鐜荤拑浼樺寲',
+ finishedGlassShelf:'鎴愬搧鏂欐灦'
},
glassPrice:{
@@ -1295,6 +1298,43 @@
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:'寰呭綊杩樻暟閲�',
}
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue
index 5224408..f1988ad 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue
@@ -52,35 +52,35 @@
const submitForm = () => {
if(ruleForm.value.glassShelfNumber==null||ruleForm.value.glassShelfNumber==''){
- ElMessage.warning('鏂欐灦缂栧彿涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull1'))
return
}
if(ruleForm.value.glassShelfName==null||ruleForm.value.glassShelfName==''){
- ElMessage.warning('鏂欐灦鍚嶇О涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull2'))
return
}
if(ruleForm.value.totalQuantity==null||ruleForm.value.totalQuantity==''){
- ElMessage.warning('鏁伴噺涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull3'))
return
}
if(ruleForm.value.price==null||ruleForm.value.price==''){
- ElMessage.warning('鍗曚环涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull4'))
return
}
if(ruleForm.value.unit==null||ruleForm.value.unit==''){
- ElMessage.warning('鍗曚綅涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull5'))
return
}
if(ruleForm.value.maxWeight==null||ruleForm.value.maxWeight==''){
- ElMessage.warning('鏈�澶ф壙閲嶄笉鑳戒负绌�')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull6'))
return
}
if(ruleForm.value.maxWidth==null||ruleForm.value.maxWidth==''){
- ElMessage.warning('鏈�澶у涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull7'))
return
}
if(ruleForm.value.maxHeight==null||ruleForm.value.maxHeight==''){
- ElMessage.warning('鏈�澶ч珮涓嶈兘涓虹┖')
+ ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull8'))
return
}
let filterData=ref({
@@ -132,50 +132,50 @@
<el-row gutter="20" >
<el-col :span="10" >
- 鏂欐灦缂栧彿锛�<el-input v-model.trim="ruleForm.glassShelfNumber" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.glassShelfNumber')}}锛�<el-input v-model.trim="ruleForm.glassShelfNumber" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-col :span="10" >
- 鏂欐灦鍚嶇О锛�<el-input v-model.trim="ruleForm.glassShelfName" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.glassShelfNumber')}}锛�<el-input v-model.trim="ruleForm.glassShelfName" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
<el-row gutter="20" >
<el-col :span="10" >
- 鐜版湁鏁伴噺锛�<el-input v-model.trim="ruleForm.availableQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.availableQuantity')}}锛�<el-input v-model.trim="ruleForm.availableQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-col :span="10" >
- 鎬绘暟閲忥細<el-input v-model.trim="ruleForm.totalQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.totalQuantity')}}锛�<el-input v-model.trim="ruleForm.totalQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
<el-row gutter="20" >
<el-col :span="10" >
- 鍗曚环锛�<el-input v-model.trim="ruleForm.price" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('order.price')}}锛�<el-input v-model.trim="ruleForm.price" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-col :span="10" >
- 鍗曚綅锛�<el-input v-model.trim="ruleForm.unit" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('ingredients.unit')}}鍗曚綅锛�<el-input v-model.trim="ruleForm.unit" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
<el-row gutter="20" >
<el-col :span="10" >
- 鏈�澶у锛�<el-input v-model.trim="ruleForm.maxWidth" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.maxWidth')}}锛�<el-input v-model.trim="ruleForm.maxWidth" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-col :span="10" >
- 鏈�澶ч珮锛�<el-input v-model.trim="ruleForm.maxHeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.maxHeight')}}锛�<el-input v-model.trim="ruleForm.maxHeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
<el-row gutter="20" >
<el-col :span="10" >
- 鏈�澶ф壙閲嶏細<el-input v-model.trim="ruleForm.maxWeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('finishedGlassShelf.maxWeight')}}锛�<el-input v-model.trim="ruleForm.maxWeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-col :span="10" >
- 澶囨敞锛�<el-input v-model="ruleForm.remarks" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
+ {{$t('basicData.remarks')}}锛�<el-input v-model="ruleForm.remarks" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
</el-col>
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue
index e5be373..2ab0b29 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue
@@ -202,16 +202,16 @@
columns:[
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
- {field: 'glassShelfNumber',width:120, title: t('鏂欐灦缂栧彿'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassShelfName',width:120, title: t('鏂欐灦鍚嶇О'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: t('鍑哄簱鏁伴噺'),editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'availableQuantity',width:120, title: t('鐜版湁鏁伴噺'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'totalQuantity',width:120, title: t('鎬绘暟閲�'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'withdrawQuantity',width:120, title: t('褰掕繕鏁伴噺'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:120, title: t('鍗曚环'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'money',width:120, title: t('閲戦'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'unit',width:120, title: t('鍗曚綅'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'remarks',width:120, title: t('澶囨敞'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassShelfNumber',width:120, title: t('finishedGlassShelf.glassShelfNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassShelfName',width:120, title: t('finishedGlassShelf.glassShelfName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:120, title: t('ingredientsStock.outboundQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } }},
+ {field: 'availableQuantity',width:120, title: t('finishedGlassShelf.availableQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'totalQuantity',width:120, title: t('finishedGlassShelf.totalQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'withdrawQuantity',width:120, title: t('finishedGlassShelf.withdrawQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'money',width:120, title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'unit',width:120, title: t('ingredients.unit'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'remarks',width:120, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -264,17 +264,17 @@
//琛ㄥご鏁版嵁鏍￠獙
const customerName = titleUploadData.value.customerName
if(customerName === null || customerName === undefined || customerName === ''){
- ElMessage.error(t('瀹㈡埛鍚嶇О涓嶈兘涓虹┖'))
+ ElMessage.error(t('customer.pleaseEnterTheCustomerName'))
return
}
const project = titleUploadData.value.project
if(project === null || project === undefined || project === ''){
- ElMessage.error(t('椤圭洰鍚嶇О涓嶈兘涓虹┖'))
+ ElMessage.error(t('delivery.pleaseEnterTheAmountOfFunds'))
return
}
const withdrawTime = titleUploadData.value.withdrawTime
if(withdrawTime=== null || withdrawTime === undefined || withdrawTime === ''){
- ElMessage.error(t('褰掕繕鏃ユ湡涓嶈兘涓虹┖'))
+ ElMessage.error(t('finishedGlassShelf.msg.pleaseWithdrawTime'))
return
}
@@ -288,7 +288,7 @@
})
request.post("/finishedGlassShelf/insertFinishedGlassShelfEmit", flowData.value).then((res) => {
if(res.code==200 && res.data==="true"){
- ElMessage.success(t('淇濆瓨鎴愬姛'))
+ ElMessage.success(t('basicData.msg.saveSuccess'))
//router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
if(titleUploadData.value.emitId.trim()===""){
router.push({path: '/main/finishedGlassShelf/finishedGlassShelfEmit', query:{random:Math.random()}})
@@ -393,13 +393,13 @@
</el-col>
- <el-col :span="2"><el-text>{{$t('缁忓姙浜�')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('finishedGlassShelf.operator')}}:</el-text></el-col>
<el-col :span="3"><el-input disabled v-model="titleUploadData.operator"/></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{$t('褰掕繕鏃ユ湡')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('finishedGlassShelf.withdrawTime')}}:</el-text></el-col>
<el-col :span="3">
<el-date-picker
v-model="titleUploadData.withdrawTime"
@@ -408,7 +408,7 @@
value-format="YYYY-MM-DD"
:placeholder="$t('delivery.selectDate')"/>
</el-col>
- <el-col :span="2"><el-text>{{$t('澶囨敞')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('basicData.remarks')}}:</el-text></el-col>
<el-col :span="3"><el-input v-model="titleUploadData.remarks"/></el-col>
</el-row>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue
index ceb3146..e3f8f0d 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue
@@ -179,16 +179,16 @@
},//琛ㄥご鍙傛暟
columns:[
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
- {field: 'emitId',width:120, title: t('鍑哄簱缂栧彿'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'emitNumber',width:120, title: t('鍑哄簱搴忓彿'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassShelfNumber',width:120, title: t('鏂欐灦缂栧彿'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassShelfName',width:120, title: t('鏂欐灦鍚嶇О'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: t('褰掕繕鏁伴噺'),editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'quantity2',width:120, title: t('寰呭綊杩樻暟閲�'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:120, title: t('鍗曚环'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'money',width:120, title: t('閲戦'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'unit',width:120, title: t('鍗曚綅'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'remarks',width:120, title: t('澶囨敞'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'emitId',width:120, title: t('finishedGlassShelf.emitId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'emitNumber',width:120, title: t('basicData.number'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassShelfNumber',width:120, title: t('finishedGlassShelf.glassShelfNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassShelfName',width:120, title: t('finishedGlassShelf.glassShelfName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:120, title: t('finishedGlassShelf.withdrawQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } }},
+ {field: 'quantity2',width:120, title: t('finishedGlassShelf.withdrawQuantity1'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'money',width:120, title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'unit',width:120, title: t('ingredients.unit'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'remarks',width:120, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -318,9 +318,9 @@
<el-col :span="3">
<el-input disabled v-model="titleUploadData.project"/>
</el-col>
- <el-col :span="2"><el-text>{{$t('缁忓姙浜�')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('finishedGlassShelf.operator')}}:</el-text></el-col>
<el-col :span="3"><el-input disabled v-model="titleUploadData.operator"/></el-col>
- <el-col :span="2"><el-text>{{$t('澶囨敞')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('basicData.remarks')}}:</el-text></el-col>
<el-col :span="3"><el-input v-model="titleUploadData.remarks"/></el-col>
</el-row>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue
index a6bef30..376e673 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue
@@ -26,10 +26,10 @@
<div id="main">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfInformation' }">{{$t('鏂欐灦搴撳瓨')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfEmit' }">{{$t('鏂欐灦鍑哄簱')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfWithdraw' }">{{$t('鏂欐灦鍏ュ簱')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/createFinishedGlassShelf' }">{{$t('鏂欐灦鏂板')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfInformation' }">{{$t('finishedGlassShelf.finishedGlassShelfInformation')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfEmit' }">{{$t('finishedGlassShelf.finishedGlassShelfEmit')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfWithdraw' }">{{$t('finishedGlassShelf.finishedGlassShelfWithdraw')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/createFinishedGlassShelf' }">{{$t('finishedGlassShelf.createFinishedGlassShelf')}}</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
</el-breadcrumb>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue
index 4bf655d..b73e9aa 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue
@@ -42,7 +42,7 @@
ElMessage.success(t('basicData.msg.deleteSuccess'))
router.push({path:'/main/finishedGlassShelf/finishedGlassShelfEmit',query:{random:Math.random()}})
}else if(res.data==="false1"){
- ElMessage.warning(t('宸插瓨鍦ㄥ綊杩樻暟鎹棤娉曞垹闄わ紒'))
+ ElMessage.warning(t('finishedGlassShelf.msg.error1'))
}else{
ElMessage.warning(t('basicData.msg.deleteFail'))
}
@@ -225,7 +225,7 @@
body: {
options: [
[
- { code: 'sheet1', name: t('褰掕繕'), prefixIcon: 'vxe-icon-file-txt', visible: true}
+ { code: 'sheet1', name: t('finishedGlassShelf.withdraw'), prefixIcon: 'vxe-icon-file-txt', visible: true}
]
]
}
@@ -234,14 +234,14 @@
columns:[
{title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
- {field: 'state',title: t('褰掕繕'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
- {field: 'emitId', width:'150', title: t('鍑哄簱鍗曟嵁缂栧彿'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
- {field: 'customerName', width: '150',title: t('瀹㈡埛鍚嶇О'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'project', width: '120',title: t('椤圭洰鍚嶇О'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'operator',width: '100', title: t('缁忓姙浜�'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'withdrawTime',width: '100', title: t('褰掕繕鏃ユ湡'), sortable: true},
- {field: 'createTime',width: '100', title: t('鍒涘缓鏃堕棿'), sortable: true},
- {field: 'remarks',width: '100', title: t('澶囨敞'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'state',title: t('finishedGlassShelf.withdraw'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field: 'emitId', width:'150', title: t('finishedGlassShelf.emitId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+ {field: 'customerName', width: '150',title: t('order.customers'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'project', width: '120',title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operator',width: '100', title: t('finishedGlassShelf.operator'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'withdrawTime',width: '100', title: t('finishedGlassShelf.withdrawTime'), sortable: true},
+ {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
+ {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -333,7 +333,7 @@
rowIndexData.value=selectRecords[0]
sheetIndex.value=2
}else{
- ElMessage.warning(t('璇烽�変腑涓�琛屾暟鎹�'))
+ ElMessage.warning(t('finishedGlassShelf.msg.error2'))
return
}
@@ -348,7 +348,7 @@
ElMessage.warning(t('productStock.unselectedData'))
return
}
- ElMessageBox.confirm("纭鍒犻櫎锛�",
+ ElMessageBox.confirm(t('searchOrder.deleteConfirm'),
{
confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
@@ -409,7 +409,7 @@
if(row.state<2){
router.push({path: '/main/finishedGlassShelf/createFinishedGlassShelfWithdraw', query: { emitId: row.emitId }})
}else{
- ElMessage.warning("宸插叏閮ㄥ綊杩�")
+ ElMessage.warning(t('finishedGlassShelf.msg.error3'))
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue
index 9195494..14e9ad8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue
@@ -155,24 +155,24 @@
{ type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
{title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
- {field: 'glassShelfNumber', width:'150', title: t('鏂欐灦缂栧彿'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
- {field: 'glassShelfName', width: '150',title: t('鏂欐灦鍚嶇О'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'availableQuantity', width: '120',title: t('鐜版湁鏁伴噺'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'totalQuantity',width: '100', title: t('鎬绘暟閲�'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'price',width: '100', title: t('鍗曚环'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'money',width: '100', title: t('閲戦'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'unit', width: '100',title: t('鍗曚綅'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'maxWeight', width: '100',title: t('鏈�澶ф壙閲�'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'maxWidth',width: '100', title: t('鏈�澶ч珮'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'maxHeight',width: '100', title: t('鏈�澶у'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'remarks',width: '100', title: t('澶囨敞'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'createTime',width: '100', title: t('鍒涘缓鏃堕棿'), sortable: true},
+ {field: 'glassShelfNumber', width:'150', title: t('finishedGlassShelf.glassShelfNumber'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
+ {field: 'glassShelfName', width: '150',title: t('finishedGlassShelf.glassShelfName'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'availableQuantity', width: '120',title: t('finishedGlassShelf.availableQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'totalQuantity',width: '100', title: t('finishedGlassShelf.totalQuantity'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'price',width: '100', title: t('order.price'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'money',width: '100', title: t('order.money'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'unit', width: '100',title: t('ingredients.unit'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'maxWeight', width: '100',title: t('finishedGlassShelf.maxWeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'maxWidth',width: '100', title: t('finishedGlassShelf.maxWidth'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'maxHeight',width: '100', title: t('finishedGlassShelf.maxHeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'out', 'name': t('鍑哄簱'),status: 'primary'},
- {'code': 'return', 'name': t('杩斿洖鍙戣揣'),status: 'primary'}
+ {'code': 'out', 'name': t('productStock.outbound'),status: 'primary'},
+ {'code': 'return', 'name': t('finishedGlassShelf.returnDelivery'),status: 'primary'}
],
/*import: false,
export: true,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue
index 39bafaf..9822c23 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue
@@ -223,12 +223,12 @@
columns:[
{title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
- {field: 'withdrawId', width:'150', title: t('鍏ュ簱鍗曟嵁缂栧彿'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'customerName', width: '150',title: t('瀹㈡埛鍚嶇О'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'project', width: '120',title: t('椤圭洰鍚嶇О'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'operator',width: '100', title: t('缁忓姙浜�'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'createTime',width: '100', title: t('鍒涘缓鏃堕棿'), sortable: true},
- {field: 'remarks',width: '100', title: t('澶囨敞'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'withdrawId', width:'150', title: t('finishedGlassShelf.withdrawId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'customerName', width: '150',title: t('order.customers'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'project', width: '120',title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operator',width: '100', title: t('finishedGlassShelf.operator'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
+ {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -309,7 +309,7 @@
rowIndexData.value=selectRecords[0]
sheetIndex.value=2
}else{
- ElMessage.warning(t('璇烽�変腑涓�琛屾暟鎹�'))
+ ElMessage.warning(t('finishedGlassShelf.msg.error2'))
return
}
@@ -324,7 +324,7 @@
ElMessage.warning(t('productStock.unselectedData'))
return
}
- ElMessageBox.confirm("纭鍒犻櫎锛�",
+ ElMessageBox.confirm(t('searchOrder.deleteConfirm'),
{
confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
index 501ae73..c842bb6 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
@@ -85,8 +85,8 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="/main/stockReport/finishedGlassShelfEmitReport" >{{$t('鏂欐灦鍑哄簱')}}</el-dropdown-item>
- <el-dropdown-item command="/main/stockReport/finishedGlassShelfWithdrawReport" >{{ $t('鏂欐灦鍏ュ簱') }}</el-dropdown-item>
+ <el-dropdown-item command="/main/stockReport/finishedGlassShelfEmitReport" >{{$t('stockReport.finishedGlassShelfEmitReport')}}</el-dropdown-item>
+ <el-dropdown-item command="/main/stockReport/finishedGlassShelfWithdrawReport" >{{ $t('stockReport.finishedGlassShelfWithdrawReport') }}</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
--
Gitblit v1.8.0