Pārlūkot izejas kodu

fix: 修改web端周报月份显示错误问题

qiny 11 mēneši atpakaļ
vecāks
revīzija
c033961c68

+ 9 - 0
client/src/views/OaSystem/personnelManagement/weeklyCenter/service.ts

@@ -208,5 +208,14 @@ export const service = {
       }
     })
     return monthObj
+  },
+  // 判断给定的日期在几月,通过获取到的月份数据进行筛选查找今天是划分到的几月
+  getTodayMonth: async () => {
+    const today: any = moment().format('YYYY-MM-DD')
+    const monthRange = service.getMonthRange(today)
+    const workDays = await http.getWorkDayList(monthRange[0], monthRange[1])
+    const findDay: any = workDays.find((day) => day.dateDay == moment(today).valueOf())
+    const realDate = moment(`${findDay.year}-${findDay.month}`)
+    return realDate
   }
 }

+ 3 - 1
client/src/views/OaSystem/personnelManagement/weeklyCenter/weeklyLogList.vue

@@ -74,14 +74,16 @@ const defineMonth = () => {
     return moment()
   }
 }
+// 默认本月日期
 const thisMonth = ref<any>(defineMonth())
 // 本月的周日报和周划分
 const thisMonthLogs = ref<any>([])
 
 // 获取工作日列表
 onMounted(async () => {
+  // 进行本月具体日期的二次确认
+  thisMonth.value = await service.getTodayMonth()
   await initPageList()
-
   // 初始化的时候进行一些选择
   const nowLog = thisMonthLogs.value.find((item: any) =>
     moment().isBetween(item.startDate, item.endDate)