From 43e7ea5a5768b7e47c3937d37870ed0b868774a9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 16 六月 2025 10:01:58 +0800
Subject: [PATCH] 语言修改补充
---
north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue | 2
north-glass-erp/northglass-erp/src/lang/en.js | 9 ++++
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue | 4 +-
north-glass-erp/northglass-erp/src/lang/ar.js | 10 ++++-
north-glass-erp/northglass-erp/src/lang/ru.js | 10 ++++-
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 4 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 4 +-
north-glass-erp/northglass-erp/src/lang/zh.js | 9 ++++
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue | 2
north-glass-erp/northglass-erp/src/lang/kr.js | 30 ++++++++++-----
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 4 +-
12 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue
index 0444511..c1f756b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue
@@ -117,7 +117,7 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
},
- {field: 'rack',width:100, title: t('鏋跺彿'), slots: {filter: 'num1_filter'}},
+ {field: 'rack',width:100, title:t('processCard.shelfNumber'), slots: {filter: 'num1_filter'}},
{field: 'technology_number', title: t('processCard.technologyNumber'),},
{
field: 'product_id',
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 19962ea..6cd9daf 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -285,7 +285,10 @@
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
- }
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -496,7 +499,10 @@
shortestSide:"鐭竟鏈�鐭�(mm)",
intelligentBranching:"鏅鸿兘鍒嗘灦",
reset:"閲嶇疆",
-
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
},
reportingWorks:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 0d4bb7e..65a2e5f 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -286,7 +286,10 @@
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
- }
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -498,6 +501,10 @@
shortestSide:"鐭竟鏈�鐭�(mm)",
intelligentBranching:"鏅鸿兘鍒嗘灦",
reset:"閲嶇疆",
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
},
reportingWorks:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 1aca666..778e086 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -294,7 +294,10 @@
updateOrderIdErrorInputNumber:'靾瀽 鞛呺牓 頃勳殧',
updateOrderIdErrorNotNo1:'觳� 氩堨Ц 頃 靾橃爼 攵堦皜',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
- }
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -406,7 +409,7 @@
weight:'欷戨焿',
selectedQuantity:'靹犿儩 毵れ垬',
establishProcessCards:'瓿奠爼 旃措摐 靸濎劚',
- createBySequenceNumber:'鎸夊簭鍙峰垱寤�',
+ createBySequenceNumber:'靾滌劀雽�搿� 毵岆摛旮�',
return:' 霃岇晞臧�旮�',
ProductionSchedulingOk:'氚办箻 鞕勲',
ProductionSchedulingNo:'氙鸽鞍旃�',
@@ -441,7 +444,7 @@
composingOk:'霠堨澊鞎勳泝 臧�電�',
composingNo:'霠堨澊鞎勳泝 攵堦皜',
typesetter:'霠堨澊鞎勳泝 鞕勲',
- revoke:'鎾ら攢鍙帓鐗�',
+ revoke:'臁绊寪 頃挫牅',
scheduledStartTime:'瓿勴殟 鞁滌瀾 鞁滉皠',
planEndTime:'瓿勴殟 膦呺 鞁滉皠',
customerId:'瓿犼皾 旖旊摐',
@@ -467,8 +470,8 @@
landingSequence:'霝� 頃橃皑 靾滌劀',
labelStyle:'霛茧波 霐旍瀽鞚�',
- detailPrinting:'鏄庣粏鎵撳嵃',
- detailsPrintedSeparately:'鏄庣粏鍒嗘灦鎵撳嵃',
+ detailPrinting:'氇呾劯 鞚胳噭',
+ detailsPrintedSeparately:'靸侅劯 攵勴暊 鞚胳噭',
customLabelPrinting:'旎れ姢韰� 霛茧波 於滊牓',
labelPrinting:'霛茧波 於滊牓',
sortingSuccessful:'鞝曤牞 靹标车',
@@ -483,10 +486,10 @@
mergePrinting:'氤戫暕 於滊牓',
printStatus:' 於滊牓 須熿垬',
labelPrinting2:'霛茧波 於滊牓 ',
- finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
- editablePrinting:'鍙紪杈戞墦鍗�',
- invertSelection:'鍙嶉��',
- sortSummary:'鎺掑簭姹囨��',
+ finishedProductPrinting2:'鞕勳牅頀� 鞚胳噭 2',
+ editablePrinting:'韼胳 臧�電ロ暅 鞚胳噭',
+ invertSelection:'氚� 靹犿儩',
+ sortSummary:'鞝曤牞 頃╈偘',
addAutomatically:'鞛愲彊 毂勳毎旮�',
selectFill:'靹犿儩 頃 毂勳毎旮�',
engineeringPrinting:'頂勲鞝濏姼 於滊牓',
@@ -505,7 +508,14 @@
shortestSide:"鐭竟鏈�鐭�(mm)",
intelligentBranching:"鏅鸿兘鍒嗘灦",
reset:"閲嶇疆",
-
+ combinedFrame:"項� 雽�",
+ shelfNumber:'雽� 順�',
+ totalSequenceNumber:'齑濍矆順�',
+ cancelMerger:'頃╇硲 旆唽',
+ projectMse1:'璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿',
+ orderPrint:'欤茧靹� 鞚胳噭',
+ numberLabelPrintingOperations:'霛茧波 鞚胳噭 須熿垬',
+ numberTimesProcessCardPrinted:'頂勲靹胳姢 旃措摐 鞚胳噭 須熿垬',
},
reportingWorks:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 962daf8..4aa922b 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -285,7 +285,10 @@
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
- }
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -495,7 +498,10 @@
shortestSide:"鐭竟鏈�鐭�(mm)",
intelligentBranching:"鏅鸿兘鍒嗘灦",
reset:"閲嶇疆",
-
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
},
reportingWorks:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 100e2ed..9be4fa0 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -294,7 +294,10 @@
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
- }
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -505,6 +508,10 @@
shortestSide:"鐭竟鏈�鐭�(mm)",
intelligentBranching:"鏅鸿兘鍒嗘灦",
reset:"閲嶇疆",
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
},
reportingWorks:{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 81eafed..49cc735 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -131,7 +131,7 @@
merge = res.data.merge
console.log(merge)
if(merge != 0){
- gridOptions.toolbarConfig.buttons[0].name='鍙栨秷鍚堝苟'
+ gridOptions.toolbarConfig.buttons[0].name=t('processCard.cancelMerger')
}
xGrid.value.reloadData(produceList)
gridOptions.loading = false
@@ -208,7 +208,7 @@
{field: 'glass_child', title: t('reportingWorks.glassChild'),width: 200 },
{field: 'founder', title: t('processCard.founder'),width: 110 },
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),width: 110 },
- {field: 'concatNumber', title: '鎬诲簭鍙�',width: 110},
+ {field: 'concatNumber', title: t('processCard.totalSequenceNumber'),width: 110},
],//琛ㄥご鎸夐挳
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 752adf4..952d75c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -247,7 +247,7 @@
//{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
{code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
{code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},
- {code: 'orderPrint', name: '璁㈠崟鎵撳嵃', status: 'primary'},
+ {code: 'orderPrint', name: t('processCard.orderPrint'), status: 'primary'},
],
zoom: true,
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index 3790a63..8a858ec 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -253,11 +253,11 @@
},
{
field: 'labelPrintNum',
- title: t('鏍囩鎵撳嵃娆℃暟')
+ title: t('processCard.numberLabelPrintingOperations')
},
{
field: 'processPrintNum',
- title: t('娴佺▼鍗℃墦鍗版鏁�')
+ title: t('processCard.numberTimesProcessCardPrinted')
},
],//琛ㄥご鎸夐挳
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index b267239..70a762a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -289,7 +289,7 @@
{field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
{field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'rack',width:100, title: t('鏋跺彿'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
+ {field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -297,7 +297,7 @@
{code: 'update', name: t('processCard.composing'), status: 'primary'},
{code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
{code: 'delete', name: t('basicData.delete'), status: 'primary'},
- {code: 'rack', name: t('鍚堟灦'), status: 'primary'},
+ {code: 'rack', name: t('processCard.combinedFrame'), status: 'primary'},
],
import: false,
// export: true,
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
index 47b0a0c..6674d5c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
@@ -181,7 +181,7 @@
v-model="submit.glassLevel"
:options="glassType"
clearable
- placeholder=""
+ :placeholder="$t('processCard.pleaseSelect')"
:disabled="rowIndex"
/>
</el-row>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index 4436c4a..eb4b21c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -71,13 +71,13 @@
@click="changeModel"
type="primary"
>
- {{childrenData.model === 0 ? '绮剧‘妯″紡' : '妯＄硦妯″紡'}}</el-button>
+ {{childrenData.model === 0 ? $t('order.preciseMode') : $t('order.ambiguityModels')}}</el-button>
<el-input
v-model="childrenData.scope"
type="number"
v-show="childrenData.model===1"
style="width: 140px;margin-left: 5px"
- placeholder="鐜荤拑灏哄鑼冨洿"/>
+ :placeholder="$t('order.glassSizeRange')"/>
</template>
</basic-table>
--
Gitblit v1.8.0