comit

src/lang/commonLang.js

@@ -155,6 +155,10 @@ export default {
     http_not_support:{
       en:'The current protocol is not currently supported, only the HTTPS protocol is supported',
       zh:'当前协议暂不支持，仅支持https协议'
+    },
+    move_sort_success:{
+      en:'Rearranged successfully',
+      zh:'移动排序成功'
     }
   },
   Common:{

src/lang/en.js

@@ -14,6 +14,7 @@ import commonLang from "./commonLang";
 import {SandListEn} from './modules/SandboxManage/SandList'
 import {SandFlowEn} from './modules/SandboxManage/SandFlow'
 import {RoleManageEn} from './modules/systemManage/RoleManage'
+import {DepartManageEn} from './modules/systemManage/DepartManage'
 
 export default {
   //
@@ -45,7 +46,8 @@ export default {
   },
   //系统管理
   SystemManage:{
-    RoleManage:RoleManageEn
+    RoleManage:RoleManageEn,
+    DepartManage:DepartManageEn
   },
   // 公共模块
   Dialog: transformLanguageData(commonLang.Dialog, "en"),

src/lang/modules/systemManage/DepartManage.js

@@ -0,0 +1,29 @@
+/**
+ * 系统设置-部门管理
+ */
+
+/* 英文 */
+export const DepartManageEn = {
+    depart_info_title:"Department Information",
+    depart_create:'Create Department',
+    depart_edit:'Edit Department',
+    depart_name_placeholder:'Please enter the department name',
+    depart:'Department',
+    delete_confirm:'Are you sure you want to delete'
+};
+  
+/* 中文 */
+export const DepartManageZh = {
+    depart_info_title:"部门信息 ",
+    depart_create:'新建部门',
+    depart_edit:'编辑部门',
+    depart_name_placeholder:'请填写部门名称',
+    depart:'部门',
+    delete_confirm:'确定删除吗',
+    group_add:'添加分组',
+    group:'分组'
+};
+  
+/**
+* $t('SystemManage.DepartManage.XXX')
+*/

src/lang/modules/systemManage/RoleManage.js

@@ -15,6 +15,9 @@ export const RoleManageEn = {
     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?',
+    permission_set:'Permission Settings',
+    set_permission_msg01:'Please select at least one permission',
+    set_permission_success:'Permission Settings Successful'
 };
   
 /* 中文 */
@@ -30,6 +33,9 @@ export const RoleManageZh = {
     input_role_placeholder:'请填写角色名称',
     select_role_placeholder:'选择角色类型',
     delete_role_msg:'是否确认删除该角色?',
+    permission_set:'权限设置',
+    set_permission_msg01:'请至少选择一个权限 ',
+    set_permission_success:'权限设置成功'
 };
   
 /**

src/lang/zh.js

@@ -14,6 +14,7 @@ import commonLang from "./commonLang";
 import {SandListZh} from './modules/SandboxManage/SandList'
 import {SandFlowZh} from './modules/SandboxManage/SandFlow'
 import {RoleManageZh} from './modules/systemManage/RoleManage'
+import { DepartManageZh } from "./modules/systemManage/DepartManage";
 
 export default {
   ReportManage: {
@@ -44,7 +45,8 @@ export default {
   },
   //系统管理
   SystemManage:{
-    RoleManage:RoleManageZh
+    RoleManage:RoleManageZh,
+    DepartManage:DepartManageZh
   },
   // 公共模块
   Dialog: transformLanguageData(commonLang.Dialog, "zh"),

src/views/system_manage/departManage.vue

@@ -3,7 +3,7 @@
 		<div class="left_cont">
 			<div class="company_top" @click="initDepart">
 				<img src="~@/assets/img/set_m/home_ico.png" alt="" style="width:30px;height:30px;">
-				<span :class="!defaultGroup&&!defaultDepart?'act':''">部门信息</span>
+				<span :class="!defaultGroup&&!defaultDepart?'act':''">{{$t('SystemManage.DepartManage.depart_info_title')}}</span>
 			</div>
 			<el-tree
 				ref="departTree"
@@ -30,12 +30,12 @@
 						v-if="((!isTrail) || (data.canEdit||data.IsGroup))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<el-popconfirm
 						@onConfirm="removeNode(node,data)"
-						confirmButtonText='删除'
-						cancelButtonText='取消'
+						:confirmButtonText="$t('Table.delete_btn')"
+						:cancelButtonText="$t('Dialog.cancel_btn')"
 						confirmButtonType="text"
 						icon="el-icon-info"
 						iconColor="red"
-						title="确定删除吗"
+						:title="$t('SystemManage.DepartManage.delete_confirm')"
 						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_delete')"
 						>
 						<!-- 共享客户组不允许删除 -->
@@ -46,7 +46,7 @@
 			</el-tree>
 			<div class="noDepart" @click="addDepart" v-if="permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 				<img src="~@/assets/img/set_m/add_ico.png" alt="" style="width:16px;height:16px;marginRight:10px;">
-				<span>新建部门</span>
+				<span>{{$t('SystemManage.DepartManage.depart_create')}}</span>
 			</div>
 		</div>
 		<div class="right_cont">
@@ -230,17 +230,17 @@
 		width="30%"
 		v-dialogDrag>
 			<div slot="title" style="display:flex;alignItems:center;">
-				<img :src="departForm.title=='新建部门'?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
+				<img :src="!departForm.depart_id?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
 				<span style="fontSize:16px;">{{departForm.title}}</span>
 			</div>
-			<el-form :model="departForm" :rules="departRule" ref="departForm" label-width="100px" class="demo-ruleForm" style="marginTop:15px;">
-				<el-form-item label="部门" prop="name">
-					<el-input v-model="departForm.name" placeholder="请填写部门名称" style="width: 90%"></el-input>
+			<el-form :model="departForm" :rules="departRule" ref="departForm" label-width="120px" class="demo-ruleForm" style="marginTop:15px;">
+				<el-form-item :label="$t('SystemManage.DepartManage.depart')" prop="name">
+					<el-input v-model="departForm.name" :placeholder="$t('SystemManage.DepartManage.depart_name_placeholder')" style="width: 90%"></el-input>
 				</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="saveDepart">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle(1)">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveDepart">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle(1)">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 		<!-- 添加分组弹窗 -->
@@ -286,8 +286,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="saveGroup">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle(2)">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveGroup">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle(2)">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 		<!-- 编辑分组 -->
@@ -800,7 +800,7 @@ export default {
 			if(data.IsDepartment) {
 				this.isAddDepart = true;
 				this.departForm = {
-					title:"编辑部门",
+					title:this.$t('SystemManage.DepartManage.depart_edit'),
 					name:data.DepartmentName,
 					depart_id:data.DepartmentId
 				}
@@ -830,7 +830,7 @@ export default {
 				GroupName:this.editGroupForm.group,
 			})
 			if(res.Ret === 200) {
-					this.$message.success('编辑成功')
+					this.$message.success(this.$t('MsgPrompt.edit_msg'))
 					this.isEditGroup = false;
 					this.editGroupForm = {
 						group_id:'',
@@ -919,7 +919,7 @@ export default {
 		addDepart() {
 			this.isAddDepart = true;
 			this.departForm = {
-				title:'新建部门',
+				title:this.$t('SystemManage.DepartManage.depart_create'),
 				name:''
 			}
 		},
@@ -928,15 +928,15 @@ export default {
 			this.$refs.departForm.validate((valid) => {
 				if (valid) {
 					// alert('submit!');
-					if(this.departForm.title == '新建部门') {
+					if(!this.departForm.depart_id) {
 						departInterence.addDepart({
 							DepartmentName:this.departForm.name
 						}).then(res => {
 							if(res.Ret === 200) {
-								this.$message.success('新建成功')
+								this.$message.success(this.$t('MsgPrompt.add_msg'))
 								this.isAddDepart = false;
 								this.departForm = {
-									title:'新建部门',
+									title:this.$t('SystemManage.DepartManage.depart_create'),
 									name:''
 								}
 								this.getDepartArr();
@@ -948,10 +948,10 @@ export default {
 							DepartmentName:this.departForm.name
 						}).then(res => {
 							if(res.Ret === 200) {
-								this.$message.success('编辑成功')
+								this.$message.success(this.$t('MsgPrompt.edit_msg'))
 								this.isAddDepart = false;
 								this.departForm = {
-									title:'新建部门',
+									title:this.$t('SystemManage.DepartManage.depart_create'),
 									name:''
 								}
 								this.getDepartArr();

src/views/system_manage/mixin/departManageMixin.js

@@ -173,7 +173,7 @@ export default {
             }
             departInterence.sortDepart(params).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success('移动排序成功')
+                this.$message.success(this.$t('MsgPrompt.move_sort_success'))
                 this.getDepartArr()
             })
         },

src/views/system_manage/newAuthManage.vue

@@ -2,21 +2,21 @@
     <div class="authManage_container">
         <div class="auth_cont_top">
             <div>
-                <span>角色：</span>
+                <span>{{$t('SystemManage.RoleManage.role_name')}}：</span>
                 <span>{{Role.RoleName}}</span>
                 <!-- <el-select v-model="role" placeholder="请选择角色" style="width:360px;marginLeft:30px;">
                     <el-option v-for="item in roleList" :key="item.RoleId" :label="item.RoleName" :value="item.RoleId">
                     </el-option>
                 </el-select> -->
             </div>
-            <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">取消
+            <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">{{$t('Dialog.cancel_btn')}}
             </el-button>
-            <el-button type="primary" style="marginRight:50px;width:140px;" @click="saveAuth" v-if="!isLook">保存
+            <el-button type="primary" style="marginRight:50px;width:140px;" @click="saveAuth" v-if="!isLook">{{$t('Dialog.confirm_save_btn')}}
             </el-button>
         </div>
         <div class="auth_bot">
             <div class="menu_auth_cont">
-                <h3 style="color:#333;fontSize:14px;">权限设置</h3>
+                <h3 style="color:#333;fontSize:14px;">{{$t('SystemManage.RoleManage.permission_set')}}</h3>
                 <div class="auth-wrap">
                     <el-tree ref="checkboxTree" :data="authList" :props="{label:'Name',children:'Children',disabled:'Disabled'}"
                         :default-expand-all="false" show-checkbox node-key="MenuId"
@@ -103,7 +103,7 @@ export default {
             const keys = this.$refs.checkboxTree.getCheckedKeys()
             const halfKeys = this.$refs.checkboxTree.getHalfCheckedKeys()
             if(!keys.length&&!halfKeys.length){
-                this.$message.warning('请至少选择一个权限')
+                this.$message.warning(this.$t('SystemManage.RoleManage.set_permission_msg01'))
                 return
             }
             const ChoiceList = Array.from(new Set([...keys,...halfKeys]))
@@ -113,7 +113,7 @@ export default {
                 HalfMenuIds:halfKeys
             }).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success('权限设置成功')
+                this.$message.success(this.$t('SystemManage.RoleManage.set_permission_success'))
                 this.$router.back()
             })
         },