From 878307e48354ea5f8b6441cea6f3c67d4c254172 Mon Sep 17 00:00:00 2001 From: hreenshan112 Date: Mon, 20 Jan 2025 08:12:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/calendar/Calendar.ts | 12 +- src/api/hr/org/index.ts | 50 ++ src/api/hr/people/index.ts | 109 +++++ src/api/hr/people/type.ts | 38 +- .../app/calendar/calendar1/monthPage.vue | 327 ++++++------- src/views/hr/archives/index.vue | 103 ++-- src/views/hr/teams/batchImportTimePeople.vue | 152 ++++++ src/views/hr/teams/classTime/addClass.vue | 398 ++++++++++++++++ src/views/hr/teams/classTime/dayInfoPage.vue | 194 ++++++++ src/views/hr/teams/classTime/dayPage.vue | 121 +++++ src/views/hr/teams/classTime/editClass.vue | 366 +++++++++++++++ .../hr/teams/classTime/monthInfoPage.vue | 200 ++++++++ src/views/hr/teams/classTime/monthPage.vue | 156 +++++++ .../hr/teams/classTime/setupShiftRules.vue | 249 ++++++++++ src/views/hr/teams/classTime/weekInfoPage.vue | 195 ++++++++ src/views/hr/teams/classTime/weekPage.vue | 119 +++++ src/views/hr/teams/classes.vue | 186 ++++++++ src/views/hr/teams/index.vue | 439 ++++++++++++++++++ src/views/hr/teams/scheduling.vue | 419 +++++++++++++++++ 19 files changed, 3631 insertions(+), 202 deletions(-) create mode 100644 src/views/hr/teams/batchImportTimePeople.vue create mode 100644 src/views/hr/teams/classTime/addClass.vue create mode 100644 src/views/hr/teams/classTime/dayInfoPage.vue create mode 100644 src/views/hr/teams/classTime/dayPage.vue create mode 100644 src/views/hr/teams/classTime/editClass.vue create mode 100644 src/views/hr/teams/classTime/monthInfoPage.vue create mode 100644 src/views/hr/teams/classTime/monthPage.vue create mode 100644 src/views/hr/teams/classTime/setupShiftRules.vue create mode 100644 src/views/hr/teams/classTime/weekInfoPage.vue create mode 100644 src/views/hr/teams/classTime/weekPage.vue create mode 100644 src/views/hr/teams/classes.vue create mode 100644 src/views/hr/teams/index.vue create mode 100644 src/views/hr/teams/scheduling.vue diff --git a/src/api/calendar/Calendar.ts b/src/api/calendar/Calendar.ts index 553a0ba..b3c4b92 100644 --- a/src/api/calendar/Calendar.ts +++ b/src/api/calendar/Calendar.ts @@ -83,7 +83,7 @@ class Calendar { const y = date[1] === 1 ? date[0] - 1 : date[0]; const m = date[1] === 1 ? 12 : date[1] - 1; let w = DateClass.solarMonth(y, m); - console.log("获取当月前面需补齐的数组-->",y,m,w,last) + // console.log("获取当月前面需补齐的数组-->",y,m,w,last) const arr: dateBase[] = []; for (let i = 0; i < last; i++) { const lun = DateClass.getLunars(y, m, w - i); @@ -104,7 +104,7 @@ class Calendar { animal: DateClass.getAnimal(Number(l[0])), astro: DateClass.toAstro(y, m, w - i), term: getTerm(Number(l[0]), m, w - i), - + isWeek: i === 6 || i === 7, }); } return arr; @@ -172,13 +172,13 @@ class Calendar { const result = this.validateDate(date); const currentDay = DateClass.solarWeeks(result[0], result[1]); - console.log("获取当月的完整数据",currentDay,result) + // console.log("获取当月的完整数据",currentDay,result) // 获取当月的完整数据 const beforDays = this.beforDays(date, currentDay).reverse(); const m = this.getDay(date, beforDays); - console.log("获取当月的完整数据--->",m,date) + // console.log("获取当月的完整数据--->",m,date) const afterDays = this.afterDays(m, date); @@ -199,6 +199,7 @@ class Calendar { gainOneDay(y: number, m: number, d: number){ let dateStr = y + "-" + m + "-" + d; // 要转换的日期字符串 let now = new Date(dateStr); //当前日期字符串转换成Date对象 + let nowDayOfWeek = now.getDay()==0?7:now.getDay(); //今天本周的第几天 const lun = DateClass.getLunars(y, m, d); const l = lun.split('-'); let currentTime = DateClass.getCurrent() @@ -218,7 +219,7 @@ class Calendar { animal: DateClass.getAnimal(Number(l[0])), astro: DateClass.toAstro(y, m, d), term: getTerm(Number(l[0]), m, d), - + isWeek: nowDayOfWeek === 6 || nowDayOfWeek === 7, } } @@ -255,6 +256,7 @@ class Calendar { animal: DateClass.getAnimal(Number(l[0])), astro: DateClass.toAstro(y, m, d), term: getTerm(Number(l[0]), m, d), + isWeek: i === 6 || i === 7, }); } diff --git a/src/api/hr/org/index.ts b/src/api/hr/org/index.ts index c9cb5e6..0548b4d 100644 --- a/src/api/hr/org/index.ts +++ b/src/api/hr/org/index.ts @@ -202,3 +202,53 @@ export function getTeamListCont(data: searchTeamList): AxiosPromise - - diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue index 6cdde79..5ad91f5 100644 --- a/src/views/hr/archives/index.vue +++ b/src/views/hr/archives/index.vue @@ -13,6 +13,7 @@ import { gainUserTemplateInfo, editUserTemplateInfo, gainTempleateOrgList, + teamcontlist, } from "@/api/hr/org/index"; import { archivesCont, searchCriteriaForPeople } from "@/api/hr/people/type"; import { emptypeOptions } from "@/api/hr/people/datacont"; @@ -325,6 +326,7 @@ onMounted(() => { haveOrgTreeInfo(); getArchivesPage(); scrollToBottom(); + gainTimeList(); }); const ruleForm = reactive({ @@ -671,6 +673,22 @@ const insetPeopleContStall = () => { excelUploadStaff.value.clearFiles(); } }; +const tiemList = ref([]); +/** +@ 作者: 秦东 +@ 时间: 2025-01-14 10:27:12 +@ 功能: 获取班组列表 +*/ +const gainTimeList = () => { + let searchMap = { + page: 1, + pagesize: 2000, + name: "", + }; + teamcontlist(searchMap).then((data) => { + tiemList.value = data.data.list; + }); +};