merge dev

src/lang/modules/systemManage/RoleManage.js

@@ -0,0 +1,37 @@
+/**
+ * 系统设置-角色管理
+ */
+
+/* 英文 */
+export const RoleManageEn = {
+    role_add_btn:'Add Role',
+    role_edit_btn:'Edit Role',
+    role_name:'Role',
+    serial_num:'Serial Number',
+    role_type:'Role Type',
+    set_permission:'Set Permissions',
+    search_placeholder:'Role Search',
+    no_role_data:'No Roles Available',
+    input_role_placeholder:'Please Input Role Name',
+    select_role_placeholder:'Please Select Role Type',
+    delete_role_msg:'Are you sure you want to delete this role?',
+};
+  
+/* 中文 */
+export const RoleManageZh = {
+    role_add_btn:'添加角色',
+    role_edit_btn:'编辑角色',
+    role_name:'角色',
+    serial_num:'序号',
+    role_type:'角色类型',
+    set_permission:'设置权限 ',
+    search_placeholder:'Role Search',
+    no_role_data:'暂无角色',
+    input_role_placeholder:'请填写角色名称',
+    select_role_placeholder:'选择角色类型',
+    delete_role_msg:'是否确认删除该角色?',
+};
+  
+/**
+* $t('SystemManage.RoleManage.XXX')
+*/

src/main.js

@@ -14,7 +14,7 @@ import "@/utils/buttonPermission.js";
 import { dataBaseInterface } from '@/api/api.js';
 import { mixins } from "@/mixins";
 import VueI18n from 'vue-i18n';
-import messages from './lang/index';
+import messagesLocal from './lang/index';
 import langEN from 'element-ui/lib/locale/lang/en'
 import langZH from 'element-ui/lib/locale/lang/zh-CN'
 import locale from 'element-ui/lib/locale'
@@ -23,7 +23,16 @@ Vue.mixin(mixins);
 Vue.use(VueI18n);
 const i18n = new VueI18n({
   locale: localStorage.getItem('i18n')||'zh', // 默认语言
-  messages,
+  messages:{
+    zh:{
+      ...langZH,
+      ...messagesLocal.zh,
+    },
+    en:{
+      ...langEN,
+      ...messagesLocal.en
+    }
+  },
   // 隐藏警告
   silentTranslationWarn: true
 });
@@ -32,7 +41,8 @@ Vue.use(VueRouter);
 Vue.use(Vuex);
 
 // 设置element语言
-locale.use(localStorage.getItem('i18n')!='zh' ?  langEN:langZH )
+// locale.use(localStorage.getItem('i18n')!='zh' ?  langEN:langZH )
+locale.i18n((key, value) => i18n.t(key, value))
 
 import{endCalc,optionTimeCalc,init}from'@/utils/TimeOnPage.js';
 

src/views/Home.vue

@@ -919,7 +919,6 @@ export default {
     // 中英文的切换
     langChangeHandler(){
        this.$i18n.locale =  this.$i18n.locale == 'zh' ? 'en' : 'zh'
-       locale.use(this.$i18n.locale == 'zh' ? langZH : langEN)
        localStorage.setItem('i18n',this.$i18n.locale)
     },
   },

src/views/system_manage/roleManage.vue

@@ -3,12 +3,12 @@
 		<div class="role_cont_top">
 			<div>
 				<el-button v-permission="permissionBtn.sysDepartPermission.sysRole_addRole"
-					type="primary" @click="addRole" style="marginRight:14px;">添加角色</el-button>
+					type="primary" @click="addRole" style="marginRight:14px;">{{$t('SystemManage.RoleManage.role_add_btn')}}</el-button>
 				<!-- <el-button v-permission="permissionBtn.sysDepartPermission.sysRole_settingAuth"
 					type="primary" @click="setAuth">设置权限</el-button> -->
 			</div>
 			<el-input
-				placeholder="角色搜索"
+				:placeholder="$t('SystemManage.RoleManage.search_placeholder')"
 				v-model="search_txt"
 				@input="getTableList"
 				style="maxWidth:359px">
@@ -25,38 +25,38 @@
 			border>
 				<el-table-column
 				prop="no"
