From bd50c6f429aae92a8d7b429814f72c981c475168 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sat, 11 Jun 2022 22:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=9A=84=E6=8E=92=E7=8F=AD?= =?UTF-8?q?=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/cal/team.js | 8 + src/views/mes/cal/calendar/calendarType.vue | 25 +-- src/views/mes/cal/calendar/index.vue | 8 +- src/views/mes/cal/calendar/team.vue | 212 +++++++++++++++++++- 4 files changed, 223 insertions(+), 30 deletions(-) diff --git a/src/api/mes/cal/team.js b/src/api/mes/cal/team.js index 6e12f3d..b027191 100644 --- a/src/api/mes/cal/team.js +++ b/src/api/mes/cal/team.js @@ -9,6 +9,14 @@ export function listTeam(query) { }) } +// 查询班组列表 +export function listAllTeam() { + return request({ + url: '/mes/cal/team/listAll', + method: 'get' + }) +} + // 查询班组详细 export function getTeam(teamId) { return request({ diff --git a/src/views/mes/cal/calendar/calendarType.vue b/src/views/mes/cal/calendar/calendarType.vue index 3d304b0..7399b03 100644 --- a/src/views/mes/cal/calendar/calendarType.vue +++ b/src/views/mes/cal/calendar/calendarType.vue @@ -37,29 +37,7 @@ {{ teamShift.teamName }} - - + @@ -126,7 +104,6 @@ export default { this.workdayList =[]; let that = this; listCalholiday(this.queryParams).then(response => { - debugger; if(response.data !=null){ response.data.forEach(theDay => { if(theDay.holidayType =='HOLIDAY'){ diff --git a/src/views/mes/cal/calendar/index.vue b/src/views/mes/cal/calendar/index.vue index 3219619..4d09551 100644 --- a/src/views/mes/cal/calendar/index.vue +++ b/src/views/mes/cal/calendar/index.vue @@ -4,7 +4,9 @@ - + + + @@ -12,9 +14,9 @@ - \ No newline at end of file