考勤管理

src/views/oa/salary_management/Attendance/attendanceManagement.vue

@@ -178,9 +178,6 @@
           if(record.type=='考勤表'){
             this.$refs.AttendancelDetail.visible = true
             this.$refs.AttendancelDetail.getTableList(record.id)         
-          }else if(record.type=='加班表'){
-            this.$refs.OvertimeDetail.visible = true
-            this.$refs.OvertimeDetail.detail(record.id)       
           }else if(record.type=='年休表'){
             this.$refs.AnnualLeave.visible = true
             this.$refs.AnnualLeave.detail(record.id)        

src/views/oa/salary_management/Attendance/modules/AttendancelDetail.vue

@@ -82,7 +82,7 @@
                     align: "center",
                     dataIndex: 'orgName',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '工资卡号',
@@ -96,7 +96,7 @@
                     align: "center",
                     dataIndex: 'restMode',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '工时/天',
@@ -145,7 +145,7 @@
                     align: "center",
                     dataIndex: 'fullAttendance',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '养老保险',
@@ -231,6 +231,13 @@
                     ellipsis: true,
                     width:'4%'
                 },
+                {
+                    title: '加班时间(分)',
+                    align: "center",
+                    dataIndex: 'workOvertime',
+                    ellipsis: true,
+                    width:'7%'
+                },
              ]
           }
         },

src/views/oa/salary_management/Attendance/modules/uploadModal.vue

@@ -24,7 +24,6 @@
                             <a-form-model-item label="类型"  prop="totalNum">
                                 <a-select  v-model="formState.type">
                                     <a-select-option value="考勤表">考勤表</a-select-option>
-                                    <a-select-option value="加班表">加班表</a-select-option>
                                     <a-select-option value="年休表">年休表</a-select-option>
                                 </a-select>
                             </a-form-model-item>
@@ -86,7 +85,6 @@
 
             },
             onChange(data){
-                debugger
             },
             beforeUpload(){
                 this.formState.yearWithMonth=moment(this.formState.yearWithMonth).format('YYYY-MM')