Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -97,6 +97,7 @@ const StringUtil = {
         reportEfficent: false, // 有效工时率 // 
         reportSortScaleTable: false, // 项目分类工时占比表 // 
         reportSortDetailTable: false, // 分类全部工时明细表 // 
+        reportSortSectionDetailTable: false, // 分类负责部门工时明细表 //
 
         // 请假模块
         leaveFil : false, // 请假填报 // 
@@ -249,6 +250,7 @@ const StringUtil = {
 
         arr[i] == '项目分类工时占比表' ? obj.reportSortScaleTable = true : ''
         arr[i] == '分类全部工时明细表' ? obj.reportSortDetailTable = true : ''
+        arr[i] == '分类负责部门工时明细表' ? obj.reportSortSectionDetailTable = true : ''
     }
     return obj
   }

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

@@ -42,7 +42,7 @@
                   <el-menu-item index="1-20" v-if="permissions.reportFTEAll || permissions.reportFTEPart" @click="ssl(19)"><p>FTE报表</p></el-menu-item>
                   <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" @click="ssl(22)"><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-submenu>
               </el-menu>
@@ -981,7 +981,7 @@
 
             <!-- 分类工时明细表 -->
             <el-table  v-if="ins == 22" :key="hoursDetailClassListKey" border :data="hoursDetailClassList.record" highlight-current-row v-loading="listLoading" :height="+tableHeight -1" style="width: 100%;" >
-              <el-table-column align="center" prop="categoryName" label="生产项目号" min-width="150"></el-table-column>
+              <el-table-column align="center" prop="categoryName" :label="`${projectSortName}项目号`" min-width="150"></el-table-column>
               <el-table-column align="center" prop="userName" label="姓名" min-width="150">
                 <template slot-scope="scope">
                   <div>
@@ -1017,7 +1017,7 @@
               </el-table-column>
 
               <el-table-column align="center" prop="allWorkingTime" label="总工时" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="targetWorkingTime" label="生产工时" min-width="150"></el-table-column>
+              <el-table-column align="center" prop="targetWorkingTime" :label="`${projectSortName}工时`" min-width="150"></el-table-column>
 
               <!-- 渲染日期 -->
               <el-table-column align="center" :label="item.titleName" min-width="150" v-for="(item, index) in hoursDetailClassList.header" :key="index">
@@ -1465,6 +1465,7 @@ export default {
       hoursDetailClassListKey: 500,
       dateSelect: '', // 日期选择
       projectSortId: '', // 项目分类选中的id
+      projectSortName: '', // 项目分类选中的Name
       projectSortList: [], // 项目分类
     };
   },
@@ -1566,7 +1567,7 @@ export default {
       if(this.permissions.reportFTEAll || this.permissions.reportFTEPart) {this.ssl(19);this.defaultActive = '1-20';return} else
       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.ssl(22);this.defaultActive = '1-23';return} else
+      if(this.permissions.reportSortDetailTable || this.permissions.reportSortSectionDetailTable) {this.ssl(22);this.defaultActive = '1-23';return} else
       {this.allWrong = false}
     },
     rowspan(spanArr,position,spanName){
@@ -3075,6 +3076,8 @@ export default {
         this.getProjectWoekScale()
       }
       if(this.ins == 22) {
+        this.projectSortName = this.projectSortList.filter((item) => item.id == this.projectSortId)[0].name
+        console.log(this.projectSortName)
         this.getHoursDetailClass()
       }
     },
@@ -3389,6 +3392,7 @@ export default {
       dataList.push({id: 'null', name: '未分类'})
       this.projectSortList = dataList
       this.projectSortId = dataList[0].id
+      this.projectSortName = dataList[0].name
     }
   },
 };