-				label="序号"
+				:label="$t('SystemManage.RoleManage.serial_num')"
 				align="center">
 					<template slot-scope="scope"> <span>{{scope.row.no}}</span> </template>
 				</el-table-column>
 				<el-table-column
 				prop="RoleName"
-				label="角色"
+				:label="$t('SystemManage.RoleManage.role_name')"
 				align="center">
 					<template slot-scope="scope"> <span>{{scope.row.RoleName}}</span> </template>
 				</el-table-column>
 				<el-table-column
 				prop="RoleType"
-				label="角色类型"
+				:label="$t('SystemManage.RoleManage.role_type')"
 				align="center">
 					<template slot-scope="scope"> <span>{{scope.row.RoleType}}</span> </template>
 				</el-table-column>
-				<el-table-column label="操作" align="center">
+				<el-table-column :label="$t('Table.column_operations')" align="center">
 					<template slot-scope="scope">
 						<div style="color:#4099ef; font-size:24px;">
 							<!-- <span v-permission="permissionBtn.sysDepartPermission.sysRole_settingAuth"
 								class="editsty" @click.stop="getAuthDetail(scope.row)" style="marginRight:20px;">查看权限</span> -->
 								<span v-permission="permissionBtn.sysDepartPermission.sysRole_settingAuth"
-									class="editsty" @click.stop="getAuthDetail(scope.row)" style="marginRight:20px;">设置权限</span>
+									class="editsty" @click.stop="getAuthDetail(scope.row)" style="marginRight:20px;">{{$t('SystemManage.RoleManage.set_permission')}}</span>
 							<span v-permission="permissionBtn.sysDepartPermission.sysRole_addRole"
-								class="editsty" @click.stop="editRole(scope.row)" style="marginRight:20px;">编辑</span>
+								class="editsty" @click.stop="editRole(scope.row)" style="marginRight:20px;">{{$t('Table.edit_btn')}}</span>
 							<span v-permission="permissionBtn.sysDepartPermission.sysRole_del"
-								class="deletesty" @click.stop="delRole(scope.row)">删除</span>
+								class="deletesty" @click.stop="delRole(scope.row)">{{$t('Table.delete_btn')}}</span>
 						</div>
 					</template>
 				</el-table-column>
 				<div slot="empty" style="lineHeight:25px;margin:20px 0;color:#95A9C5;">
-					<tableNoData text="暂无角色" size="mini"/>
+					<tableNoData :text="$t('SystemManage.RoleManage.no_role_data')" size="mini"/>
 				</div>
 			</el-table>
 			<el-col :span="24" class="toolbar">
@@ -82,15 +82,15 @@
 		width="30%"
 		v-dialogDrag>
 			<div slot="title" style="display:flex;alignItems:center;">
-				<img :src="roleForm.title=='添加角色'?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
+				<img :src="!roleForm.role_id?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
 				<span style="fontSize:16px;">{{roleForm.title}}</span>
 			</div>
 			<el-form :model="roleForm" :rules="roleRule" ref="roleForm" label-width="100px" class="demo-ruleForm" style="marginTop:15px;">
-				<el-form-item label="角色" prop="name">
-					<el-input v-model="roleForm.name" placeholder="请填写角色名称" style="width: 90%"></el-input>
+				<el-form-item :label="$t('SystemManage.RoleManage.role_name')" prop="name">
+					<el-input v-model="roleForm.name" :placeholder="$t('SystemManage.RoleManage.input_role_placeholder')" style="width: 90%"></el-input>
 				</el-form-item>
-				<el-form-item label="角色类型" prop="roleType">
-					<el-select v-model="roleForm.roleType" placeholder="选择角色类型" style="width:90%">
+				<el-form-item :label="$t('SystemManage.RoleManage.role_type')" prop="roleType">
+					<el-select v-model="roleForm.roleType" :placeholder="$t('SystemManage.RoleManage.select_role_placeholder')" style="width:90%">
 						<el-option
 							v-for="item in roleTypeArr"
 							:key="item"
