2022.9.8

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -774,7 +774,7 @@
                 // this.customDegreeName = this.timeType.customDegreeName
             },
             initTime() {
-                for (var i=1.0; i<=12.0; i+=0.5) {
+                for (var i=1.0; i<=20.0; i+=0.5) {
                    this.times.push(i);
                    if ( i <= 6) {
                        this.halfTime.push(i);
@@ -1091,6 +1091,10 @@
             };
         },
         mounted() {
+            this.timeRange = []
+            for(let i=0.5; i<=20; i+=0.5){
+                this.timeRange.push(i)
+            }
             this.initTime();
             this.getCompanyTimeSetting();
             this.getRestList()

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

@@ -1458,7 +1458,7 @@
                 timeFields:['timeType', 'workingTime', 'startTime', 'progress'],
                 subProjectList:[],
                 canEdit: true,
-                timeRange:[0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,8.0,8.5,9.0,9.5,10.0,10.5,11.0,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0],
+                timeRange:[0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,8.0,8.5,9.0,9.5,10.0,10.5,11.0,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0],
                 selectTime:null,
                 reportTimeType:{},
                 curDate:'',

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

@@ -1658,6 +1658,10 @@ import timetoolVue from '../timetool/timetool.vue';
         },
         
         mounted() {
+            this.timeRange = []
+            for(let i=0.5; i<=20; i+=0.5){
+                this.timeRange.push(i)
+            }
             // console.log('user',this.user)
             var ua = navigator.userAgent.toLowerCase();
             this.isIOSystem = this.isIOS();

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

@@ -1743,6 +1743,10 @@
         },
         
         mounted() {
+            this.timeRange = []
+            for(let i=0.5; i<=20; i+=0.5){
+                this.timeRange.push(i)
+            }
             this.getDateRange()
             // if(user.companyId == '817')
             // console.log('userId',this.user.companyId);