zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
shijing 2023-12-21 14:33:22 +08:00
parent f789550dfe a3670056ae
commit c95c7134d7
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/route.js
View File

@ -1882,7 +1882,7 @@ const routes = [
"meta": { "meta": {
"title": "到岗记录", "title": "到岗记录",
"icon": "el-icon-check", "icon": "el-icon-check",
"perms": ["attendance_record"] "perms": ["attendance"]
}, },
"component": "hrm/attendance" "component": "hrm/attendance"
}, },
@ -1892,7 +1892,7 @@ const routes = [
"meta": { "meta": {
"title": "绩效考核", "title": "绩效考核",
"icon": "el-icon-check", "icon": "el-icon-check",
"perms": ["attendance_record"] "perms": ["kpi"]
}, },
"component": "hrm/performance" "component": "hrm/performance"
}, },
@ -1903,7 +1903,7 @@ const routes = [
"title": "相关证书", "title": "相关证书",
"icon": "el-icon-menu", "icon": "el-icon-menu",
"hidden": true, "hidden": true,
"perms": ["employee"] "perms": ["certificate"]
}, },
"component": "hrm/certificate" "component": "hrm/certificate"

8
src/views/hrm/attendance_form.vue
View File

@ -169,13 +169,7 @@ export default {
methods: { methods: {
getShiftOptions() { getShiftOptions() {
this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => { this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
let data = []; this.deptOptions = res;
res.forEach(item => {
if (item.parent == '3423856735881117696') {
data.push(item)
}
});
this.deptOptions = data;
}); });
this.$API.mtm.shift.list.req({ page: 0 }).then(res => { this.$API.mtm.shift.list.req({ page: 0 }).then(res => {
this.shiftOptions = res; this.shiftOptions = res;

9
src/views/hrm/team_photon.vue
View File

@ -133,14 +133,7 @@ import memberDialog from "./team_form.vue";
//部门数据 //部门数据
getDeptData() { getDeptData() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{ this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
let data = []; this.deptData = res;
res.forEach(item => {
if(item.parent=='3423856735881117696'){
data.push(item)
}
});
console.log(data)
this.deptData = data;
}); });
}, },
//添加班组 //添加班组