计算请假时间修改

zjugis-business/src/main/resources/templates/Leave/index.ftl

@@ -4,6 +4,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
         <div class="z-form-row" style="display: none;">
             <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+            <input type="text" value="${formEntity.leaveHours!}" name="createReqVO$leaveHours">
             <input type="text" value="${timeObject!}" id="timeObject">
         </div>
         <div class="form-title" style="margin-top: 0px;">

zjugis-business/src/main/resources/templates/Leave/js/index.js

@@ -148,7 +148,7 @@
         }
       }
     }
-    let sum = 0 //总天数
+    let sum = 0 //总小时
     for (let i = 0; i < timesCopy.length; i++) {
       let startTime = moment(timesCopy[i].startAll).unix();
       let endTime = moment(timesCopy[i].endAll).unix();
@@ -168,12 +168,13 @@
         }
       }
     }
-
-    if (String(sum).indexOf('.') > -1) {
+    let days = sum /7.5;
+    if (String(days).indexOf('.') > -1) {
       //有小数的话保留两位小数
-      sum = sum.toFixed(2)
+      days = days.toFixed(2)
     }
-    z.ui.input("[name='createReqVO$leaveDays']").setValue(sum);
+    $("[name='createReqVO$leaveHours']").val(sum);
+    z.ui.input("[name='createReqVO$leaveDays']").setValue(days);
   }
 
   function getDate() {

zjugis-business/src/main/resources/templates/Leave/js/leaveTimeAuth.js

@@ -24,7 +24,7 @@ function leaveTimes(startTime, endTime) {
       //减去午休时间
       hours = hours - 1
     }
-    returnNum = hours / 7.5
+    returnNum = hours
   } else {
     let s = moment(time1)
     let d = moment(time2)
@@ -47,7 +47,7 @@ function leaveTimes(startTime, endTime) {
       }
       sum += isTimesWx(one, two)
     }
-    returnNum = sum / 7.5
+    returnNum = sum
   }
   return returnNum
 }