Merge remote-tracking branch 'origin/dev_new' into dev_new

gaoluyang

19 小时以前 fcf6e5286e72d2df817ac077b47acd2bfc1e0649

Merge remote-tracking branch 'origin/dev_new' into dev_new

 src/pages/humanResources/attendance/checkin.vue

@@ -129,7 +129,12 @@
    findTodayPersonalAttendanceRecord({}).then(res => {
      if (res.data) {
        todayRecord.value = res.data;
        noNeedCheckIn.value = false;
        // 检查startAt和endAt是否为空，为空则无需打卡
        if (!todayRecord.value.startAt || !todayRecord.value.endAt) {
          noNeedCheckIn.value = true;
        } else {
          noNeedCheckIn.value = false;
        }
      } else {
        // 页面显示“无需打卡”
        todayRecord.value = {};