国际化修改

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': {

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',
+      'code': 'Kode klasifikasi',
-      'name': 'Classification Name1',
+      'name': 'Nama Klasifikasi',
-      'desc': 'Brief description',
+      'desc': 'Deskripsi singkat',
       'top_class': 'Top Category',
-      'superior_class': 'Superior category',
+      'superior_class': 'Kategori atas',
-      'update_name': 'Modified by',
+      'update_name': 'Diubah oleh',
-      'update_time': 'Change time',
+      'update_time': 'Ubah waktu',
-      'operate': 'operation',
+      'operate': 'operasi',
-      'yse': 'yse',
+      'yse': 'ya',
-      'no': 'no',
+      'no': 'Tidak',
-      'is_update': 'Can it be modified'
+      'confirm': 'confirm',
+      'cancel': 'batalkan',
+      'is_update': 'Bisakah ia diubah'
     },
     'other': {
-      'addSibling': 'Add peers at the same level',
+      'addSibling': 'Tambah rakan pada tingkat yang sama',
-      'addChildren': 'Add sub level'
+      'addChildren': 'Tambah tahap bawah'
     },
     'placeholder': {
-      'label': 'Category Name',
+      'label': 'Nama Kategori',
-      'select': 'Please choose a category name',
+      'select': 'Silakan pilih nama kategori',
-      'open': 'Expand All',
+      '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!',
+      'delete': 'Apakah Anda yakin untuk menghapus? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!',
-      'isNotEmpty': 'Cannot be empty',
+      'isNotEmpty': 'Tidak dapat kosong',
-      'topClassNotEmpty': 'The top-level category cannot be empty'
+      'topClassNotEmpty': 'Kategori tingkat atas tidak dapat kosong'
     }
   }
 }

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': {

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'
+    }
+  }
+}

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'
+    }
+  }
+}

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': '不能为空'
+    }
+  }
+}

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'

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'

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,

lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue

@@ -11,10 +11,10 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="分类名称">
+          <el-form-item :label="$t('classstandard.dialog.name')">
             <el-select
               v-model="query.class_code"
-              placeholder="请选择分类名称"
+              :placeholder="$t('classstandard.placeholder.select')"
               clearable
               filterable
               size="mini"
@@ -43,7 +43,7 @@
           icon="el-icon-s-operation"
           @click="ToExpandall"
         >
