1

src/views/attendance/components/MonthStatics.vue

@@ -176,7 +176,7 @@ export default {
         this.clockLogs = await index({
           month: this.$moment(this.day).format('YYYY-MM')
         })
-        this.$emit('today-attendance', this.clockLogs.today_attendance.details)
+        this.$emit('today-attendance', this.clockLogs.today_attendance)
       } catch (err) {
         console.error(err)
       }

src/views/attendance/index.vue

@@ -11,12 +11,14 @@
             <span>上班外勤打卡</span>
           </button>
 
-          <button class="sign-btn" v-if="signStatus === 1 || signStatus === 2" @click="singType=2,clockIn(false)">
+          <template v-if="todayAttendance.sign_in_at">
-            <span>下班打卡</span>
+            <button class="sign-btn" v-if="signStatus === 1 || signStatus === 2" @click="singType=2,clockIn(false)">
-          </button>
+              <span>下班打卡</span>
-          <button class="sign-btn" v-if="signStatus === 2 || signStatus === 0" @click="singType=2,clockIn(true)">
+            </button>
-            <span>下班外勤打卡</span>
+            <button class="sign-btn" v-if="signStatus === 2 || signStatus === 0" @click="singType=2,clockIn(true)">
-          </button>
+              <span>下班外勤打卡</span>
+            </button>
+          </template>
         </div>
         <div class="sign-info">
           <div class="sign-statue">
@@ -33,10 +35,10 @@
             </div>
           </div>
 
-          <div class="sign-log" v-if="todayAttendance.length > 0">
+          <div class="sign-log" v-if="todayAttendance.details && todayAttendance.details.length > 0">
             <el-timeline>
               <el-timeline-item
-                v-for="(item) in todayAttendance"
+                v-for="(item) in todayAttendance.details"
                 :key="item.id"
                 :type="item.sign_at_image ? 'warning' : 'primary'"
                 :timestamp="item.sign_at">
@@ -121,7 +123,7 @@ export default {
       },
       maxDistance: '',
       nowDistance: '',
-      todayAttendance: [],
+      todayAttendance: {},
 
       // 值班
       isShowDuty: false,