月报

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -39,6 +39,8 @@
                   <a-select v-model="queryParam.name" placeholder="请选择班次">
                     <a-select-option value="">请选择</a-select-option>
                     <a-select-option value="休息">休息</a-select-option>
+                    <a-select-option value="固定上下班">固定上下班</a-select-option>
+                    <a-select-option value="自由上下班">自由上下班</a-select-option>
                     <a-select-option v-for="(item,index) in shiftlist" :value="item.name">{{item.name}} （{{item.startDate}}-{{item.endDate}})
                     </a-select-option>
                   </a-select>
@@ -98,7 +100,7 @@
           <a-tag color="#87d068" v-if="record.latetimeX <= 0 && record.latetimeS <= 0 ">正常</a-tag> -->
           
           <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0
-          || record.shiftRealTimeS == '' || record.shiftRealTimeS == null
+          || record.shiftRealTimeS == '' || record.shiftRealTimeS == null || (record.ifwork !=0 && record.attendanceCount < 2)
           && (record.setInfo == '' || record.setInfo == null)">
           异常
           </a-tag>
@@ -179,7 +181,7 @@
           },{
             title: '部门',
             align: 'center',
-            dataIndex: 'departNames', fixed: 'left', width: 100
+            dataIndex: 'departNames', fixed: 'left', width: 200
           },
           // {
           //   title: '工号',
@@ -275,7 +277,7 @@
           },
           {
             title: '加班时长',
-            align: 'center',
+            align: 'center',width: 100,
             dataIndex: 'duration'
           },
           {
@@ -290,7 +292,7 @@
           },
           {
             title: '请假类型',
-            align: 'center',
+            align: 'center',width: 100,
             dataIndex: 'holidayType'
           }
           // ,

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -45,7 +45,7 @@
           <span v-else>正常 <a>{{record.setInfo}}</a></span> -->
           
           <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0 
-          || record.shiftRealTimeS == '' || record.shiftRealTimeS == null
+          || record.shiftRealTimeS == '' || record.shiftRealTimeS == null || (record.ifwork !=0 && record.attendanceCount < 2)
           && (record.setInfo == '' || record.setInfo == null)">
           异常
           </a-tag>
@@ -136,7 +136,7 @@
             dataIndex: 'weekDate'
           },
           {
-            title: '班次类型',
+            title: '班次',
             align: "center",
             dataIndex: 'name'
           },
@@ -173,6 +173,12 @@
             dataIndex: 'demo',
             width: 200
           },
+          {
+            title: '加班时间',
+            align: "center",
+            dataIndex: 'duration',
+            width: 100
+          },
           {
             title: '操作',
             dataIndex: 'action',