|
|
@@ -324,7 +324,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column prop="projectCode" label="序号" width="120">
|
|
|
+ <el-table-column prop="projectCode" label="序号" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
{{scope.$index + 1}}
|
|
|
@@ -334,12 +334,12 @@
|
|
|
<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-column prop="username" label="姓名" width="120"></el-table-column>
|
|
|
+ <el-table-column prop="departmentName" label="部门" width="140"></el-table-column>
|
|
|
+ <el-table-column prop="createDate" label="工作日期" width="120"></el-table-column>
|
|
|
+ <el-table-column prop="workingTime" label="工作时长(h)" width="100"></el-table-column>
|
|
|
+ <el-table-column prop="overtimeHours" label="加班时长(h)" width="100" fixed="right"></el-table-column>
|
|
|
+ <el-table-column prop="cost" label="加班成本" width="80" v-if="permissions.reportCost" fixed="right"></el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
|
Lijy