111

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -116,7 +116,7 @@
           <a-tag color="#87d068" v-if="record.showState == '2'">
            正常
           </a-tag>
-           <a-icon v-if="record.showState == '2'" title="该员工在未排班或休息班打卡" slot="count" type="clock-circle" style="color: #f57301" />
+           <a-icon v-if="record.showState == '2'" title="该员工在未排班或休息班打卡" slot="count" type="exclamation-circle" style="color: #f57301" />
           <a-tag color="#87d068" v-if="record.showState == '0'">
             正常
           </a-tag>

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -61,7 +61,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        @change="handleTableChange" :scroll="{ x: 1000, y: 650 }">
+        @change="handleTableChange" :scroll="{ x: 1000, y: 550 }">
 
         <span slot="ShiftTime" slot-scope="text, record, index">
            {{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
@@ -328,6 +328,11 @@
               customRender: 'customDuration'
             }
           },
+          {
+            title: '校准人',
+            align: "center",
+            dataIndex: 'jzBy'
+          },
           {
             title: '操作',
             dataIndex: 'action',