Browse Source

调整加班情况统计表的bug

Lijy 3 years ago
parent
commit
4c2d81d433

+ 2 - 0
fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -43,6 +43,7 @@ const StringUtil = {
         reportProfits : false, // 客户项目利润表 // 
         reportPhase : false, // 项目阶段工时表 // 
         reportOvertime : false, // 加班情况统计表 //
+        reportCost: false, // 查看加班成本 //
 
         // 请假模块
         leaveFil : false, // 请假填报 // 
@@ -121,6 +122,7 @@ const StringUtil = {
         arr[i] == '出差统计' ? obj.awayOfficeStatistical = true : ''
         arr[i] == '出差流程设置' ? obj.awayOfficeProcess = true : ''
         arr[i] == '管理专业证书' ? obj.structureCertificate = true : ''
+        arr[i] == '查看加班成本' ? obj.reportCost = true : ''
     }
 
     return obj

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -298,8 +298,8 @@
                 <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"></el-table-column> 
-                <el-table-column prop="cost" label="操作" width="180">
+                <el-table-column prop="cost" label="成本" width="180" v-if="permissions.reportCost"></el-table-column> 
+                <el-table-column prop="cost" label="操作" width="180" v-if="permissions.reportCost">
                     <template slot-scope="scope">
                       <div>
                         <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -461,7 +461,7 @@
                     highlight-current-row
                     v-loading="listLoading"
                     style="width: 100%;margin-top:10px;"
-                    @row-click.stop.native="relationTaskClick">
+                    @row-click="relationTaskClick">
                         <el-table-column prop="taskStatus" label="完成" width="50" >
                             <template slot-scope="scope">
                                 <el-checkbox :disabled="scope.row.taskStatus==2" :checked="scope.row.taskStatus==1?true:false" size="large" class="cb" @change="relationFinishTask(scope.row)" @click.stop.native=""></el-checkbox>