Merge branch 'lang_dev_jw' into lang_dev

src/lang/commonLang.js

@@ -176,6 +176,10 @@ export default {
       en: "categories",
       zh: "分类",
     },
+    all_select:{
+      en:'Select All',
+      zh:'全选'
+    }
   },
   Edb,
   Chart

src/lang/modules/systemManage/EnAuthSet.js

@@ -0,0 +1,23 @@
+/**
+ * 系统设置-英文权限配置
+ */
+
+/* 英文 */
+export const EnAuthSetEn = {
+    title:'English Permission List',
+    tips:'Deleting only removes English permissions for this user',
+    enable:'Disabled',
+    opened:'Enabled'
+};
+  
+/* 中文 */
+export const EnAuthSetZh = {
+    title:'英文权限列表',
+    tips:'删除操作仅删除该用户的英文权限',
+    enable:'已禁用',
+    opened:'已启用'
+};
+  
+/**
+* $t('SystemManage.EnAuthSet.XXX')
+*/

src/lang/modules/systemManage/indexEn.js

@@ -2,6 +2,7 @@ import { DepartManageEn } from "./DepartManage";
 import { RoleManageEn } from "./RoleManage";
 import { OperateAuthEn } from "./OperateAuth";
 import {DataAuthEn} from './DataAuth'
+import {EnAuthSetEn} from './EnAuthSet'
 
 export default {
   // 系统设置
@@ -9,7 +10,8 @@ export default {
     DepartManage: DepartManageEn,
     RoleManage: RoleManageEn,
     OperateAuth:OperateAuthEn,
-    DataAuth:DataAuthEn
+    DataAuth:DataAuthEn,
+    EnAuthSet:EnAuthSetEn
   },
 };
 

src/lang/modules/systemManage/indexZh.js

@@ -2,6 +2,7 @@ import { DepartManageZh } from "./DepartManage";
 import { RoleManageZh } from "./RoleManage";
 import { OperateAuthZh } from "./OperateAuth";
 import {DataAuthZh} from './DataAuth'
+import {EnAuthSetZh} from './EnAuthSet'
 
 export default {
   // 系统设置
@@ -9,6 +10,7 @@ export default {
     DepartManage: DepartManageZh,
     RoleManage: RoleManageZh,
     OperateAuth:OperateAuthZh,
-    DataAuth:DataAuthZh
+    DataAuth:DataAuthZh,
+    EnAuthSet:EnAuthSetZh
   },
 };

src/views/system_manage/enAuthManage.vue

@@ -4,7 +4,7 @@
       <div class="select">
         <el-cascader
           v-model="users"
-          placeholder="请选择用户"
+          :placeholder="$t('SystemManage.DataAuth.msg01')"
           :options="options"
           :props="props"
           collapse-tags
@@ -18,7 +18,7 @@
           type="primary"
           style="margin-left: 20px"
           @click="addAdmins"
-          >确 定</el-button
+          >{{$t('Dialog.confirm_btn')}}</el-button
         >
       </div>
       <div class="result-list">
@@ -30,7 +30,7 @@
     </div>
     <div class="operations-table">
       <div class="table-title">
-        <span>英文权限列表</span>
+        <span>{{$t('SystemManage.EnAuthSet.title')}}</span>
       </div>
       <el-table :data="tableData" border v-loading="isShowloadding">
         <el-table-column
@@ -43,7 +43,7 @@
         >
           <template slot-scope="{ row }">
             <span v-if="item.key === 'Enabled'">
-              {{ row[item.key] === 0 ? "已禁用" : "已启用" }}
+              {{ row[item.key] === 0 ? $t('SystemManage.EnAuthSet.enable') : $t('SystemManage.EnAuthSet.opened')  }}
             </span>
             <div v-else-if="item.key === 'RealName'">
               <el-tag
@@ -57,14 +57,14 @@
                 style="position: absolute; left: 10px"
                 >{{
                   row.LabelVal == 1
-                    ? "超管"
+                    ? $t('SystemManage.DepartManage.use_tag01')
                     : row.LabelVal == 2
-                    ? "管理员"
+                    ? $t('SystemManage.DepartManage.use_tag02')
                     : row.LabelVal == 3
-                    ? "部门经理"
+                    ? $t('SystemManage.DepartManage.use_tag03')
                     : row.LabelVal == 4
-                    ? "组长"
-                    : "主管"
+                    ? $t('SystemManage.DepartManage.use_tag04')
+                    : $t('SystemManage.DepartManage.use_tag05')
                 }}</el-tag
               >
               <span style="position: relative">{{ row.RealName }}</span>
