Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
This commit is contained in:
commit
c95c7134d7
|
@ -1882,7 +1882,7 @@ const routes = [
|
|||
"meta": {
|
||||
"title": "到岗记录",
|
||||
"icon": "el-icon-check",
|
||||
"perms": ["attendance_record"]
|
||||
"perms": ["attendance"]
|
||||
},
|
||||
"component": "hrm/attendance"
|
||||
},
|
||||
|
@ -1892,7 +1892,7 @@ const routes = [
|
|||
"meta": {
|
||||
"title": "绩效考核",
|
||||
"icon": "el-icon-check",
|
||||
"perms": ["attendance_record"]
|
||||
"perms": ["kpi"]
|
||||
},
|
||||
"component": "hrm/performance"
|
||||
},
|
||||
|
@ -1903,7 +1903,7 @@ const routes = [
|
|||
"title": "相关证书",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["employee"]
|
||||
"perms": ["certificate"]
|
||||
|
||||
},
|
||||
"component": "hrm/certificate"
|
||||
|
|
|
@ -169,13 +169,7 @@ export default {
|
|||
methods: {
|
||||
getShiftOptions() {
|
||||
this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
|
||||
let data = [];
|
||||
res.forEach(item => {
|
||||
if (item.parent == '3423856735881117696') {
|
||||
data.push(item)
|
||||
}
|
||||
});
|
||||
this.deptOptions = data;
|
||||
this.deptOptions = res;
|
||||
});
|
||||
this.$API.mtm.shift.list.req({ page: 0 }).then(res => {
|
||||
this.shiftOptions = res;
|
||||
|
|
|
@ -133,14 +133,7 @@ import memberDialog from "./team_form.vue";
|
|||
//部门数据
|
||||
getDeptData() {
|
||||
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
|
||||
let data = [];
|
||||
res.forEach(item => {
|
||||
if(item.parent=='3423856735881117696'){
|
||||
data.push(item)
|
||||
}
|
||||
});
|
||||
console.log(data)
|
||||
this.deptData = data;
|
||||
this.deptData = res;
|
||||
});
|
||||
},
|
||||
//添加班组
|
||||
|
|
Loading…
Reference in New Issue