Merge remote-tracking branch 'origin/master'

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

@@ -52,7 +52,7 @@
                   <el-menu-item index="1-30" v-if="permissions.taskPlanCost" @click="ssl(29)"><p>{{ $t('taskPlanCostReport') }}</p></el-menu-item>
                   <el-menu-item index="1-31" v-if="permissions.reportFTEPlanAll || permissions.reportFTEPlanPart" @click="ssl(30)"><p>FTE计划报表</p></el-menu-item>
                   <el-menu-item index="1-32" v-if="permissions.reportMonthlyFinancialWorkSchedule" @click="ssl(31)"><p>月度财务工时表</p></el-menu-item>
-                  <el-menu-item index="1-33" v-if="permissions.reportAllWorkPlansAwaitingReviewAndStatistics" @click="ssl(32)"><p>日报待审核统计</p></el-menu-item>
+                  <el-menu-item index="1-33" v-if="permissions.reportAllWorkPlansAwaitingReviewAndStatistics" @click="ssl(32)"><p>工作计划待审核统计</p></el-menu-item>
                 </el-submenu>
               </el-menu>
           </el-col>
@@ -906,7 +906,7 @@
                 </el-table-column> -->
             </el-table>
 
-            <!-- 日报待审核统计 -->
+            <!-- 工作计划待审核统计 -->
             <el-table v-if="ins == 10" key="10" border :data="auditRateList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="userName" :label="$t('other.reviewer')" min-width="200" align="center">
                   <template slot-scope="scope" >
@@ -1619,7 +1619,7 @@
             <el-table-column prop="totalTime" align="center" label="工时合计(h)" width="120px"></el-table-column>
           </el-table>
 
-          <!-- 日报待审核统计 -->
+          <!-- 工作计划待审核统计 -->
           <el-table v-if="ins == 32"  key="32" border :data="planPendingReviewList" highlight-current-row v-loading="planPendingReviewLoading" :height="+tableHeight - 1" style="width: 100%;">
             <el-table-column align="name" prop="planHours" label="审核人" ></el-table-column>
             <el-table-column align="department_name" prop="planHours" label="所属部门" ></el-table-column>
@@ -2091,14 +2091,14 @@ export default {
       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'), this.$t('ziXiangMuGongShiChengBenBiao'), this.$t('renWuZhongQiBiao'), this.$t('fteBaoBiao'), this.$t('youXiaoGongShiShuaiBiao'), this.$t('xiangMuFenLeiGongShiZhanBiBiao'), this.$t('fenLeiGongShiMingXiBiao'),
-      this.$t('yuanGongXiangMuJinDuBiao'), this.$t('fenZuHaoYongJinDuBiao'), this.$t('xiangMuHaoYongJinDuBiao'), this.$t('yuanGongRenWuJinDuBiao'), this.$t('xiangMuYuGuGongShiBiao'),this.$t('yuanGongRenWuWanChengQingKuangBiao'), this.$t('taskPlanCostReport'), 'FTE计划报表', '月度财务工时表', '日报待审核统计'],
+      this.$t('yuanGongXiangMuJinDuBiao'), this.$t('fenZuHaoYongJinDuBiao'), this.$t('xiangMuHaoYongJinDuBiao'), this.$t('yuanGongRenWuJinDuBiao'), this.$t('xiangMuYuGuGongShiBiao'),this.$t('yuanGongRenWuWanChengQingKuangBiao'), this.$t('taskPlanCostReport'), 'FTE计划报表', '月度财务工时表', '工作计划待审核统计'],
 
       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'), this.$t('ziXiangMuGongShiChengBenBiao'), this.$t('renWuZhongQiBiao'), this.$t('fteBaoBiao'),this.$t('youXiaoGongShiShuaiBiao'), this.$t('xiangMuFenLeiGongShiZhanBiBiao'), this.$t('fenLeiGongShiMingXiBiao'),
-      this.$t('yuanGongXiangMuJinDuBiao'), this.$t('fenZuHaoYongJinDuBiao'), this.$t('xiangMuHaoYongJinDuBiao'), this.$t('yuanGongRenWuJinDuBiao'), this.$t('xiangMuYuGuGongShiBiao'),this.$t('yuanGongRenWuWanChengQingKuangBiao'), this.$t('taskPlanCostReport'), 'FTE计划报表', '月度财务工时表', '日报待审核统计'],
+      this.$t('yuanGongXiangMuJinDuBiao'), this.$t('fenZuHaoYongJinDuBiao'), this.$t('xiangMuHaoYongJinDuBiao'), this.$t('yuanGongRenWuJinDuBiao'), this.$t('xiangMuYuGuGongShiBiao'),this.$t('yuanGongRenWuWanChengQingKuangBiao'), this.$t('taskPlanCostReport'), 'FTE计划报表', '月度财务工时表', '工作计划待审核统计'],
 
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
@@ -3027,6 +3027,7 @@ export default {
           sl.monthStart= this.monthRange[0]+"-01"
           sl.monthEnd= this.monthRange[1]+"-01"
           sl.area = this.areaName || null
+          sl.userId = this.userId
           sl.departmentId = this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : ''
         } else if(this.ins == 20) {
           fName = this.$t('youXiaoGongShiShuaiBiao') + '.xlsx'
@@ -3113,7 +3114,7 @@ export default {
           }
           sl.projectId = this.proJuctId
         } else if (this.ins == 32) {
-          fName = '日报待审核统计' + '.xlsx';
+          fName = '工作计划待审核统计' + '.xlsx';
           url = "/report/exportTaskPlanNeedCheckStatistics";
           sl.userId = this.userId
           sl.startDate = this.rangeDatas[0]
@@ -4453,27 +4454,27 @@ export default {
         this.getDepartmentsInvolved()
       }else{
       if(e == 9){
-        console.log(this.departmentIdArray);
-        this.userId = null
-        if(this.departmentIdArray.length != 0){
-          let deptid = []
-          for(let i in this.departmentIdArray){
-            deptid.push(this.departmentIdArray[i][this.departmentIdArray[i].length - 1])
-          }
-          // let deptid = this.departmentIdArray[this.departmentIdArray.length - 1]
-          this.selUserList = this.userList.filter(item => {
-            let boo = false
-            for(let i in deptid){
-              if(item.departmentId == deptid[i]){
-                boo = true
-              }
-            }
-            return boo
-            // item.departmentId == deptid
-          })
-        }else{
+        // console.log(this.departmentIdArray);
+        // this.userId = null
+        // if(this.departmentIdArray.length != 0){
+        //   let deptid = []
+        //   for(let i in this.departmentIdArray){
+        //     deptid.push(this.departmentIdArray[i][this.departmentIdArray[i].length - 1])
+        //   }
+        //   // let deptid = this.departmentIdArray[this.departmentIdArray.length - 1]
+        //   this.selUserList = this.userList.filter(item => {
+        //     let boo = false
+        //     for(let i in deptid){
+        //       if(item.departmentId == deptid[i]){
+        //         boo = true
+        //       }
+        //     }
+        //     return boo
+        //     // item.departmentId == deptid
+        //   })
+        // }else{
           this.selUserList = this.userList
-        }
+        // }
       }
       if(e == 10){
         this.proJuctId = ''