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

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

@@ -4445,6 +4445,16 @@
                             })
                         })
             },
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
+            // 1
             getWeeklyWorkTime(){ //按周填报获取已填工时
                 let dateStr = []
                         for(let i in this.zhoData){
@@ -4463,6 +4473,8 @@
                                         let datem = new Date(this.zhoData[m].zhoDataTime)
                                         if(datei[0] == datem.getFullYear() && datei[1] == (datem.getMonth() + 1) && datei[2] == datem.getDate()){
                                             this.$set(this.zhoData[m],'filledTime',res.data[i].workingTime)
+                                            let reportTimes = res.data[i].startTime.split(',')
+                                            this.$set(this.zhoData[m],'reportTimes',reportTimes)
                                         }
                                     }
                                 }
@@ -4634,6 +4646,15 @@
                                 alp.push(objs)
                             } 
                         }
+                        if(zhis.reportTimes){
+                            for(let k in zhis.reportTimes){
+                                let objs = {}
+                                objs.s = zhis.reportTimes[k].split('-')[0]
+                                objs.e = zhis.reportTimes[k].split('-')[1]
+                                alp.push(objs)
+                            }
+                        }
+                        
                         this.dateAr = alp
                         if(this.dateAr.length > 0) {
                             let trus = this.fns()