From 01276e0a00344a138cae4aabda42bb92df72f433 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 21 Dec 2023 13:25:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20team=5Fphoton=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/team_photon.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/views/hrm/team_photon.vue b/src/views/hrm/team_photon.vue index d705dc4a..ebb321b6 100644 --- a/src/views/hrm/team_photon.vue +++ b/src/views/hrm/team_photon.vue @@ -134,12 +134,6 @@ 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; }); }, From d4094d360764c1d630122625c922c6bc76fc3ff5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 21 Dec 2023 13:32:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20team=5Fphoton=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/team_photon.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/hrm/team_photon.vue b/src/views/hrm/team_photon.vue index ebb321b6..60066829 100644 --- a/src/views/hrm/team_photon.vue +++ b/src/views/hrm/team_photon.vue @@ -133,8 +133,7 @@ import memberDialog from "./team_form.vue"; //部门数据 getDeptData() { this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{ - let data = []; - this.deptData = data; + this.deptData = res; }); }, //添加班组 From a3670056aed0e683b99a2a3231ea7f5f740785ef Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 21 Dec 2023 14:08:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=B0=E5=B2=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 6 +++--- src/views/hrm/attendance_form.vue | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index 080c015e..84d54760 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -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" diff --git a/src/views/hrm/attendance_form.vue b/src/views/hrm/attendance_form.vue index 72e3044d..ef57313b 100644 --- a/src/views/hrm/attendance_form.vue +++ b/src/views/hrm/attendance_form.vue @@ -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;