opt:菜单国际化

lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/SysMenu.java

@@ -60,6 +60,19 @@ public class SysMenu implements Serializable {
      */
     private String title;
 
+    /**
+     * 菜单标题
+     */
+    private String zh_title;
+    /**
+     * 菜单标题
+     */
+    private String en_title;
+    /**
+     * 菜单标题
+     */
+    private String id_title;
+
     /**
      * 组件名称
      */

lms/nladmin-system/src/main/java/org/nl/system/service/menu/dto/MenuDto.java

@@ -40,6 +40,10 @@ public class MenuDto extends BaseDTO implements Serializable {
 
     private String title;
 
+    private String zh_title;
+    private String en_title;
+    private String id_title;
+
     private Integer menu_sort;
 
     private String path;
@@ -95,4 +99,22 @@ public class MenuDto extends BaseDTO implements Serializable {
     public int hashCode() {
         return Objects.hash(menu_id);
     }
+
+    public String getLocalTitle(String local){
+        String in = "in";
+        String en = "en";
+        String zh = "zh";
+
+
+        if (in.equals(local)){
+            return id_title;
+        }
+        if (en.equals(local)){
+            return en_title;
+        }
+        if (zh.equals(local)){
+            return zh_title;
+        }
+        return title;
+    }
 }

lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java

@@ -28,6 +28,7 @@ import org.nl.system.service.menu.dto.MenuDto;
 import org.nl.system.service.menu.dto.MenuQuery;
 import org.nl.wms.util.IdUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -226,6 +227,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         menu.setPid(resources.getPid());
         menu.setMenu_sort(resources.getMenu_sort());
         menu.setCache(resources.getCache());
+        menu.setEn_title(resources.getEn_title());
+        menu.setZh_title(resources.getZh_title());
+        menu.setId_title(resources.getId_title());
         menu.setHidden(resources.getHidden());
         menu.setComponent_name(resources.getComponent_name());
         menu.setPermission(resources.getPermission());
@@ -266,11 +270,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<MenuVo> buildMenus(List<MenuDto> menuDtos) {
         List<MenuVo> list = new LinkedList<>();
+        String lang = LocaleContextHolder.getLocale().getLanguage();
         menuDtos.forEach(menuDTO -> {
                     if (menuDTO != null) {
                         List<MenuDto> menuDtoList = menuDTO.getChildren();
                         MenuVo menuVo = new MenuVo();
-                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle());
+                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() :menuDTO.getLocalTitle(lang));
                         // 一级目录需要加斜杠，不然会报警告
                         menuVo.setPath(ObjectUtil.isEmpty(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath());
                         menuVo.setHidden(menuDTO.getHidden());
@@ -285,7 +290,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                                 menuVo.setComponent(menuDTO.getComponent());
                             }
                         }
-                        menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
+                        menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache()));
                         if (menuDtoList != null && menuDtoList.size() != 0) {
                             menuVo.setAlwaysShow(true);
                             menuVo.setRedirect("noredirect");
@@ -358,6 +363,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         if (ObjectUtil.isEmpty(entity)) {
             return menuDto;
         }
+        menuDto.setEn_title(entity.getEn_title());
+        menuDto.setId_title(entity.getId_title());
+        menuDto.setZh_title(entity.getZh_title());
         menuDto.setMenu_id(entity.getMenu_id());
         menuDto.setType(entity.getType());
         menuDto.setPermission(entity.getPermission());
@@ -404,12 +412,13 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<MenuVo> buildMenus(List<MenuDto> menuDtos, String pid) {
         List<MenuVo> list = new LinkedList<>();
+        String lang = LocaleContextHolder.getLocale().getLanguage();
         //剔除系统级菜单
         menuDtos.forEach(menuDTO -> {
                     if (menuDTO != null) {
                         List<MenuDto> menuDtoList = menuDTO.getChildren();
                         MenuVo menuVo = new MenuVo();
-                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle());
+                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getLocalTitle(lang));
                         // 一级目录需要加斜杠，不然会报警告
                         menuVo.setPath(pid.equals(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath());
                         menuVo.setHidden(menuDTO.getHidden());
@@ -424,7 +433,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                                 menuVo.setComponent(menuDTO.getComponent());
                             }
                         }
-                        menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
+                        menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache()));
                         if (menuDtoList != null && menuDtoList.size() != 0) {
                             menuVo.setAlwaysShow(true);
                             menuVo.setRedirect("noredirect");

lms/nladmin-system/src/main/resources/language/i18n/id.js

@@ -48,6 +48,11 @@ var config = {
         "load_text5": "Hanya dapat mengunggah satu file excel!"
     },
     "common": {
+        "enterNameOrDescriptionToSearch":"Masukkan nama atau deskripsi untuk pencarian",
+        "virtualStor": "Gudang Virtual",
+        "stor_type": "Tipe Gudang",
+        "storType": "Tipe Gudang",
+        "saveAndPrint": "Simpan dan cetak",
         "businessForceConfirm": "Konfirmasi Paksa Bisnis",
         "forceConfirm": "Konfirmasi Paksa",
         "jobTask": "Tugas Operasional",

lms/nladmin-system/src/main/resources/language/i18n/zh.js

@@ -48,6 +48,13 @@ var config = {
         "load_text5": "只能上传一个excel文件！"
     },
     "common": {
+        "enterNameOrDescriptionToSearch":"输入名称或者描述搜索",
+        "virtualStor": "虚拟仓",
+        "stor_type": "仓库类型",
+        "storType": "仓库类型",
+        "saveAndPrint": "保存并打印",
+        "cancel":"取消",
+        "confirm":"确认",
         "businessForceConfirm":"业务强制确认",
         "forceConfirm": "强制确认",
         "jobTask":"作业任务",
@@ -313,7 +320,7 @@ var config = {
         "inventoryChange": "库存变更",
         "changePerson": "变更人",
         "changeDate": "变更日期",
-        "taskDistribution": "任务下发"
+        "taskDistribution": "任务下发",
         "code_name": "输入账号或名称",
         "fuzzy_search": "模糊搜索",
 
@@ -4181,6 +4188,7 @@ var config = {
                     "isSecondLashing": "是否二次捆扎"
                 },
                 "boxInfo": {
+                    "vehicleTypePlaceholder": "请选择载具类型",
                     "boxInfo": "木箱信息",
                     "boxNo": "木箱号",
                     "boxSpec": "木箱规格",

lms/nladmin-ui/src/components/Crud/RR.operation.vue

@@ -5,9 +5,9 @@
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
     -->
     <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
-      <i class="el-icon-search el-icon--left" />查询
+      <i class="el-icon-search el-icon--left" />  {{ $t('common.Query') }}
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">重置</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">  {{ $t('common.Reset') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 

lms/nladmin-ui/src/components/Crud/UD.operation.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">修改</el-button>
+    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)"> {{ $t('common.Update') }}</el-button>
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="doCancel">取消</el-button>
+        <el-button size="mini" type="text" @click="doCancel"> {{ $t('common.Cancel') }}</el-button>
-        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
+        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)"> {{ $t('common.Confirm') }}</el-button>
       </div>
-      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">删除</el-button>
+      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete"> {{ $t('common.Delete') }}</el-button>
     </el-popover>
 
   </div>

lms/nladmin-ui/src/layout/components/Navbar.vue

@@ -54,7 +54,6 @@
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
           <el-dropdown-item divided command="en">English</el-dropdown-item>
-          <el-dropdown-item divided command="iv">Vietnamese</el-dropdown-item>
           <el-dropdown-item divided command="id">Indonesian</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -145,8 +144,6 @@ export default {
         this.language = 'English'
       } else if (command === 'zh') {
         this.language = '简体中文'
-      } else if (command === 'iv') {
-        this.language = 'Vietnamese'
       } else if (command === 'id') {
         this.language = 'Indonesian'
       }

lms/nladmin-ui/src/utils/request.js

@@ -21,6 +21,7 @@ service.interceptors.request.use(
       config.headers['Authorization'] = 'Bearer ' + getToken()
     }
     config.headers['Content-Type'] = 'application/json'
+    config.headers['Accept-Language'] = window.localStorage.getItem('lang')
     return config
   },
   error => {

lms/nladmin-ui/src/views/login.vue

@@ -36,7 +36,6 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
               <el-dropdown-item divided command="en">English</el-dropdown-item>
-              <el-dropdown-item divided command="iv">Vietnamese</el-dropdown-item>
               <el-dropdown-item divided command="id">Indonesian</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -136,8 +135,6 @@ export default {
         this.language = 'English'
       } else if (command === 'zh') {
         this.language = '简体中文'
-      } else if (command === 'iv') {
-        this.language = 'Vietnamese'
       } else if (command === 'id') {
         this.language = 'Indonesian'
       }

lms/nladmin-ui/src/views/system/menu/index.vue

@@ -92,6 +92,27 @@
             :placeholder="$t('sys_menu.title')"
           />
         </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '2'" :label="$t('menu.zh_title')" prop="zh_title">
+          <el-input
+            v-model="form.zh_title"
+            :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
+            :placeholder="$t('menu.zh_title')"
+          />
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '2'" :label="$t('menu.en_title')" prop="en_title">
+          <el-input
+            v-model="form.en_title"
+            :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
+            :placeholder="$t('menu.en_title')"
+          />
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '2'" :label="$t('menu.id_title')" prop="id_title">
+          <el-input
+            v-model="form.id_title"
+            :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
+            :placeholder="$t('menu.id_title')"
+          />
+        </el-form-item>
         <el-form-item v-if="form.type.toString() === '2'" :label="$t('sys_menu.button_name')" prop="title">
           <el-input v-model="form.title" :placeholder="$t('sys_menu.button_name')" style="width: 190px;" />
         </el-form-item>
@@ -222,6 +243,9 @@ import Dict from '../../../components/Dict/Dict'
 const defaultForm = {
   menu_id: null,
   title: null,
+  en_title: null,
+  id_title: null,
+  zh_title: null,
   menu_sort: 999,
   path: null,
   system_type: null,
@@ -259,6 +283,15 @@ export default {
         title: [
           { required: true, message: '请输入标题', trigger: 'blur' }
         ],
+        zh_title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
+        en_title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
+        id_title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
         path: [
           { required: true, message: '请输入地址', trigger: 'blur' }
         ]

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

@@ -67,7 +67,7 @@
           <el-form-item :label="$t('wms.basedata.master.class.topCategory')">
             <el-radio-group v-model="form.isTop" style="width: 140px">
               <el-radio label="1">{{ $t('common.yes') }}</el-radio>
-              <el-radio label="0">{{ $t('common.no') }}</el-radio>
+              <el-radio label="0">{{ $t('common.No') }}</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" :label="$t('wms.basedata.master.class.parentCategory')" prop="pid">
@@ -81,8 +81,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -246,7 +246,7 @@ export default {
       if (row.is_modify === '1') {
         return this.$t('common.yes')
       } else {
-        return this.$t('common.no')
+        return this.$t('common.No')
       }
     },
     dataTypeChange(data) {

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

@@ -95,8 +95,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->

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

@@ -63,7 +63,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('wms.basedata.master.interfaceback.isReturn')" prop="is_back">
                 <el-radio v-model="form.is_back" label="1">{{ $t('common.yes') }}</el-radio>
-                <el-radio v-model="form.is_back" label="0">{{ $t('common.no') }}</el-radio>
+                <el-radio v-model="form.is_back" label="0">{{ $t('common.No') }}</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -97,8 +97,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->

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

@@ -40,13 +40,13 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('common.isEnabled')" prop="is_active">
-            <el-radio v-model="form.is_active" label="0">{{ $t('common.no') }}</el-radio>
+            <el-radio v-model="form.is_active" label="0">{{ $t('common.No') }}</el-radio>
             <el-radio v-model="form.is_active" label="1">{{ $t('common.yes') }}</el-radio>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -130,8 +130,8 @@ export default {
     // 改变状态
     changeEnabled(data, val) {
       this.$confirm(this.$t('wms.basedata.master.sales.confirmOperation', { status: this.dict.label.is_used[val], code: data.sales_code }), this.$t('common.prompt'), {
-        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudSales.edit(data).then(res => {

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

@@ -165,8 +165,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -305,8 +305,8 @@ export default {
     // 改变状态
     changeEnabled(data, val) {
       this.$confirm(this.$t('wms.basedata.master.transport.confirmOperation', { status: this.dict.label.is_used[val], name: data.unit_name }), this.$t('common.prompt'), {
-        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudTransportationbase.edit(data).then(res => {

lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue

@@ -8,7 +8,7 @@
           v-model="query.blurry"
           size="mini"
           clearable
-          :placeholder="$t('wms.basedata.product.userArea.searchPlaceholder')"
+          :placeholder="$t('common.enterNameOrDescriptionToSearch')"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"

lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue

@@ -113,7 +113,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item :label="$t('wms.basedata.st.boxInfo.vehicleType') + ':'" prop="vehicle_type">
-                <el-select v-model="form.vehicle_type" :placeholder="$t('wms.basedata.st.boxInfo.vehicleTypePlaceholder')" clearable style="width: 200px;">
+                <el-select v-model="form.vehicle_type" :placeholder="$t('wms.basedata.master.st.boxInfo.vehicleTypePlaceholder')" clearable style="width: 200px;">
                   <el-option
                     v-for="item in vehicleTypeList"
                     :key="item.value"
@@ -157,7 +157,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
           <el-button type="text" :loading="crud.cu === 2" @click="crud.submitCU">{{ $t('common.save') }}</el-button>
           <el-button :loading="crud.cu === 2" type="primary" @click="savePrint">{{ $t('common.saveAndPrint') }}</el-button>
         </div>

lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue

@@ -118,20 +118,20 @@
             <el-col :span="12">
               <el-form-item :label="$t('wms.basedata.st.boxType.isFirstLashing') + ':'" prop="need_lash_one">
                 <el-radio v-model="form.need_lash_one" label="1" style="width: 79px;" border>{{ $t('common.yes') }}</el-radio>
-                <el-radio v-model="form.need_lash_one" label="0" style="width: 79px;" border>{{ $t('common.no') }}</el-radio>
+                <el-radio v-model="form.need_lash_one" label="0" style="width: 79px;" border>{{ $t('common.No') }}</el-radio>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('wms.basedata.st.boxType.isSecondLashing') + ':'" prop="need_lash_two">
                 <el-radio v-model="form.need_lash_two" label="1" style="width: 79px;" border>{{ $t('common.yes') }}</el-radio>
-                <el-radio v-model="form.need_lash_two" label="0" style="width: 79px;" border>{{ $t('common.no') }}</el-radio>
+                <el-radio v-model="form.need_lash_two" label="0" style="width: 79px;" border>{{ $t('common.No') }}</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -155,12 +155,12 @@
             </el-col>
             <el-col :span="4">
               <span>
-                <el-button icon="el-icon-close" size="mini" type="info" @click="dialogVisible2 = false">{{ $t('common.cancel') }}</el-button>
+                <el-button icon="el-icon-close" size="mini" type="info" @click="dialogVisible2 = false">{{ $t('common.Cancel') }}</el-button>
               </span>
             </el-col>
             <el-col :span="4">
               <span>
-                <el-button icon="el-icon-check" size="mini" type="primary" @click="confirmUpdate()">{{ $t('common.confirm') }}</el-button>
+                <el-button icon="el-icon-check" size="mini" type="primary" @click="confirmUpdate()">{{ $t('common.Confirm') }}</el-button>
               </span>
             </el-col>
           </el-row>

lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue

@@ -120,8 +120,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -303,8 +303,8 @@ export default {
         msg = this.$t('wms.basedata.st.sect.confirmEnable')
       }
       this.$confirm(msg, this.$t('common.prompt'), {
-        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudSectattr.changeActive(data).then(res => {

lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue

@@ -95,7 +95,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-form-item :label="$t('wms.basedata.st.stor.storType')" required>
+            <el-form-item :label="$t('common.storType')" required>
               <el-col :span="4" />
               <el-col :span="4">
                 <el-checkbox v-model="form.is_materialstore" true-label="1" false-label="0">{{ $t('wms.basedata.st.stor.rawMaterialStor') }}</el-checkbox>
@@ -110,7 +110,7 @@
                 <el-checkbox v-model="form.is_attachment" true-label="1" false-label="0">{{ $t('wms.basedata.st.stor.sparePartStor') }}</el-checkbox>
               </el-col>
               <el-col :span="4">
-                <el-checkbox v-model="form.is_virtualstore" true-label="1" false-label="0">{{ $t('wms.basedata.st.stor.virtualStor') }}</el-checkbox>
+                <el-checkbox v-model="form.is_virtualstore" true-label="1" false-label="0">{{ $t('common.virtualStor') }}</el-checkbox>
               </el-col>
             </el-form-item>
 
@@ -125,8 +125,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -328,13 +328,13 @@ export default {
       return is_used === '1'
     },
     changeEnabled(data, val) {
-      let msg = $t('wms.basedata.st.stor.operationWillDisableContinue')
+      let msg = this.$t('wms.basedata.st.stor.operationWillDisableContinue')
       if (val !== '1') {
-        msg = $t('wms.basedata.st.stor.operationWillEnableContinue')
+        msg = this.$t('wms.basedata.st.stor.operationWillEnableContinue')
       }
-      this.$confirm(msg, $t('common.tip'), {
+      this.$confirm(msg, this.$t('common.tip'), {
-        confirmButtonText: $t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: $t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudStorattr.changeActive(data).then(res => {

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -284,13 +284,13 @@
             <el-col :span="8">
               <el-form-item :label="$t('wms.basedata.st.struct.isTemporary')" prop="is_tempstruct">
                 <el-radio v-model="form.is_tempstruct" label="1">{{ $t('common.yes') }}</el-radio>
-                <el-radio v-model="form.is_tempstruct" label="0">{{ $t('common.no') }}</el-radio>
+                <el-radio v-model="form.is_tempstruct" label="0">{{ $t('common.No') }}</el-radio>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('wms.basedata.st.struct.isEmptyVehicle')" prop="is_emptyvehicle">
                 <el-radio v-model="form.is_emptyvehicle" label="1">{{ $t('common.yes') }}</el-radio>
-                <el-radio v-model="form.is_emptyvehicle" label="0">{{ $t('common.no') }}</el-radio>
+                <el-radio v-model="form.is_emptyvehicle" label="0">{{ $t('common.No') }}</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -592,9 +592,9 @@ export default {
       if (val !== '1') {
         msg = '此操作将启用，是否继续！'
       }
-      this.$confirm(msg, $t('common.tip'), {
+      this.$confirm(msg, this.$t('common.tip'), {
-        confirmButtonText: $t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: $t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudStructattr.changeActive(data).then(res => {

lms/nladmin-ui/src/views/wms/mps/device/index.vue

@@ -126,8 +126,8 @@ export default {
         msg = this.$t('wms.mps.device.confirmEnable')
       }
       this.$confirm(msg, this.$t('common.tip'), {
-        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         crudDevice.changeActive(data).then(res => {

lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue

@@ -239,8 +239,8 @@
 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.cancel') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -484,17 +484,17 @@ export default {
       mstrow: {},
       updowns: [{
         value: '1',
-        label: $t('wms.pdm.order.slittingplan.upAxis')
+        label: this.$t('wms.pdm.order.slittingplan.upAxis')
       }, {
         value: '2',
-        label: $t('wms.pdm.order.slittingplan.downAxis')
+        label: this.$t('wms.pdm.order.slittingplan.downAxis')
       }],
       leftorrights: [{
         value: '1',
-        label: $t('wms.pdm.order.slittingplan.leftRoll')
+        label: this.$t('wms.pdm.order.slittingplan.leftRoll')
       }, {
         value: '2',
-        label: $t('wms.pdm.order.slittingplan.rightRoll')
+        label: this.$t('wms.pdm.order.slittingplan.rightRoll')
       }],
       materType: '',
       customType: '',

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -441,8 +441,8 @@ export default {
         msg = this.$t('common.confirmEnable')
       }
       this.$confirm(msg, this.$t('common.tip'), {
-        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         changeActive(data).then(res => {