@@ -72,13 +72,13 @@
             <span v-else>{{ row[item.key] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column :label="$t('Table.column_operations')" align="center">
           <template slot="header" slot-scope="{}">
-            <span>操作</span>
+            <span>{{$t('Table.column_operations')}}</span>
             <el-tooltip
               effect="dark"
               placement="top-start"
-              content="删除操作仅删除该用户的英文权限"
+              :content="$t('SystemManage.EnAuthSet.tips')"
             >
               <i class="el-icon-question" />
             </el-tooltip>
@@ -87,16 +87,16 @@
             <span v-permission="permissionBtn.sysDepartPermission.enAuthManage_settingAuth"
               @click="setAuth(row)"
               style="cursor: pointer; color:#409eff;margin-right: 5px;"
-            >设置权限</span>
+            >{{$t('SystemManage.RoleManage.set_permission')}}</span>
             <span v-permission="permissionBtn.sysDepartPermission.enAuthManage_del"
               @click="handleDeleteAuth(row)"
               style="cursor: pointer; color: #d1433a"
-              >删除</span
+              >{{$t('Table.delete_btn')}}</span
             >
           </template>
         </el-table-column>
         <div slot="empty" style="lineheight: 44px; margin: 60px 0; color: #999">
-          <tableNoData text="暂无数据" size="mini"/>
+          <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
         </div>
       </el-table>
       <el-pagination
@@ -117,24 +117,24 @@
       :modal-append-to-body	="false"
       :visible.sync="setAuthData.show" 
       width="689px" 
-      title="设置权限"
+      :title="$t('SystemManage.RoleManage.set_permission')"
     >
       <div class="dialog-content-wrap">
         <div class="user-info">
-          <span>姓名：{{setAuthData.RealName}}</span>
-          <span>角色：{{setAuthData.RoleName}}</span>
-          <span>部门/组织：{{setAuthData.DepartmentGroup}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_name')}}：{{setAuthData.RealName}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_role')}}：{{setAuthData.RoleName}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_depart')}}：{{setAuthData.DepartmentGroup}}</span>
         </div>
         <div class="select-list">
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{$t('Common.all_select')}}</el-checkbox>
             <el-checkbox-group v-model="setAuthData.selectList" @change="handleCheckedChange">
               <el-checkbox v-for="auth in authOptions" :label="auth.code" :key="auth.code" >{{auth.label}}</el-checkbox>
             </el-checkbox-group>
         </div>
       </div>
       <div slot="footer" class="foot-container">
-        <el-button type="primary" @click="saveChange">确 定</el-button>
-        <el-button @click="setAuthData.show=false">取 消</el-button>
+        <el-button type="primary" @click="saveChange">{{$t('Dialog.confirm_btn')}}</el-button>
+        <el-button @click="setAuthData.show=false">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -143,33 +143,60 @@
 <script>
 import { departInterence,enAuthInterence } from "@/api/api.js";
 export default {
-  data() {
-    return {
-      users: "",
-      selectList: [],
-      tableColumns: [
+  computed:{
+    tableColumns(){
+      return [
         {
-          label: "姓名",
+          label: this.$t('SystemManage.DepartManage.user_table_name'),
           key: "RealName",
           width:"200"
         },
         {
-          label: "手机号",
+          label: this.$t('SystemManage.DepartManage.user_table_mobile'),
           key: "Mobile",
         },
         {
-          label: "角色",
+          label: this.$t('SystemManage.DepartManage.user_table_role'),
           key: "RoleName",
         },
         {
-          label: "部门/分组",
+          label: this.$t('SystemManage.DepartManage.user_table_depart'),
           key: "DepartmentGroup",
         },
         {
-          label: "状态",
+          label: this.$t('SystemManage.DepartManage.user_table_status'),
           key: "Enabled",
         },
-      ],
+      ]
+    }
+  },
+  data() {
+    return {
+      users: "",
+      selectList: [],
+      // tableColumns: [
+      //   {
+      //     label: "姓名",
+      //     key: "RealName",
+      //     width:"200"
+      //   },
+      //   {
+      //     label: "手机号",
+      //     key: "Mobile",
+      //   },
+      //   {
+      //     label: "角色",
+      //     key: "RoleName",
+      //   },
+      //   {
+      //     label: "部门/分组",
+      //     key: "DepartmentGroup",
+      //   },
+      //   {
+      //     label: "状态",
+      //     key: "Enabled",
+      //   },
+      // ],
       options: [],
       props: {
         value: "AdminId",