diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue index df131de..442b6e3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue @@ -11,17 +11,17 @@ label-width="90px" label-suffix=":" > - + - + - + - + - + - + - + @@ -106,17 +109,22 @@ :disabled="crud.selections.length !== 1" @click="uploadMES" > - 回传MES + {{ $t('hotpointivt.title3') }} - + - - + + - + - + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + @@ -217,7 +233,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import Dialog from '@/views/wms/pdm/ivt/hotpointivt/Dialog.vue' - +import i18n from '@/i18n' const defaultForm = { ivt_id: null, point_code: null, @@ -250,7 +266,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '烘烤区点位库存', + title: i18n.t('hotpointivt.title'), url: 'api/hotpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', @@ -271,10 +287,10 @@ export default { dialogShow: false, rules: { point_code: [ - { required: true, message: '点位编码不能为空', trigger: 'blur' } + { required: true, message: this.$t('hotpointivt.msg.isNotEmpty'), trigger: 'blur' } ], point_status: [ - { required: true, message: '点位状态不能为空', trigger: 'blur' } + { required: true, message: this.$t('hotpointivt.msg.isNotEmpty'), trigger: 'blur' } ] } } diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue index 0d697db..b6399d8 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue @@ -11,63 +11,63 @@ label-width="90px" label-suffix=":" > - + - + - + - + - + - + @@ -79,17 +79,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -102,18 +102,17 @@ import crudHotpointivt from './hotpointivt' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' - +import i18n from '@/i18n' const defaultForm = { } export default { name: 'HotPointIvtTask', - components: { pagination, crudOperation, rrOperation, udOperation }, + components: { pagination, crudOperation, rrOperation }, dicts: [], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '烘烤区任务明细', + title: i18n.t('hotpointivt.title'), url: 'api/hotpointivt/taskDtlQuery', idField: 'ivt_id', sort: 'ivt_id,desc', diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue index 8fc1829..84d2818 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue @@ -12,68 +12,70 @@ label-suffix=":" > - + - + - - + + - + - + @@ -93,7 +95,7 @@ :disabled="crud.selections.length !== 1" @click="compelEnd" > - 强制结束 + {{ $t('rawworkorder.placeholder.compelEnd') }} - 称重 + {{ $t('rawworkorder.placeholder.weigh') }} @@ -118,12 +120,12 @@ - + - + @@ -131,12 +133,12 @@ - + - + @@ -144,12 +146,12 @@ - + - + @@ -157,33 +159,33 @@ - + - - + + - + default-time="12:00:00" + /> - + - + @@ -191,22 +193,22 @@ - + - - - + + {{ $t('rawworkorder.dialog.no') }} + {{ $t('rawworkorder.dialog.yes') }} @@ -219,23 +221,23 @@ @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +