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

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -55,6 +55,7 @@ const StringUtil = {
         reportBatch: false, //批量填报
         reportExport: false, //日报导出
         reportPush: false, //手动推送工时
+        reportHideWorkingHours: false, // 隐藏工时数 //
 
         // 财务核算成本 
         financialCustom: false, // 自定义薪资项 // 
@@ -309,6 +310,8 @@ const StringUtil = {
         arr[i] == '查看他人审核文件' ? obj.viewFilesReviewedByOthers = true : ''
         arr[i] == '全部项目任务工时填报及时表' ? obj.reportAllTimelyTaskHours = true : ''
         arr[i] == '部分项目任务工时填报及时表' ? obj.reportRartTimelyTaskHours = true : ''
+
+        arr[i] == '隐藏工时数' ? obj.reportHideWorkingHours = true : ''
     }
     return obj
   }

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -370,7 +370,7 @@
 
                     <!-- 常规选择时间的方式 -->
                     <!-- 全天上下午模式 -->
-                    <div v-if="reportTimeType.multiWorktime == 0">
+                    <div v-if="reportTimeType.multiWorktime == 0 && (hideWorkingHours && item.canEdit)">
                         <van-field v-if="reportTimeType.type < 2" readonly clickable :disabled="!item.canEdit"
                             :value="reportTimeType.type == 0 ? item.label : (parseFloat(item.workingTime).toFixed(1) + 'h')"
                             label="工作时长" placeholder="请选择工作时长(小时)" @click="clickTimePicker(index, item)"
@@ -428,7 +428,7 @@
                     </div>
 
                     <!-- 多个时间和工作事项的选择方式 -->
-                    <div v-if="reportTimeType.multiWorktime == 1">
+                    <div v-if="reportTimeType.multiWorktime == 1 && (hideWorkingHours && item.canEdit)">
                         <div v-for="(timeItem, tindex) in item.worktimeList" :key="tindex"
                             style="position:relative;border:#ccc 0.5px solid;margin:7px;">
                             <van-tag v-if="tindex > 0 && item.canEdit"
@@ -480,7 +480,7 @@
                     </div>
 
                     <div class="overtime"
-                        v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX && canEdit))">
+                        v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX && canEdit)) && (hideWorkingHours && item.canEdit)">
                         <div class="overTimeClas"
                             v-if="user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)">
                             <van-checkbox :disabled="!item.canEdit" v-model="item.isOvertime"
@@ -752,7 +752,8 @@ export default {
 
             showAddMore: false,
             businessTripsArray: [],
-            doYouWantToDisplayTheWorkOrder: true
+            doYouWantToDisplayTheWorkOrder: true,
+            hideWorkingHours: false
         };
     },
 
@@ -3142,6 +3143,13 @@ export default {
 
         this.today = this.format(new Date(), 'yyyy-MM-dd')
         this.timeRange = []
+        const { functionList } = this.user
+        for (let i in functionList) {
+            if(functionList[i].name == '隐藏工时数') {
+                this.hideWorkingHours = true
+            }
+        }
+
         let i = 0.0; 
         while(true) {
             if (i < 48) {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue

@@ -69,7 +69,7 @@
                                 <span style="margin-right:20px;margin-left:5px;font-size:14px;">
                                     <span v-if="user.timeType.showCorpwxCardtime" :style="item.cardTime !=item.reportTime?'color:#ff0000;':''">考勤时长:{{item.cardTime | amounts}}h</span>
                                     总填报时长：
-                                    <span>{{ parseFloat(item.reportTime).toFixed(1) }}h</span>
+                                    <span>{{ hideWorkingHours ? '*' : parseFloat(item.reportTime).toFixed(1) }}h</span>
                                 </span>
                             </div>
                             <div v-if="user.timeType.enableNewWeeklyfill == 1 && item.summary != null" style="margin-left:20px;"
@@ -155,9 +155,9 @@
                                         <span v-if="item1.reportTimeType == 0" style="margin-right:10px;">{{
                                             fullDayTxt[item1.timeType] }}</span>
                                         <span v-if="item1.reportTimeType == 2" style="margin-right:10px;">{{ item1.startTime + '-' +
-                                            item1.endTime }}</span>{{ item1.time.toFixed(1) }}h
+                                            item1.endTime }}</span>{{ hideWorkingHours ? '*' : item1.time.toFixed(1) }}h
                                         <div class="button" v-if="item1.isOvertime == 1">加班<span v-if="item1.overtimeHours">{{
-                                            item1.overtimeHours.toFixed(1) }}h</span></div>
+                                            hideWorkingHours ? '*' : item1.overtimeHours.toFixed(1) }}h</span></div>
                                     </div>
                                     <div class="project_time" v-else>用时占比：
                                         {{ item1.progress }}%
@@ -167,9 +167,9 @@
 
                                 </div>
                                 <div v-if="item1.multiWorktime == 1">
-                                    <div>项目时长：<span style="margin-right:10px;">{{ item1.time.toFixed(1) }}h</span>
+                                    <div>项目时长：<span style="margin-right:10px;">{{ hideWorkingHours ? '*' : item1.time.toFixed(1) }}h</span>
                                         <div class="button" v-if="item1.isOvertime == 1">加班<span v-if="item1.overtimeHours">{{
-                                            item1.overtimeHours.toFixed(1) }}h</span></div>
+                                            hideWorkingHours ? '*' : item1.overtimeHours.toFixed(1) }}h</span></div>
                                     </div>
                                     <div style="position:relative;border:#ccc 0.5px solid;padding:3px;margin:5px 0px;"
                                         v-for="(timeItem, index) in item1.worktimeList" :key="index">
@@ -323,7 +323,8 @@ export default {
                 label: 'label'
             },
             reportsCompany: false,
-            reportsDept: false
+            reportsDept: false,
+            hideWorkingHours: false
         };
     },
     created() {
@@ -331,6 +332,9 @@ export default {
     filters:{
         // 过滤
         amounts(value) {
+            if(value == '*') {
+                return '*'
+            }
             if(value == NaN || value == undefined || value == 'undefined' || value == null || value == 'null') {
                 return 0
             }
@@ -577,6 +581,9 @@ export default {
             if (functionList[i].name == '查看本部门工时') {
                 this.查看本部门工时 = true
             }
+            if(functionList[i].name == '隐藏工时数') {
+                this.hideWorkingHours = true
+            }
         }
         this.getReport();
         this.getUsers()