@@ -101,8 +101,8 @@
 				</el-form-item>
 			</el-form>	
 			<div style="display:flex;justify-content:center;margin:75px 0 26px;">
-				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveRole">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle()">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveRole">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle()">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -113,6 +113,14 @@ import {departInterence} from '@/api/api.js';
 export default {
 	name:'',
 	components: {},
+	computed:{
+		roleTypeArr(){
+			if(this.$i18n.locale==='en') return ['None','Administrator','FICC Administrator',
+			'FICC Sales','Equity Administrator','Equity Sales','FICC Sales Supervisor','FICC Sales Team Leader',
+			'Equity Sales Team Leader','FICC Department Manager','Equity Department Manager','FICC Researcher','Equity Researcher']
+			return ['无','管理员','ficc管理员','ficc销售','权益管理员','权益销售','ficc销售主管','ficc销售组长','权益销售组长','ficc部门经理','权益部门经理','ficc研究员','权益研究员']
+		}
+	},
 	data () {
 		return {
 			search_txt:'',//关键字搜索
@@ -130,13 +138,13 @@ export default {
 			},
 			roleRule:{
 				name:[
-					{ required: true, message: '请输入角色名称', trigger: 'blur' },
+					{ required: true, message: this.$t('SystemManage.RoleManage.input_role_placeholder'), trigger: 'blur' },
 				],
 				roleType:[
-					{ required: true, message: '请选择角色类型', trigger: 'blur' },
+					{ required: true, message: this.$t('SystemManage.RoleManage.select_role_placeholder'), trigger: 'blur' },
 				]
 			},
-			roleTypeArr:['无','管理员','ficc管理员','ficc销售','权益管理员','权益销售','ficc销售主管','ficc销售组长','权益销售组长','ficc部门经理','权益部门经理','ficc研究员','权益研究员'],
+			// roleTypeArr:['无','管理员','ficc管理员','ficc销售','权益管理员','权益销售','ficc销售主管','ficc销售组长','权益销售组长','ficc部门经理','权益部门经理','ficc研究员','权益研究员'],
 		};
 	},
 	methods: {
@@ -186,18 +194,18 @@ export default {
 		addRole() {
 			this.isAddRole = true;
 			this.roleForm = {
-				title:'添加角色',
+				title:this.$t('SystemManage.RoleManage.role_add_btn'),
 				name:'',
-				roleType:'无'
+				roleType:this.roleTypeArr[0]
 			}
 		},
 		// 取消
 		cancelHandle() {
 			this.isAddRole = false;
 			this.roleForm = {
-				title:'添加角色',
+				title:this.$t('SystemManage.RoleManage.role_add_btn'),
 				name:'',
-				roleType:'无'
+				roleType:this.roleTypeArr[0]
 			}
 			this.$refs.roleForm.resetFields();
 		},
@@ -205,7 +213,7 @@ export default {
 		saveRole() {
 			this.$refs.roleForm.validate((valid) => {
 				if (valid) {
-					if(this.roleForm.title == '添加角色') {
+					if(!this.roleForm.role_id) {
 						departInterence.addRole({
 							RoleName:this.roleForm.name,
 							roleType:this.roleForm.roleType
@@ -236,7 +244,7 @@ export default {
 		editRole(item) {
 			this.isAddRole = true;
 			this.roleForm = {
-				title:'编辑角色',
+				title:this.$t('SystemManage.RoleManage.role_edit_btn'),
 				name:item.RoleName,
 				role_id:item.RoleId,
 				roleType:item.RoleType
@@ -244,14 +252,14 @@ export default {
 		},
 		/*  删除角色*/
 		delRole(item) {
-			this.$confirm('是否确认删除该角色?','提示',{
+			this.$confirm(this.$t('SystemManage.RoleManage.delete_role_msg'),this.$t('Confirm.prompt'),{
 				type:'warning'
 			}).then(() => {
 				departInterence.delRole({
 					RoleId:item.RoleId
 				}).then(res => {
 					if(res.Ret === 200) {
-						this.$message.success('删除成功');
+						this.$message.success(this.$t('MsgPrompt.delete_msg'));
 						this.isAddRole = false;
 						this.getTableList();
 					}