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

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -1038,8 +1038,13 @@ export default {
                 this.canAddTask = res.data.canAddTask
 
                 this.recentProgressInfo = res.data.progress;
+                
+                if(res.data.executorList.length > 0) {
+                    this.addForm.executorListFront = res.data.executorList;
+                } else {
+                    this.addForm.executorListFront = [{executorId: null, planHours: 8}];
+                }
 
-                this.addForm.executorListFront = res.data.executorList;
 
                 this.gstimday = []
                 this.gstimhour = []

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

@@ -2709,33 +2709,24 @@
                 var zhi = ''
                 for(var i in sl) {
                     for(var j in sl[i].worktimeList){
+                        let addUp = 0
                         if(sl[i].worktimeList[j].startTime && sl[i].worktimeList[j].endTime) {
-                            // var date2 = '2021/12/12 ' + sl[i].worktimeList[j].endTime +':00'
-                            // var date1 = '2021/12/12 ' + sl[i].worktimeList[j].startTime +':00'
-                            // var date3 = new Date(date2).getTime() - new Date(date1).getTime();
-                            // var leave1=date3%(24*3600*1000)
-                            // var hours=Math.floor(leave1/(3600*1000))
-                            // var leave2=leave1%(3600*1000)
-                            // var minutes=Math.floor(leave2/(60*1000))
-                            // var shi = hours+'.'+ minutes
-                            // var sll = +shi + 0
-                            // zhi = this.jsDay * sll
-                            // quanbu = +quanbu + zhi
                             let selectionTime = this.getHour(sl[i].worktimeList[j].startTime, sl[i].worktimeList[j].endTime)
                             let subtractedData = 0
                             console.log(selectionTime)
                             let arr = JSON.parse(JSON.stringify(this.vacationTime))
                             arr.unshift({s: sl[i].worktimeList[j].startTime, e: sl[i].worktimeList[j].endTime})
-                            console.log(arr, '要看的数据')
-
                             for(var j in arr) {
                                 subtractedData += +this.timeOverlap(j, arr)
                             }
-                            console.log(subtractedData, '要减去的数据')
-                            quanbu = +selectionTime - +subtractedData
-                            console.log(quanbu, '赋值的数据')
-                            console.log(this._computedWatchers.totalReportHours)
-                            // this.workForm.domains = JSON.parse(JSON.stringify(this.workForm.domains))
+                            if(this.reportTimeType.multiWorktime == 1) {
+                                addUp = +selectionTime - +subtractedData
+                            } else {
+                                quanbu = +selectionTime - +subtractedData
+                            }
+                        }
+                        if(this.reportTimeType.multiWorktime == 1) {
+                            quanbu += addUp
                         }
                     }
                 }
@@ -5224,16 +5215,6 @@
                     var he = 0
                     for(var i in zhi) {
                         if(zhi[i].time && zhi[i].time.length > 0  && i != 'zhoDataTime' && i != 'he') {
-                            // var date2 = '2021/12/12 ' + zhi[i].time[1] +':00'
-                            // var date1 = '2021/12/12 ' + zhi[i].time[0] +':00'
-                            // var date3 = new Date(date2).getTime() - new Date(date1).getTime();
-                            // var leave1=date3%(24*3600*1000)
-                            // var hours=Math.floor(leave1/(3600*1000))
-                            // var leave2=leave1%(3600*1000)
-                            // var minutes=Math.floor(leave2/(60*1000))
-                            // var shi = hours+'.'+ minutes
-                            // he += +shi
-                            // let selectionTime = this.getHourMinutes(zhi[i].time[0], zhi[i].time[1])
                             let selectionTime = this.getHour(zhi[i].time[0], zhi[i].time[1])
                             let subtractedData = 0
                             // he += +this.getHour(zhi[i].time[0], zhi[i].time[1])

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

@@ -8,7 +8,7 @@
         <van-grid :column-num="3">
             <van-grid-item v-for="(item,index) in routers" :key="index" :icon="item.icon" :text="item.name" 
             :info="(item.name=='消息记录'&&unreadNum>0)?unreadNum:''"
-            :to="item.url">
+            :to="item.url" @click="pfdClick(item)">
             </van-grid-item>
         </van-grid>
         <!-- <div class="tip"  v-if="isCorpWX">
@@ -99,6 +99,24 @@
             Footer
         },
         methods: {
+            pfdClick(item) {
+                if(item.name == '使用说明') {
+                    let url = 'http://celiang.oss-cn-hangzhou.aliyuncs.com/measurement/2022-01/18/75it6phpocqYFV1642488558220118.pdf'
+                    let name = '使用说明书'
+                    // 将要传过去的值
+                    this.previewPDF(url, name)
+                }
+            },
+            // 预览pdf
+            previewPDF(url, name) {
+                this.$router.push({
+                    path:  '/pdf',
+                    query: {
+                        url: '',
+                        name: name
+                    }
+                })
+            },
             // 图片预览
             previewPicture() {
                 let that = this
@@ -106,7 +124,8 @@
                     'https://mobworktime.ttkuaiban.com/upload/b9cf863819924106a65255ccffae446d.png',
                     'https://mobworktime.ttkuaiban.com/upload/65afcaed7ad84c51a309db69c888fe6c.png',
                     'https://mobworktime.ttkuaiban.com/upload/3452d33a68bb4092b04147e5482fd0e9.png',
-                    'https://mobworktime.ttkuaiban.com/upload/af5b430f48b24b2683fb48a43deab98c.png'
+                    'https://mobworktime.ttkuaiban.com/upload/af5b430f48b24b2683fb48a43deab98c.png',
+                    'https://mobworktime.ttkuaiban.com/upload/b69779d86be44ef3a1d3585816fde5f3.png'
                 ]
                 ImagePreview({
                     images: arr,
@@ -218,6 +237,16 @@
                                     icon: 'todo-list-o',
                                     info: this.unreadNum
                                 });
+                
+                // 针对超级管理员加使用说明
+                if(this.user.roleName == '超级管理员') {
+                    this.routers.push(
+                    {
+                        name: '使用说明',
+                        // url: '/',
+                        icon: 'todo-list-o'
+                    });
+                }
             },
 
             // 获取企业微信参数