分段打卡显示

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -101,7 +101,9 @@
       <a-table class="j-table-force-nowrap" ref="table" size="middle" bordered rowKey="pkId" :columns="columns"
         :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange" :scroll="{ x: 2500, y: 600 }">
-
+        <span slot="customTime" slot-scope="text, record, index">
+           <span v-if="text != null ">{{text.slice(10)}}</span>
+        </span>
         <a-badge slot="latetimeState" slot-scope="text, record, index">
           
          <!-- <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0
@@ -238,20 +240,53 @@
             dataIndex: 'threeDept'
           },
           {
-            title: '最早打卡时间',
+            title: '最早',
             align: 'center',
-            dataIndex: 'gotoTime'
+            dataIndex: 'gotoTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
           },
-          // {
-          //   title: '下班时间',
-          //   align: 'center',
-          //   dataIndex: 'shiftTimeX'
-          // },
           {
-            title: '最晚打卡时间',
+            title: '最晚',
             align: 'center',
-            dataIndex: 'closingTime'
-          }, {
+            dataIndex: 'closingTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
+            title: '上班1',
+            align: "center",
+            dataIndex: 'oneTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
+            title: '下班1',
+            align: "center",
+            dataIndex: 'twoTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },{
+            title: '上班2',
+            align: "center",
+            dataIndex: 'threeTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
+            title: '下班2',
+            align: "center",
+            dataIndex: 'fourTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
             title: '打卡次数',
             align: 'center',
             dataIndex: 'attendanceCount', width: 100
@@ -318,12 +353,12 @@
           },
           {
             title: '请假开始时间',
-            align: 'center',
+            align: 'center',width: 160,
             dataIndex: 'holidayStartDate'
           },
           {
             title: '请假结束时间',
-            align: 'center',
+            align: 'center',width: 160,
             dataIndex: 'holidayEndDate'
           },
           {

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -62,10 +62,11 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        @change="handleTableChange" :scroll="{ x: 1000, y: 550 }">
+        @change="handleTableChange" :scroll="{ x: 1600, y: 550 }">
 
         <span slot="ShiftTime" slot-scope="text, record, index">
            {{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
+            <span v-if="record.shiftRealTime2S != null "><br/>{{record.shiftRealTime2S}} - {{record.shiftRealTime2X}}</span>
         </span>
         <span slot="customTime" slot-scope="text, record, index">
            <span v-if="text != null ">{{text.slice(10)}}</span>
@@ -269,7 +270,7 @@
         columns: [{
             title: '日期',
             align: "center",
-            dataIndex: 'viewDate'
+            dataIndex: 'viewDate', fixed: 'left', width: 100
           },
           {
             title: '星期',
@@ -294,7 +295,7 @@
             scopedSlots: {customRender: 'shiftType'},
           },
           {
-            title: '最早打卡时间',
+            title: '最早',
             align: "center",
             dataIndex: 'gotoTime',
             scopedSlots: {
@@ -302,12 +303,42 @@
             }
           },
           {
-            title: '最迟打卡时间',
+            title: '最晚',
             align: "center",
             dataIndex: 'closingTime',
             scopedSlots: {
               customRender: 'customTime'
             }
+          },{
+            title: '上班1',
+            align: "center",
+            dataIndex: 'oneTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
+            title: '下班1',
+            align: "center",
+            dataIndex: 'twoTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },{
+            title: '上班2',
+            align: "center",
+            dataIndex: 'threeTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
+          },
+          {
+            title: '下班2',
+            align: "center",
+            dataIndex: 'fourTime',
+            scopedSlots: {
+              customRender: 'customTime'
+            }
           },
           {
             title: '打卡次数',