diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/en.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/en.js index a13400a..8eef81a 100644 --- a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/en.js +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/en.js @@ -12,6 +12,8 @@ export default { 'operate': 'operation', 'yse': 'yse', 'no': 'no', + 'confirm': 'confirm', + 'cancel': 'cancel', 'is_update': 'Can it be modified' }, 'other': { diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/in.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/in.js index 2195591..57fb3de 100644 --- a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/in.js +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/in.js @@ -1,33 +1,35 @@ export default { 'classstandard': { - 'title': 'Basic category', + 'title': 'Kategori dasar', 'dialog': { - 'code': 'Classification code', - 'name': 'Classification Name1', - 'desc': 'Brief description', + 'code': 'Kode klasifikasi', + 'name': 'Nama Klasifikasi', + 'desc': 'Deskripsi singkat', 'top_class': 'Top Category', - 'superior_class': 'Superior category', - 'update_name': 'Modified by', - 'update_time': 'Change time', - 'operate': 'operation', - 'yse': 'yse', - 'no': 'no', - 'is_update': 'Can it be modified' + 'superior_class': 'Kategori atas', + 'update_name': 'Diubah oleh', + 'update_time': 'Ubah waktu', + 'operate': 'operasi', + 'yse': 'ya', + 'no': 'Tidak', + 'confirm': 'confirm', + 'cancel': 'batalkan', + 'is_update': 'Bisakah ia diubah' }, 'other': { - 'addSibling': 'Add peers at the same level', - 'addChildren': 'Add sub level' + 'addSibling': 'Tambah rakan pada tingkat yang sama', + 'addChildren': 'Tambah tahap bawah' }, 'placeholder': { - 'label': 'Category Name', - 'select': 'Please choose a category name', - 'open': 'Expand All', + 'label': 'Nama Kategori', + 'select': 'Silakan pilih nama kategori', + 'open': 'Kembangkan Semua', 'superior_class': 'Select superior category' }, 'msg': { - 'delete': 'Are you sure to delete? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!', - 'isNotEmpty': 'Cannot be empty', - 'topClassNotEmpty': 'The top-level category cannot be empty' + 'delete': 'Apakah Anda yakin untuk menghapus? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!', + 'isNotEmpty': 'Tidak dapat kosong', + 'topClassNotEmpty': 'Kategori tingkat atas tidak dapat kosong' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/zh.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/zh.js index 09b5ffb..448b112 100644 --- a/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/zh.js @@ -7,13 +7,13 @@ export default { 'desc': '简要描述', 'top_class': '顶级类目', 'superior_class': '上级类目', - 'create_name': '创建人', - 'create_time': '创建时间', 'update_name': '修改人', 'update_time': '修改时间', 'operate': '操作', 'yse': '是', 'no': '否', + 'confirm': '确认', + 'cancel': '取消', 'is_update': '是否可修改' }, 'other': { diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/material/en.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/en.js new file mode 100644 index 0000000..63a975b --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/en.js @@ -0,0 +1,36 @@ +export default { + 'material': { + 'title': 'Basic Material Information', + 'dialog': { + 'code': 'Material code', + 'name': 'Material name', + 'spec': 'Material specifications', + 'unit_name': 'unit of measurement', + 'class_id': 'Material classification identification', + 'standing_time': 'Return time (hours)', + 'workshop_code': 'Workshop code', + 'remark': 'remarks', + 'yse': 'yse', + 'no': 'no', + 'confirm': 'confirm', + 'cancel': 'cancel', + 'enable': 'enabled', + 'is_enable': 'Is it enabled', + 'is_delete': 'Do you want to delete it', + 'create_name': 'Creator', + 'create_time': 'Creation time', + 'update_name': 'Modified by', + 'update_time': 'Change time', + 'operate': 'operation' + }, + 'placeholder': { + 'code': 'Code name', + 'select': 'Fuzzy search', + 'workshop_code': 'Belonging workshop', + 'please_select': 'Please select' + }, + 'msg': { + 'isNotEmpty': 'Cannot be empty' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/material/in.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/in.js new file mode 100644 index 0000000..0179d48 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/in.js @@ -0,0 +1,36 @@ +export default { + 'material': { + 'title': 'Informasi Material dasar', + 'dialog': { + 'code': 'Kode materi', + 'name': 'Material name', + 'spec': 'Spesifikasi Material', + 'unit_name': 'Unit ukuran', + 'class_id': 'Identifikasi klasifikasi materi', + 'standing_time': 'Waktu kembali (jam)', + 'workshop_code': 'Kode Workshop', + 'remark': 'komentar', + 'yse': 'ya', + 'no': 'Tidak', + 'confirm': 'confirm', + 'cancel': 'batalkan', + 'enable': 'Aktifkan', + 'is_enable': 'Apakah diaktifkan', + 'is_delete': 'Apakah Anda ingin menghapusnya', + 'create_name': 'Pencipta', + 'create_time': 'Waktu penciptaan', + 'update_name': 'Diubah oleh', + 'update_time': 'Ubah waktu', + 'operate': 'operasi' + }, + 'placeholder': { + 'code': 'Nama kode', + 'select': 'Pencarian kabur', + 'workshop_code': 'Workshop terserah', + 'please_select': 'Silakan pilih' + }, + 'msg': { + 'isNotEmpty': 'Tidak dapat kosong' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/basedata/master/material/zh.js b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/zh.js new file mode 100644 index 0000000..e75b5a9 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/basedata/master/material/zh.js @@ -0,0 +1,36 @@ +export default { + 'material': { + 'title': '物料基础信息', + 'dialog': { + 'code': '物料编码', + 'name': '物料名称', + 'spec': '物料规格', + 'unit_name': '计量单位', + 'class_id': '物料分类标识', + 'standing_time': '回温时间(小时)', + 'workshop_code': '车间编码', + 'remark': '备注', + 'yse': '是', + 'no': '否', + 'confirm': '确认', + 'cancel': '取消', + 'enable': '启用', + 'is_enable': '是否启用', + 'is_delete': '是否删除', + 'create_name': '创建人', + 'create_time': '创建时间', + 'update_name': '修改人', + 'update_time': '修改时间', + 'operate': '操作' + }, + 'placeholder': { + 'code': '编码名称', + 'select': '模糊搜索', + 'workshop_code': '所属车间', + 'please_select': '请选择' + }, + 'msg': { + 'isNotEmpty': '不能为空' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index 40e7e67..97e9e9c 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -2,9 +2,9 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import dataPermission from './dataPermission/zh' import workshop from './basedata/workshop/zh' import vehicle from './basedata/vehicle/zh' -import material from './basedata/material/zh' import classification from './basedata/classification/zh' import classstandard from './basedata/master/classstandard/zh' +import material from './basedata/master/material/zh' import taskConfig from './sch/task/zh' import SchBasePoint from './sch/point/zh' import taskManage from './sch/task_manage/zh' diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 793be66..ac8acc9 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -3,7 +3,7 @@ import dataPermission from './dataPermission/en' import en from './en' import workshop from './basedata/workshop/en' import vehicle from './basedata/vehicle/en' -import material from './basedata/material/en' +import material from './basedata/master/material/en' import classification from './basedata/classification/en' import classstandard from './basedata/master/classstandard/en' import taskConfig from './sch/task/en' diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index cf9206e..5cb4984 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -3,7 +3,7 @@ import id from './in' // import dataPermission from './dataPermission/in' // import workshop from './basedata/workshop/in' // import vehicle from './basedata/vehicle/in' -// import material from './basedata/material/in' +import material from './basedata/master/material/in' // import classification from './basedata/classification/in' import classstandard from './basedata/master/classstandard/in' // import taskConfig from './sch/task/in' @@ -51,7 +51,7 @@ export default { // ...menu, // ...workshop, // ...vehicle, - // ...material, + ...material, // ...notice, // ...classification, // ...login, diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue index ad0589b..414c418 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue @@ -11,10 +11,10 @@ label-width="90px" label-suffix=":" > - + - 全部展开 + {{ $t('classstandard.placeholder.open') }} @@ -55,34 +55,34 @@ width="500px" > - + - + - + - + - - + {{ $t('classstandard.dialog.yse') }} + {{ $t('classstandard.dialog.no') }} - + @@ -98,15 +98,15 @@ @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" > - - - - - - + + + + + + @@ -117,10 +117,10 @@ :permission="permission" :disabled-edit="scope.row.is_modify === '0'" :disabled-dle="scope.row.is_modify === '0'" - msg="确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!" + :msg="$t('classstandard.msg.delete')" /> - 新增同级 - 新增子级 + {{ $t('classstandard.other.addSibling') }} + {{ $t('classstandard.other.addChildren') }} @@ -139,6 +139,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' +import i18n from '@/i18n' let defaultForm = { id: null, @@ -171,7 +172,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '基础类别', + title: i18n.t('classstandard.title'), url: 'api/Classstandard', idField: 'class_id', sort: 'class_id,desc', @@ -193,34 +194,34 @@ export default { }, rules: { class_id: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], path_code: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], class_code: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], class_name: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], is_leaf: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], is_modify: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], is_delete: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], create_id: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], create_name: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ], create_time: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: this.$t('classstandard.msg.isNotEmpty'), trigger: 'blur' } ] } } @@ -265,7 +266,7 @@ export default { [CRUD.HOOK.afterValidateCU]() { if (this.form.parent_class_id !== null && this.form.parent_class_id === this.form.class_id) { this.$message({ - message: '顶级类目不能为空', + message: this.$t('Classstandard.msg.topClassNotEmpty'), type: 'warning' }) return false diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue index 07faa3f..34698d4 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue @@ -4,13 +4,13 @@
- 模糊查询: + {{ $t('material.placeholder.select') }} : @@ -30,18 +30,18 @@ width="500px" > - + - + - + @@ -53,14 +53,14 @@ /> - - - + + {{ $t('material.dialog.no') }} + {{ $t('material.dialog.yse') }} @@ -72,10 +72,10 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - + + + + - - + + @@ -118,6 +118,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudMdPbMeasureunit from '@/views/wms/basedata/master/measure/mdPbMeasureunit' +import i18n from '@/i18n' const defaultForm = { material_id: null, @@ -136,7 +137,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '物料', + title: i18n.t('material.title'), optShow: { add: true, reset: true }, url: 'api/Materialbase', idField: 'material_id', @@ -154,13 +155,13 @@ export default { }, rules: { material_code: [ - { required: true, message: '物料编码不能为空', trigger: 'blur' } + { required: true, message: this.$t('material.msg.isNotEmpty'), trigger: 'blur' } ], material_name: [ - { required: true, message: '物料名称不能为空', trigger: 'blur' } + { required: true, message: this.$t('material.msg.isNotEmpty'), trigger: 'blur' } ], base_unit_id: [ - { required: true, message: '单位不能为空', trigger: 'blur' } + { required: true, message: this.$t('material.msg.isNotEmpty'), trigger: 'blur' } ] } }