From 2453c5875369c30957a2f65205eded954cfeab04 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 11 Apr 2024 14:42:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=82=B9=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=9B=BD=E9=99=85=E5=8C=96=20=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/i18n/langs/point/en.js | 37 ++--- lms/nladmin-ui/src/i18n/langs/point/in.js | 18 +++ lms/nladmin-ui/src/i18n/langs/point/zh.js | 1 + lms/nladmin-ui/src/i18n/langs/region/en.js | 30 +++- lms/nladmin-ui/src/i18n/langs/region/in.js | 30 +++- lms/nladmin-ui/src/i18n/langs/region/zh.js | 30 +++- .../src/views/wms/sch/point/index.vue | 94 +++++++---- .../src/views/wms/sch/region/index.vue | 151 +++++++++++++----- 8 files changed, 291 insertions(+), 100 deletions(-) diff --git a/lms/nladmin-ui/src/i18n/langs/point/en.js b/lms/nladmin-ui/src/i18n/langs/point/en.js index b58ce7c..9410938 100644 --- a/lms/nladmin-ui/src/i18n/langs/point/en.js +++ b/lms/nladmin-ui/src/i18n/langs/point/en.js @@ -1,5 +1,6 @@ export default { 'Point': { + 'title': 'Point Management', 'table': { 'workshop_code': 'WorkShop Code', 'point_code': 'Point Code', @@ -24,27 +25,21 @@ export default { 'update_time': 'Update Time' }, 'dialog': { - 'workshop_code': '所属车间', - 'point_code': '点位编码', - 'point_name': '点位名称', - 'region_code': '区域编码', - 'region_name': '区域名称', - 'point_type': '点位类型', - 'point_status': '点位状态', - 'vehicle_type': '载具类型', - 'vehicle_code': '载具编码', - 'vehicle_qty': '载具数量', - 'lock_type': '锁定类型', - 'parent_point_code': '父点位编码', - 'ing_task_code': '在执行的任务标识', - 'is_has_workder': '是否有工单', - 'is_auto': '是否自动', - 'is_used': '是否启用', - 'remark': '备注', - 'create_name': '创建人', - 'create_time': '创建时间', - 'update_name': '修改人', - 'update_time': '修改时间' + 'workshop_code': 'workShop code', + 'point_code': 'point code', + 'point_name': 'point name', + 'region_code': 'region code', + 'region_name': 'region name', + 'point_type': 'point type', + 'point_status': 'point status', + 'vehicle_type': 'vehicle type', + 'vehicle_code': 'vehicle code', + 'vehicle_qty': 'vehicle quantity', + 'can_vehicle_type': 'can lay vehicle type', + 'parent_point_code': 'parent point code', + 'is_has_workder': 'workder', + 'is_auto': 'auto', + 'remark': 'remark' }, 'search': { 'workshop_code': 'workshop code', diff --git a/lms/nladmin-ui/src/i18n/langs/point/in.js b/lms/nladmin-ui/src/i18n/langs/point/in.js index ed1abd2..4909e32 100644 --- a/lms/nladmin-ui/src/i18n/langs/point/in.js +++ b/lms/nladmin-ui/src/i18n/langs/point/in.js @@ -1,5 +1,6 @@ export default { 'Point': { + 'title': 'Manajemen Poin', 'table': { 'workshop_code': 'Kode Workshop', 'point_code': 'Kode Titik', @@ -23,6 +24,23 @@ export default { 'update_name': 'Perbarui Nama', 'update_time': 'Waktu Pembaruan' }, + 'dialog': { + 'workshop_code': 'kode workshop', + 'point_code': 'kode titik', + 'point_name': 'nama titik', + 'region_code': 'kode wilayah', + 'region_name': 'nama wilayah', + 'point_type': 'jenis titik', + 'point_status': 'status titik', + 'vehicle_type': 'jenis kendaraan', + 'vehicle_code': 'kode kendaraan', + 'vehicle_qty': 'jumlah kendaraan', + 'can_vehicle_type': 'dapat digunakan baki', + 'parent_point_code': 'kode titik induk', + 'is_has_workder': 'pekerja', + 'is_auto': 'otomatis', + 'remark': 'komentar' + }, 'search': { 'workshop_code': 'kode workshop', 'blurry': 'pencarian kabur', diff --git a/lms/nladmin-ui/src/i18n/langs/point/zh.js b/lms/nladmin-ui/src/i18n/langs/point/zh.js index 2da8d3e..8404f6b 100644 --- a/lms/nladmin-ui/src/i18n/langs/point/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/point/zh.js @@ -1,5 +1,6 @@ export default { 'Point': { + 'title': '点位管理', 'table': { 'workshop_code': '所属车间', 'point_code': '点位编码', diff --git a/lms/nladmin-ui/src/i18n/langs/region/en.js b/lms/nladmin-ui/src/i18n/langs/region/en.js index 2a07491..59f03a0 100644 --- a/lms/nladmin-ui/src/i18n/langs/region/en.js +++ b/lms/nladmin-ui/src/i18n/langs/region/en.js @@ -1,10 +1,32 @@ export default { 'Region': { + 'title': 'Regional Management', + 'search': { + 'blurry': 'Fuzzy Search' + }, 'table': { - 'code': 'code', - 'name': 'name', - 'values': 'value', - 'description': 'remark' + 'region_code': 'Region Code', + 'region_name': 'Region Name', + 'point_type_explain': 'Type Explain', + 'point_status_explain': 'Status Explain', + 'is_has_worker': 'Worker', + 'workshop_code': 'Workshop Code', + 'order_seq': 'Sort', + 'remark': 'Remark', + 'create_name': 'Create Name', + 'create_time': 'Create Time', + 'update_name': 'Create Name', + 'update_time': 'Create Time' + }, + 'dialog': { + 'region_code': 'region code', + 'region_name': 'region name', + 'point_type_explain': 'type explain', + 'point_status_explain': 'status explain', + 'is_has_worker': 'worker', + 'workshop_code': 'workshop code', + 'order_seq': 'sort', + 'remark': 'remark' }, 'rules': { 'NotNull': 'Cannot be empty' diff --git a/lms/nladmin-ui/src/i18n/langs/region/in.js b/lms/nladmin-ui/src/i18n/langs/region/in.js index ca712a4..58020e4 100644 --- a/lms/nladmin-ui/src/i18n/langs/region/in.js +++ b/lms/nladmin-ui/src/i18n/langs/region/in.js @@ -1,10 +1,32 @@ export default { 'Region': { + 'title': 'Manajemen Wilayah', + 'search': { + 'blurry': 'Pencarian Fuzzy' + }, 'table': { - 'code': 'kode', - 'name': 'nama', - 'values': 'nilai', - 'description': 'Catatan' + 'region_code': 'Kode Wilayah', + 'region_name': 'Nama Wilayah', + 'point_type_explain': 'Ketik Jelaskan', + 'point_status_explain': 'Status Jelaskan', + 'is_has_worker': 'Pekerja', + 'workshop_code': 'Kode Bengkel', + 'order_seq': 'Menyortir', + 'remark': 'Komentar', + 'create_name': 'Buat Nama', + 'create_time': 'Buat Waktu', + 'update_name': 'Buat Nama', + 'update_time': 'Buat Waktu' + }, + 'dialog': { + 'region_code': 'kode wilayah', + 'region_name': 'nama wilayah', + 'point_type_explain': 'ketik jelaskan', + 'point_status_explain': 'status jelaskan', + 'is_has_worker': 'pekerja', + 'workshop_code': 'kode bengkel', + 'order_seq': 'menyortir', + 'remark': 'komentar' }, 'rules': { 'NotNull': 'Tidak dapat kosong' diff --git a/lms/nladmin-ui/src/i18n/langs/region/zh.js b/lms/nladmin-ui/src/i18n/langs/region/zh.js index 3317744..1c75a32 100644 --- a/lms/nladmin-ui/src/i18n/langs/region/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/region/zh.js @@ -1,10 +1,32 @@ export default { 'Region': { + 'title': '区域管理', + 'search': { + 'blurry': '模糊搜索' + }, 'table': { - 'code': '编码', - 'name': '名称', - 'values': '值', - 'description': '备注' + 'region_code': '区域编码', + 'region_name': '区域名称', + 'point_type_explain': '点位类型说明', + 'point_status_explain': '点位状态说明', + 'is_has_worker': '是否有工单', + 'workshop_code': '车间编码', + 'order_seq': '顺序号', + 'remark': '备注', + 'create_name': '创建人', + 'create_time': '创建时间', + 'update_name': '修改人', + 'update_time': '修改时间' + }, + 'dialog': { + 'workshop_code': '所属车间', + 'region_code': '区域编码', + 'region_name': '区域名称', + 'order_seq': '顺序号', + 'point_type_explain': '点位类型说明', + 'point_status_explain': '点位状态说明', + 'is_has_worker': '是否有工单', + 'remark': '备注' }, 'rules': { 'NotNull': '不能为空' diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 6d7a312..8fe8c0f 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -167,15 +167,32 @@ - - - + + + - + - + @@ -199,17 +216,17 @@ /> - + - + - + - + @@ -236,13 +253,13 @@ /> - + - + - + - + - + - - {{ item.label }} + + + {{ $t('common.Yes') }} + {{ $t('common.No') }} + - - {{ item.label }} + + + {{ $t('common.Yes') }} + {{ $t('common.No') }} + - +
- 取消 - 确认 + {{ $t('common.Cancel') }} + {{ $t('common.Confirm') }}
@@ -445,7 +468,7 @@ import pagination from '@crud/Pagination' import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue' import PointDialog from '@/views/wms/sch/point/PointDialog.vue' -import i18n from "@/i18n"; +import i18n from '@/i18n' const defaultForm = { point_code: null, @@ -485,7 +508,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '点位管理', + title: i18n.t('Point.title'), url: 'api/schBasePoint', idField: 'point_code', sort: 'point_code,desc', @@ -536,6 +559,23 @@ export default { } return `150px` }, + computedLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `540px` + } + return `600px` + }, + computedFormLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `110px` + } + if (item === 'in') { + return `160px` + } + return `150px` + } }, created() { this.getWorkShopList() diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue index 3665f58..61b4641 100644 --- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue @@ -7,15 +7,14 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="90px" label-suffix=":" > - + @@ -26,12 +25,12 @@ /> - + @@ -46,12 +45,20 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" - width="520px"> - - + :width="computedLabelWidth" + > + + - - + + - + - - + - + - + - + - 是 - 否 + {{ $t('common.Yes') }} + {{ $t('common.No') }} - +
- 取消 - 确认 + {{ $t('common.Cancel') }} + {{ $t('common.Confirm') }}
- - - - - + + + + + - - - - - - - - + + + + + + + +