文件更新

js/attendmanage/atsTripBillBatchNewEditEx.js

@@ -20,8 +20,13 @@ shr.defineClass("shr.ats.atsTripBillBatchNewEditEx", shr.ats.atsTripBillBatchNew
         var cal_days = _self.calculataTripDays(rowid);
         if (cal_days != null && cal_days >= 0) {
             $("#entries").jqGrid("setCell", rowid, "tripDays", cal_days);
-            var trip_time = Math.ceil(cal_days * 7);
-            $("#entries").jqGrid("setCell", rowid, "triptime", trip_time);
+            var triptime = 0;
+                if(cal_days == 0.29 || cal_days == 0.43 || cal_days == 0.86){
+                    triptime = Math.floor( cal_days * 7 );
+                }else{
+                    triptime = Math.ceil( cal_days * 7 );
+                }
+                $("#entries").jqGrid("setCell", rowid, "triptime", triptime);
         }
         var flag = false;
         if (cellname == "tripStartTime") {

js/attendmanage/atsTripBillEditEx.js

@@ -14,9 +14,16 @@ shr.defineClass("shr.ats.AtsTripBillEditEx", shr.ats.AtsTripBillEdit, {
                 that.getEndTime();
             }
             //计算总时间 定制 向上取整
-            var totalTime = $("#entries_tripDays").val() * 7 ;
-               $("#entries_triptime").shrTextField("setValue", Math.ceil(totalTime));
-        });
+            var dayVal = $("#entries_tripDays").val()  ;
+            var triptime = 0;
+            if(dayVal == 0.29 || dayVal == 0.43 || dayVal == 0.86){
+                triptime = Math.floor( dayVal * 7 );
+              }else{
+                triptime = Math.ceil( dayVal * 7 );
+              }
+            
+             $("#entries_triptime").shrTextField("setValue", triptime);
+        }); 
 
          
 

mbos/我要出差.js

@@ -275,8 +275,15 @@ _this.pageinit = function () {
     }
 
     //202412  向上取整
-    var triptime = mbos('entries_tripDays', event.index).value() * 7;
-    mbos('entries_triptime', event.index).value(Math.ceil(triptime));
+    var  dayVal =  mbos('entries_tripDays', event.index).value();
+    var triptime = 0;
+      if(dayVal == 0.29 || dayVal == 0.43 || dayVal == 0.86){
+        triptime = Math.floor( dayVal * 7 );
+      }else{
+        triptime = Math.ceil( dayVal * 7 );
+      }
+    
+    mbos('entries_triptime', event.index).value(triptime);
     
   }
           

mbos/我要出差_查看.js

@@ -22,7 +22,14 @@ mbos('page').bind('afterLoad', function () {
     // 是否展示弹性算时长字段
     ////202412  向上取整
     var olddays =(mbos('timeLengthValue', index).value()).toFixed(_this.decimal);
-    var resultval = Math.ceil(olddays * 7); 
+    var resultval = 0;
+ 
+      if(olddays == 0.29 || olddays == 0.43 || olddays == 0.86){
+        resultval = Math.floor( olddays * 7 );
+      }else{
+        resultval = Math.ceil( olddays * 7 );
+      }
+    
     mbos('entries_isElasticCalLen', index).value() ? mbos('entries_isElasticCalLen', index).show(): mbos('entries_isElasticCalLen', index).hide()
     $('#timeLength_' + index).find('label')[0].innerHTML = resultval + "小时";
     $("[id^='entries_remark'] textarea").attr('rows', 3) // 多行文本 默认3行