提交代码

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -98,6 +98,10 @@ const StringUtil = {
         reportSortScaleTable: false, // 项目分类工时占比表 // 
         reportSortDetailTable: false, // 分类全部工时明细表 // 
         reportSortSectionDetailTable: false, // 分类负责部门工时明细表 //
+        reportStaffProject: true, // 员工项目进度表 //
+        reportProjectConsumptionFirst: true, // 项目耗用进度表1 //
+        reportProjectConsumptionTwo: true, // 项目耗用进度表2 //
+        reportStaffTaskAccomplished: true, // 员工任务完成表 //
 
         // 请假模块
         leaveFil : false, // 请假填报 // 
@@ -251,6 +255,11 @@ const StringUtil = {
         arr[i] == '项目分类工时占比表' ? obj.reportSortScaleTable = true : ''
         arr[i] == '分类全部工时明细表' ? obj.reportSortDetailTable = true : ''
         arr[i] == '分类负责部门工时明细表' ? obj.reportSortSectionDetailTable = true : ''
+
+        arr[i] == '员工项目进度表' ? obj.reportStaffProject = true : ''
+        arr[i] == '项目耗用进度表1' ? obj.reportProjectConsumptionFirst = true : ''
+        arr[i] == '项目耗用进度表2' ? obj.reportProjectConsumptionTwo = true : ''
+        arr[i] == '员工任务完成表' ? obj.reportStaffTaskAccomplished = true : ''
     }
     return obj
   }

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

@@ -43,7 +43,10 @@
                   <el-menu-item index="1-21" v-if="permissions.reportEfficent"  @click="ssl(20)"><p>有效工时率表</p></el-menu-item>
                   <el-menu-item index="1-22" v-if="permissions.reportSortScaleTable" @click="ssl(21)"><p>项目分类工时占比表</p></el-menu-item>
                   <el-menu-item index="1-23" v-if="permissions.reportSortDetailTable || permissions.reportSortSectionDetailTable" @click="ssl(22)"><p>分类工时明细表</p></el-menu-item>
-                  <!-- <el-menu-item index="1-12"><p @click="ssl(11)">人员工时统计表</p></el-menu-item> -->
+                  <el-menu-item index="1-24" v-if="permissions.reportStaffProject" @click="ssl(23)"><p>员工项目进度表</p></el-menu-item>
+                  <el-menu-item index="1-25" v-if="permissions.reportProjectConsumptionFirst" @click="ssl(24)"><p>项目耗用进度表1</p></el-menu-item>
+                  <el-menu-item index="1-26" v-if="permissions.reportProjectConsumptionTwo" @click="ssl(25)"><p>项目耗用进度表2</p></el-menu-item>
+                  <el-menu-item index="1-27" v-if="permissions.reportStaffTaskAccomplished" @click="ssl(26)"><p>员工任务完成表</p></el-menu-item>
                 </el-submenu>
               </el-menu>
           </el-col>
@@ -1315,6 +1318,7 @@ export default {
   props: {},
   data() {
     return {
+      
       efficentList:[],
       groupNames: [],
       taskgroupList: [],
@@ -1371,13 +1375,15 @@ export default {
       this.$t('pojectbalancesheetincomestatement'),this.$t('customerprojectprofitstatement'),this.$t('projectphasetimesheet'),
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('statisticsofstafffillingintimerate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
-      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao'), '子项目工时成本表', '任务重启表', 'FTE报表', '有效工时率表', '项目分类工时占比表', '分类工时明细表'],
+      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao'), '子项目工时成本表', '任务重启表', 'FTE报表', '有效工时率表', '项目分类工时占比表', '分类工时明细表',
+      '员工项目进度表', '项目耗用进度表1', '项目耗用进度表2', '员工任务完成表'],
 
       shuzArr: [this.$t('projectreport'),this.$t('projectTaskReport'),this.$t('projectcoststatement'),
       this.$t('projectbalancesheet'),this.$t('customerprojectincomestatement'),this.$t('projectphasetimesheet'),
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('employeereporttimelinessrate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
-      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao'), '子项目工时成本表', '任务重启表', 'FTE报表','有效工时率表', '项目分类工时占比表', '分类工时明细表'],
+      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao'), '子项目工时成本表', '任务重启表', 'FTE报表','有效工时率表', '项目分类工时占比表', '分类工时明细表',
+      '员工项目进度表', '项目耗用进度表1', '项目耗用进度表2', '员工任务完成表'],
 
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
@@ -1599,6 +1605,10 @@ export default {
       if(this.permissions.reportEfficent) {this.ssl(20);this.defaultActive = '1-21';return} else
       if(this.permissions.reportSortScaleTable) {this.ssl(21);this.defaultActive = '1-22';return} else
       if(this.permissions.reportSortDetailTable || this.permissions.reportSortSectionDetailTable) {this.ssl(22);this.defaultActive = '1-23';return} else
+      if(this.permissions.reportStaffProject) {this.ssl(23);this.defaultActive = '1-24';return} else
+      if(this.permissions.reportProjectConsumptionFirst) {this.ssl(24);this.defaultActive = '1-25';return} else
+      if(this.permissions.reportProjectConsumptionTwo) {this.ssl(25);this.defaultActive = '1-26';return} else
+      if(this.permissions.reportStaffTaskAccomplished) {this.ssl(26);this.defaultActive = '1-27';return} else
       {this.allWrong = false}
     },
     rowspan(spanArr,position,spanName){
@@ -1849,6 +1859,7 @@ export default {
                 this.getGroupWorktimeAll()
             },
             getList(e) {
+              let noUserList = [16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
               if(this.ins == 15) {
                 this.rangeDatas = null
               } else if(!e){
@@ -1883,8 +1894,8 @@ export default {
                 }else if(this.ins == 12){
                   this.groupWorktimeList.left = []
                   this.groupWorktimeList.right = []
-                    this.getGroupWorktimeList()
-                    this.getGroupWorktimeAll()
+                  this.getGroupWorktimeList()
+                  this.getGroupWorktimeAll()
                 }else if(this.ins == 13){
                   this.getOutputValueList()
                 } else if(this.ins == 14) {
@@ -1904,9 +1915,11 @@ export default {
                 } else if (this.ins == 20) {
                   this.getEffectiveLaborHourRate();
                 }
-                if(this.ins != 16 && this.ins != 17 && this.ins != 18 && this.ins != 19 && this.ins != 20 && this.ins != 21 && this.ins != 22) {
+
+                if(!noUserList.includes(this.ins)) {
                   this.getUserList()
                 }
+
                 if(this.ins == 21) {
                   this.getProjectWoekScale()
                 }