加班情况统计表调整

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -305,10 +305,16 @@
                   </el-select>
                 </div>
               </div>
-              <el-table v-if="ins == 6" :key="ins" border :data="overTimeList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
+              <el-table v-if="ins == 6" :key="ins" border :data="overTimeList" highlight-current-row v-loading="listLoading" :height="tableHeight - 30" style="width: 100%;">
+                <!-- <el-table-column prop="projectCode" label="序号" width="180">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.$index + 1}}
+                    </div>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="projectCode" label="项目编号" width="180"></el-table-column> 
                 <el-table-column prop="username" label="姓名" width="180"></el-table-column> 
-                <!-- <el-table-column prop="workingTime" label="加班时长" width="180"></el-table-column>  -->
                 <el-table-column prop="overtimeHours" label="加班时长" width="180"></el-table-column> 
                 <el-table-column prop="cost" label="成本" width="180" v-if="permissions.reportCost"></el-table-column> 
                 <el-table-column label="操作" width="180">
@@ -317,7 +323,23 @@
                         <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>
                       </div>
                     </template>  
-                </el-table-column> 
+                </el-table-column>  -->
+                <el-table-column prop="projectCode" label="序号" width="120">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.$index + 1}}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="projectCode" label="项目编号" width="220"></el-table-column>
+                <el-table-column prop="projectName" label="项目名称" width="220"></el-table-column>
+                <el-table-column prop="degreeName" :label="user.timeType.customDegreeName" width="180" v-if="user.timeType.customDegreeActive == 1"></el-table-column>
+                <el-table-column prop="username" label="姓名" width="180"></el-table-column>
+                <el-table-column prop="departmentName" label="部门" width="180"></el-table-column>
+                <el-table-column prop="createDate" label="工作日期" width="180"></el-table-column>
+                <el-table-column prop="workingTime" label="工作时长(h)" width="180" fixed="right"></el-table-column>
+                <el-table-column prop="overtimeHours" label="加班时长(h)" width="180" fixed="right"></el-table-column>
+                <el-table-column prop="cost" label="加班成本" width="180" v-if="permissions.reportCost"></el-table-column>
               </el-table>
             </div>
             
@@ -550,7 +572,7 @@ export default {
   watch: {},
   created() {
     let height = window.innerHeight;
-    this.tableHeight = height - 175;
+    this.tableHeight = height - 200;
     const that = this;
     window.onresize = function temp() {
         that.tableHeight = window.innerHeight - 175;