2022.7.11 bug修改

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -30,6 +30,7 @@ const StringUtil = {
         reportsDeleteAll: false, // 删除全公司日报
         importReport: false, //导入工时lij
         reportsDept: false, //查看本部门工时
+        reportBatch: false, //批量填报
 
         // 财务核算成本 
         financialCustom: false, // 自定义薪资项 // 
@@ -154,6 +155,7 @@ const StringUtil = {
         arr[i] == '查看工时统计' ? obj.countHours = true : ''
         arr[i] == '查看成本统计' ? obj.countCost = true : ''
         arr[i] == '项目报表' ? obj.reportProject = true : ''
+        arr[i] == '批量填报' ? obj.reportBatch = true : ''
     }
 
     return obj

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -89,7 +89,7 @@
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">填写日报</el-link>
                             <el-link v-if="reportTimeType.type != 0" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportss()">按周填报</el-link>
                             <el-link type="primary" v-if="permissions.reportsFillOut" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,2)">代填日报</el-link>
-                            <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,1)">批量填报</el-link>
+                            <el-link type="primary" v-if="permissions.reportBatch" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,1)">批量填报</el-link>
                             <el-link type="primary" v-if="permissions.importReport || user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="imports()">工时导入</el-link>
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="showExportDialog">导出日报</el-link>
                             <!--部门负责人给个导出工时的功能 -->

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

@@ -731,8 +731,13 @@
             // 选择日期后触发
             dataTimes() {
                 // console.log(this.dataTime)
-                this.search.startDate = this.dataTime[0]
-                this.search.endDate = this.dataTime[1]
+                if(this.dataTime){
+                    this.search.startDate = this.dataTime[0]
+                    this.search.endDate = this.dataTime[1]
+                }else{
+                    this.search.startDate = null
+                    this.search.endDate = null
+                }
                 this.getList()
             }
         },