11

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -211,7 +211,7 @@
           //   dataIndex: 'workNo'
           // },
           {
-            title: '班次',
+            title: '班次',dataIndex:'name',
             align: 'center',sorter: true,
             fixed: 'left', width: 160,
             scopedSlots: {
@@ -290,7 +290,7 @@
             align: 'center',sorter: true,
             dataIndex: 'attendanceCount', width: 100
           }, {
-            title: '考勤状态',
+            title: '考勤状态',dataIndex:'showState',
             align: 'center', width: 100,sorter: true,
             scopedSlots: {
               customRender: 'latetimeState'

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -546,9 +546,14 @@
             this.$message.warning("请选择一条含有加班信息的数据");
             return;
           }
+          if(st == '2'){
+            this.multiple = 1;
+            this.queryParam.multiple=1;
+          }
           this.stPar = st;
           this.area = area;
           this.recordPar = record;
+          this.modal2Visible = false;
           this.visibleShowModal3 = true;
         }, 
         showModal4() {//加班导出选择框