[update]系统管理-双语处理；角色授权树形结构增加英文字段

src/common/lang/en-us.js

@@ -20,7 +20,7 @@ module.exports = {
   delete: 'Delete',
   more: 'More',
   areYouSure: 'Confirm to delete?',
-  details: 'Details',
+  details: 'View',
   serialNumber: 'No.',
   operation: 'Operation',
   confirm: 'Confirm',
@@ -33,12 +33,12 @@ module.exports = {
   batchDelete: 'Delete in Batch',
   total: 'Total',
   strip: 'Items',
-  createTime: 'Time of Creation',
+  createTime: 'Creation Time',
   selectARecord: 'Please select a record!',
   confirmDeletion: 'Confirm Deletion',
   deleteAData: 'Delete Selected Data?',
   description: 'Description',
-  enable: 'Enable',
+  enable: ' Enable',
   disable: 'Disabled',
   normal: 'Normal',
   startTime: 'Start Time',
@@ -286,7 +286,7 @@ module.exports = {
     confirmPassword: 'Confirm Password',
     reenterLoginPassword: 'Please re-enter your login password',
     roleAssignment: 'Role Assignment',
-    departmentAllocation: 'Department Allocation',
+    departmentAllocation: 'Department',
     identity: 'Identity',
     ordinaryUsers: 'Ordinary Users',
     superior: 'Superior',
@@ -364,8 +364,8 @@ module.exports = {
   roleManage: {
     roleName: 'Role Name',
     newRole: 'Create New Role',
-    userBtn: 'Users',
-    toGrantAuthorization: 'Authorized',
+    userBtn: 'User(s)',
+    toGrantAuthorization: 'Authorization',
     newUser: 'New User',
     existingUsers: 'Existing Users',
     roleCode: 'Role Code',
@@ -380,7 +380,8 @@ module.exports = {
     youHavePermissions: 'The permissions you have',
     saveOnly: 'Save Only',
     saveAndClose: 'Save And Close',
-    rolePermissionConfig: 'Role Permission Configuration'
+    rolePermissionConfig: 'Role Permission Configuration',
+    addUser: 'Add User(s)'
   },
   // 数据字典列表、新增编辑
   dict: {

src/common/lang/system/en.js

@@ -2,57 +2,57 @@
 module.exports = {
   // 标签管理
   tag: {
-    tagItemManagement: '标签项管理',
-    labelContentManagement: '标签内容管理',
-    attributeName: '属性名称',
-    attributeNameEnglish: '英文名称',
-    fieldName: '字段名称',
-    attributeType: '属性类型',
-    fieldLength: '字段长度',
-    displayOrder: '展示顺序',
-    showArea: '展示区域',
-    exhibitionAreaManagement: '展示区域管理',
-    labelName: '标签名称',
-    labelType: '标签类型',
-    essentialInformation: '基本信息',
+    tagItemManagement: 'Tag Item Management', // '标签项管理'
+    labelContentManagement: ' Tag Content Management', // '标签内容管理'
+    attributeName: 'Attribute Name',
+    attributeNameEnglish: 'English Name',
+    fieldName: 'Field Name',
+    attributeType: 'Attribute Type',
+    fieldLength: 'Field Length',
+    displayOrder: 'Display Order',
+    showArea: 'Display Area',
+    exhibitionAreaManagement: 'Display Area Management', // '展示区域管理'
+    labelName: 'Tag Name',
+    labelType: 'Tag Type',
+    essentialInformation: 'Basis',
     domesticLaws: '国内法规',
     foreignStandards: '海外标准',
-    foreignStandardRegulations: '外来标准法规',
-    enterpriseStandards: '企业标准',
-    clauseSplitting: '条款拆分',
+    foreignStandardRegulations: 'External Standard and Regulation',
+    enterpriseStandards: 'Enterprise Standard',
+    clauseSplitting: 'Regulation Split',
     // 新增模态框中字段
-    module: '所属模块',
-    required: '是否必填',
-    optionContent: '选项内容',
-    documentLibraryModuleDisplay: '文档库模块展示',
-    documentLibraryListDisplay: '文档库列表展示',
-    selectWhetherDisplayList: '请选择是否文档库列表展示',
-    isShowDetail: '详情页展示',
-    isShowDetailMessage: '请选择是否详情页展示',
-    isShowAddForm: '新增是否展示',
-    isShowAddFormMessage: '请选择是否新增表单显示',
-    search: '是否搜索',
-    isSort: '是否排序',
-    displayOtherModules: '其它模块展示',
+    module: 'Module',
+    required: 'Required',
+    optionContent: 'Option Content',
+    documentLibraryModuleDisplay: ' Texts Library Exist',
+    documentLibraryListDisplay: ' Texts Library List Exist',
+    selectWhetherDisplayList: 'please select whether to display on the Texts Library List',
+    isShowDetail: 'Details Exist',
+    isShowDetailMessage: 'Please select whether to display on the details',
+    isShowAddForm: 'Add Exist',
+    isShowAddFormMessage: 'Please select whether to display on the add form',
+    search: 'Searchable',
+    isSort: 'Sortable',
+    displayOtherModules: 'Other Modules',
     regulationsListDisplay: '法规清单展示',
     selectDisplayListRegulations: '请选择法规清单是否展示',
-    searchCenterDisplay: '搜索中心展示',
-    selectSearchCenterDisplayed: '请选择搜索中心是否展示',
-    selectWhetherRequired: '请选择是否必填',
-    describe: '描述',
-    dictionaryConfiguration: '字典配置',
-    documentSplitDisplay: '文档拆分模块展示',
-    documentSplitList: '文档拆分列表展示',
-    selectSplitListDisplay: '请选择是否文档拆分列表展示',
+    searchCenterDisplay: ' Search Exist',
+    selectSearchCenterDisplayed: 'Please select whether to display on the Search',
+    selectWhetherRequired: 'Please select whether to required',
+    describe: 'Description',
+    dictionaryConfiguration: 'Dictionary Configuration',
+    documentSplitDisplay: 'Regulation Split Exist',
+    documentSplitList: 'Regulation Split List Exist',
+    selectSplitListDisplay: 'Please select whether to display on the Regulation Split',
     // 标签项内容管理
-    labelItemName: '标签名称',
+    labelItemName: 'Tag Name',
     //  字段列表
-    name: '名称',
-    dataValue: '数据值',
-    parentName: '父级名称',
-    select: '下拉选择',
-    tree: '树形结构',
-    pleaseEnterYourEnglishName: '请输入英文字段名称'
+    name: 'Name',
+    dataValue: 'Value',
+    parentName: 'Parent Name',
+    select: 'select',
+    tree: 'Tree',
+    pleaseEnterYourEnglishName: 'Please input english name'
   },
   // 内部工作组
   internalWorkGroup: {
@@ -77,15 +77,15 @@ module.exports = {
   },
   // 友情链接管理
   friendshipLink: {
-    name: 'Link Name',
+    name: 'Blogroll Name',
     shelfStatus: 'Shelf Status',
-    linkName: 'Link Name',
-    link: 'Link',
+    linkName: 'Blogroll Name',
+    link: 'Blogroll',
     isShelf: 'Shelf Or Not',
     sort: 'Sort',
-    shelfWarn: 'the link is empty please fill in the link first',
-    maxLinksReached: 'The current link listing limit has been reached!',
-    logo: 'LOGO'
+    shelfWarn: 'the blogroll is empty please fill in the link first',
+    maxLinksReached: 'The current blogroll listing limit has been reached!',
+    logo: 'Logo'
   },
   // 联络人管理
   contact: {

src/common/lang/zh-cn.js

@@ -408,7 +408,8 @@ module.exports = {
     youHavePermissions: '所拥有的权限',
     saveOnly: '仅保存',
     saveAndClose: '保存并关闭',
-    rolePermissionConfig: '角色权限配置'
+    rolePermissionConfig: '角色权限配置',
+    addUser: '添加已有用户'
   },
   // 数据字典列表、新增编辑
   dict: {

src/views/system/modules/SelectUserModal.vue

@@ -8,7 +8,7 @@
       switchFullscreen
       @ok="handleOk"
       @cancel="handleCancel"
-      cancelText="关闭">
+      :cancelText="$t('close')">
 
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
@@ -16,19 +16,19 @@
           <a-row :gutter="24">
 
             <a-col :span="8">
-              <a-form-item label="用户账号">
-                <j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
+              <a-form-item :label="$t('user.userAccount')">
+                <j-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam.username"></j-input>
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item label="用户名称">
-                <j-input placeholder="请输入用户名称" v-model="queryParam.realname"></j-input>
+              <a-form-item :label="$t('user.userName')">
+                <j-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="queryParam.realname"></j-input>
               </a-form-item>
             </a-col>
             <a-col :span="8">
                     <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                      <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
+                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
                     </span>
             </a-col>
 
@@ -65,7 +65,7 @@ export default {
   name: 'SelectUserModal',
   data () {
     return {
-      title: '添加已有用户',
+      title: this.$t('roleManage.addUser'),
       names: [],
       visible: false,
       placement: 'right',
@@ -75,7 +75,7 @@ export default {
       // 表头
       columns1: [
         {
-          title: '序号',
+          title: this.$t('serialNumber'),
           dataIndex: '',
           key: 'rowIndex',
           width: 50,
@@ -85,31 +85,31 @@ export default {
           }
         },
         {
-          title: '用户账号',
+          title: this.$t('user.userAccount'),
           align: 'center',
           width: 100,
           dataIndex: 'username'
         },
         {
-          title: '用户名称',
+          title: this.$t('user.userName'),
           align: 'center',
           width: 100,
           dataIndex: 'realname'
         },
         {
-          title: '性别',
+          title: this.$t('user.gender'),
           align: 'center',
           width: 100,
           dataIndex: 'sex_dictText'
         },
         {
-          title: '电话',
+          title: this.$t('phoneNumber'),
           align: 'center',
           width: 100,
           dataIndex: 'phone'
         },
         {
-          title: '部门',
+          title: this.$t('organization'),
           align: 'center',
           width: 150,
           dataIndex: 'orgCodeTxt'

src/views/system/modules/UserModal.vue

@@ -118,18 +118,18 @@
           </a-form-model-item>
           <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
           <!--手写章，用于企标制修订流程最后一个节点在线编辑的手写章信息维护-->
-          <a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-image-upload class="avatar-uploader"
-                            :text="$t('upload')"
-                            v-model="model.avatar"
-                            :disabled="disableSubmit"
-                            :number=1
-                            accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
-          </a-form-model-item>
+          <!--<a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--  <j-image-upload class="avatar-uploader"-->
+          <!--                  :text="$t('upload')"-->
+          <!--                  v-model="model.avatar"-->
+          <!--                  :disabled="disableSubmit"-->
+          <!--                  :number=1-->
+          <!--                  accept='.png,.PNG,.jpg,.JPG'></j-image-upload>-->
+          <!--</a-form-model-item>-->
 
           <a-form-model-item :label="$t('user.gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select v-model="model.sex"
-                      :placeholder="$t('pleaseSelect') + $t('user.gender')"
+                      :placeholder="disableSubmit ? '' : $t('pleaseSelect') + $t('user.gender')"
                       :getPopupContainer="(target) => target.parentNode"
                       :disabled="disableSubmit">
               <a-select-option :value="1">{{ $t('user.male') }}</a-select-option>
@@ -138,14 +138,14 @@
           </a-form-model-item>
 
           <a-form-model-item :label="$t('user.mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-            <a-input :placeholder="$t('pleaseEnter') + $t('user.mailbox')"
+            <a-input :placeholder="disableSubmit || !!model.id ? '' : $t('pleaseEnter') + $t('user.mailbox')"
                      v-model="model.email"
                      :maxLength="50"
                      :disabled="disableSubmit || !!model.id" />
           </a-form-model-item>
 
           <a-form-model-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-            <a-input :placeholder="$t('pleaseEnter') + $t('phoneNumber')"
+            <a-input :placeholder="isDisabledAuth('user:form:phone') || disableSubmit || !!model.id ? '' : $t('pleaseEnter') + $t('phoneNumber')"
                      :disabled="isDisabledAuth('user:form:phone') || disableSubmit || !!model.id"
                      v-model="model.phone" />
           </a-form-model-item>

src/views/system/modules/UserRoleModal.vue

@@ -21,8 +21,8 @@
           :selectedKeys="selectedKeys"
           :expandedKeys="expandedKeysss"
           :checkStrictly="checkStrictly">
-          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag, dataRef}">
+           {{dataRef[showKey] || slotTitle}}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
           </span>
         </a-tree>
       </a-form-item>
@@ -69,7 +69,9 @@ export default {
       title: this.$t('roleManage.rolePermissionConfig'),
       visible: false,
       loading: false,
-      selectedKeys: []
+      selectedKeys: [],
+      // 树形结构显示的信息，处理双语
+      showKey: localStorage.language === 'en-us' ? 'slotTitleEn' : 'slotTitle'
     }
   },
   methods: {