-          全部展开
+          {{ $t('classstandard.placeholder.open') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -55,34 +55,34 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="分类编码" prop="class_code">
+          <el-form-item :label="$t('classstandard.dialog.code')" prop="class_code">
             <el-input v-model="form.class_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="分类名称" prop="class_name">
+          <el-form-item :label="$t('classstandard.dialog.name')" prop="class_name">
             <el-input v-model="form.class_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="简要描述" prop="class_desc">
+          <el-form-item :label="$t('classstandard.dialog.desc')" prop="class_desc">
             <el-input v-model="form.class_desc" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="顶级类目">
+          <el-form-item :label="$t('classstandard.dialog.top_class')">
             <el-radio-group v-model="form.isTop" style="width: 140px">
-              <el-radio label="1">是</el-radio>
+              <el-radio label="1"> {{ $t('classstandard.dialog.yse') }}</el-radio>
-              <el-radio label="0">否</el-radio>
+              <el-radio label="0"> {{ $t('classstandard.dialog.no') }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级类目" prop="pid">
+          <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" :label="$t('classstandard.dialog.superior_class')" prop="pid">
             <treeselect
               v-model="form.parent_class_id"
               :load-options="loadClass"
               :options="classes"
               style="width: 370px;"
-              placeholder="选择上级类目"
+              :placeholder="$t('classstandard.placeholder.superior_class')"
             />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('classstandard.dialog.cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('classstandard.dialog.confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -98,15 +98,15 @@
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="class_code" label="分类编码" />
+        <el-table-column prop="class_code" :label="$t('classstandard.dialog.code')" />
-        <el-table-column prop="class_name" label="分类名称" />
+        <el-table-column prop="class_name" :label="$t('classstandard.dialog.name')" />
-        <el-table-column prop="class_desc" label="分类简要描述" />
+        <el-table-column prop="class_desc" :label="$t('classstandard.dialog.desc')" />
-        <el-table-column prop="update_name" label="修改人" />
+        <el-table-column prop="update_name" :label="$t('classstandard.dialog.update_name')" />
-        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="update_time" :label="$t('classstandard.dialog.update_time')" />
-        <el-table-column prop="is_modify" label="是否可修改" />
+        <el-table-column prop="is_modify" :label="$t('classstandard.dialog.is_update')" />
         <el-table-column
           v-permission="['admin','Classstandard:edit','Classstandard:del']"
-          label="操作"
+          :label="$t('classstandard.dialog.operate')"
           width="250px"
           align="center"
         >
@@ -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')"
             />
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
+            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">{{ $t('classstandard.other.addSibling') }}</el-button>
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
+            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">{{ $t('classstandard.other.addChildren') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -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

lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue

@@ -4,13 +4,13 @@
     <div class="head-container">
       <el-row>
         <el-col :span="8">
-          模糊查询：
+          {{ $t('material.placeholder.select') }} :
           <el-input
             v-model="query.search"
             clearable
             style="width: 200px"
             size="mini"
-            placeholder="输入物料编码或名称"
+            :placeholder="$t('material.placeholder.code')"
             prefix-icon="el-icon-search"
             class="filter-item"
           />
@@ -30,18 +30,18 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="物料编码" prop="material_code">
+          <el-form-item :label="$t('material.dialog.code')" prop="material_code">
             <el-input v-model="form.material_code" style="width: 200px;" />
           </el-form-item>
-          <el-form-item label="物料名称" prop="material_name">
+          <el-form-item :label="$t('material.dialog.name')" prop="material_name">
             <el-input v-model="form.material_name" style="width: 200px;" />
           </el-form-item>
-          <el-form-item label="物料单位" prop="base_unit_id">
+          <el-form-item :label="$t('material.dialog.unit_name')" prop="base_unit_id">
             <el-select
               v-model="form.base_unit_id"
               clearable
               size="mini"
-              placeholder="请选择"
+              :placeholder="$t('material.dialog.please_select')"
               class="filter-item"
               style="width: 210px"
             >
@@ -53,14 +53,14 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="是否启用" prop="is_used">
+          <el-form-item :label="$t('material.dialog.is_enable')" prop="is_used">
-            <el-radio v-model="form.is_used" label="0">否</el-radio>
+            <el-radio v-model="form.is_used" label="0">{{ $t('material.dialog.no') }}</el-radio>
-            <el-radio v-model="form.is_used" label="1">是</el-radio>
+            <el-radio v-model="form.is_used" label="1">{{ $t('material.dialog.yse') }}</el-radio>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('material.dialog.cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('material.dialog.confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -72,10 +72,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_code" :label="$t('material.dialog.code')" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_name" :label="$t('material.dialog.name')" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
-        <el-table-column prop="unit_name" label="计量单位" :min-width="flexWidth('unit_name',crud.data,'计量单位')" />
+        <el-table-column prop="unit_name" :label="$t('material.dialog.unit_name')" :min-width="flexWidth('unit_name',crud.data,'计量单位')" />
-        <el-table-column label="启用" align="center" prop="is_used">
+        <el-table-column :label="$t('material.dialog.enable')" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.is_used"
@@ -87,12 +87,12 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
+        <el-table-column prop="update_name" :label="$t('material.dialog.update_name')" :min-width="flexWidth('update_name',crud.data,'修改人')" />
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column prop="update_time" :label="$t('material.dialog.update_time')" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column
           v-permission="['admin','material:edit','material:del']"
           fixed="right"
-          label="操作"
+          :label="$t('material.dialog.operate')"
           width="120px"
           align="center"
         >
@@ -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' }
         ]
       }
     }