From 541d44378c07ff350ebb88639191c677cb822592 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 30 Dec 2022 10:38:20 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 3 +++ src/i18n/lang/en.ts | 5 ++++- src/i18n/lang/ru.ts | 17 ++++++++++------- .../raw/LineSide/rawWasteJudgment/index.vue | 2 +- src/pages/raw/LineSide/rejectsOffline/index.vue | 2 +- .../semifinished-wasteJudgment/index.vue | 6 ++++-- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 70dbbf7..07da1e5 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -508,9 +508,11 @@ export default { PleaseOne: '请输入责任人', PleaseTwo: '请输入不良原因', rejectsOffline: '不良品下线', + newrejectsOffline: '不良品下线', ResponsibleProcess: '责任区域', PleaseThere: '请输入责任工序', rawWasteJudgment: '原材料判废', + newrawWasteJudgment: '原材料判废', reason1: '原因', PleaseFour: '请输入原因', ResponsibilityCategory: '责任大类', @@ -518,6 +520,7 @@ export default { VirtualReplenishment: '虚拟补料', VirtualInventory: '虚拟库存', semifinishedWasteJudgment: '半成品判废', + newsemifinishedWasteJudgment: '半成品判废', MaterialConversionL: '物料转换', OriginalMaterial: '原物料号', OriginalMaterialdes: '原物料描述', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index c110fec..23bb47e 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -45,7 +45,7 @@ export default { workArea_Warehouse: 'WH', workArea_WarehouseName: 'WH name', inventory: 'inventory', - workArea_RegionName: 'Region name', + workArea_RegionName: 'Responsible area name', workArea_WorkAreaName: 'Work area name', workArea_WarehouseClassify: 'WH classify', workArea_Confirm: 'Confirm', @@ -508,9 +508,11 @@ export default { PleaseOne: 'Please enter the responsible person', PleaseTwo: 'Please enter the cause of the defect', rejectsOffline: 'NG Roll Off', + newrejectsOffline: 'NG Roll Off', ResponsibleProcess: 'Responsible area', PleaseThere: 'Please enter the responsible operation', rawWasteJudgment: 'Waste judgment of raw', + newrawWasteJudgment: 'Waste judgment of raw', reason1: 'reason', PleaseFour: 'Please enter the reason', ResponsibilityCategory: 'Responsibility category', @@ -518,6 +520,7 @@ export default { VirtualReplenishment: 'Virtual replenishment', VirtualInventory: 'Virtual inventory', semifinishedWasteJudgment: 'Waste judgment of SFG', + newsemifinishedWasteJudgment: 'Waste judgment of SFG', MaterialConversionL: 'Material conversion', OriginalMaterial: 'Original material', OriginalMaterialdes: 'Raw material des', diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 6e4bead..a926b4a 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -45,7 +45,7 @@ export default { workArea_Warehouse: 'Склад', workArea_WarehouseName: 'Наименование склада', inventory: 'Виртуальный сток', - workArea_RegionName: 'Наименование области', + workArea_RegionName: 'Наименование виновника', workArea_WorkAreaName: 'Наименование рабочей области', workArea_WarehouseClassify: 'Категория склада', workArea_Confirm: 'Подтвердить', @@ -503,21 +503,24 @@ export default { Lineedge_raw_transfer: 'транзитный склад', CostCenter: 'центр себестоимости', recovery: 'рекуперация', - personLiable: 'ответственное лицо', + personLiable: 'Ответственное лицо', CausesOfDefects: 'нежелательная причина', PleaseOne: 'Введите ответственное лицо', PleaseTwo: 'Введите причину неисправности', - rejectsOffline: 'нижняя линия дефекта', - ResponsibleProcess: 'Ответственный участок', + rejectsOffline: 'Списание ПФ на участках СА и DA', + newrejectsOffline: 'нижняя линия дефекта', + ResponsibleProcess: 'Виновник', PleaseThere: 'Введите ответственную операцию', - rawWasteJudgment: 'утилизация сырья', + rawWasteJudgment: 'Списание комплектующих', + newrawWasteJudgment: 'утилизация сырья', reason1: 'причина', PleaseFour: 'Введите причину', ResponsibilityCategory: 'категория ответственности', Please_category: 'Выберите категорию ответственности', VirtualReplenishment: 'виртуальная добавка', VirtualInventory: 'виртуальный запас', - semifinishedWasteJudgment: 'браковка полуфабрикатов', + semifinishedWasteJudgment: 'Списание на участке FA', + newsemifinishedWasteJudgment: 'браковка полуфабрикатов', MaterialConversionL: 'конверсия материалов', OriginalMaterial: 'инвентарный номер', OriginalMaterialdes: 'описание исходного материала', @@ -527,7 +530,7 @@ export default { Relationship: 'производственные вычеты', Insufficient: 'недостаточная емкость источника', defect: 'Дефект', - DefectName: 'наименование дефекта', + DefectName: 'Наименование дефекта', Note: 'Примечание', Pleasedefects: 'Ошибка сканирования', PleaseResponsibleArea: 'область ответственности сканирования', diff --git a/src/pages/raw/LineSide/rawWasteJudgment/index.vue b/src/pages/raw/LineSide/rawWasteJudgment/index.vue index e588108..890e1af 100644 --- a/src/pages/raw/LineSide/rawWasteJudgment/index.vue +++ b/src/pages/raw/LineSide/rawWasteJudgment/index.vue @@ -4,7 +4,7 @@ - {{ $t('message.rawWasteJudgment') }} + {{ $t('message.newrawWasteJudgment') }} diff --git a/src/pages/raw/LineSide/rejectsOffline/index.vue b/src/pages/raw/LineSide/rejectsOffline/index.vue index 6a83621..11f61b5 100644 --- a/src/pages/raw/LineSide/rejectsOffline/index.vue +++ b/src/pages/raw/LineSide/rejectsOffline/index.vue @@ -5,7 +5,7 @@ - {{ $t('message.rejectsOffline') }} + {{ $t('message.newrejectsOffline') }} diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue index 2943bdf..bdbab25 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -4,7 +4,7 @@ - {{ $t('message.semifinishedWasteJudgment') }} + {{ $t('message.newsemifinishedWasteJudgment') }} @@ -256,8 +256,10 @@ export default class KanDanHandOver extends BasePage { view { width: 110rpx; height: 100%; - line-height: 100rpx; + line-height: 30rpx; z-index: 10000; + display: flex; + align-items: center; } }