Quellcode durchsuchen

延期处理添加0.5天

maotao vor 1 Jahr
Ursprung
Commit
d5492bd89f

+ 6 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -472,7 +472,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
472
         }
472
         }
473
         currentLog = angular.copy(currentLog);
473
         currentLog = angular.copy(currentLog);
474
         if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
474
         if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
475
-            return currentLog.extra1DTO.name+"<br>"+ moment(currentLog.startTime).add(+currentLog.extra2, 'days').format('MM月DD日前完成');
475
+						if(currentLog.extra2==0.5){
476
+							currentLog.extra2 = 4
477
+							return currentLog.extra1DTO.name+"<br>"+ moment(currentLog.startTime).add(+currentLog.extra2, 'hour').format('MM月DD日 HH时mm分前完成');
478
+						}else{
479
+							return currentLog.extra1DTO.name+"<br>"+ moment(currentLog.startTime).add(+currentLog.extra2, 'days').format('MM月DD日前完成');
480
+						}
476
         }else{
481
         }else{
477
             return '无';
482
             return '无';
478
         }
483
         }

+ 1 - 1
assets/views/incident/tpl/toHandlerLog.tpl.html

@@ -25,7 +25,7 @@
25
                         <ui-select-match placeholder="">
25
                         <ui-select-match placeholder="">
26
                             {{$select.selected}}
26
                             {{$select.selected}}
27
                         </ui-select-match>
27
                         </ui-select-match>
28
-                        <ui-select-choices repeat="item in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] | filter: $select.search">
28
+                        <ui-select-choices repeat="item in [0.5,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] | filter: $select.search">
29
                             <div ng-bind-html="item | highlight: $select.search"></div>
29
                             <div ng-bind-html="item | highlight: $select.search"></div>
30
                         </ui-select-choices>
30
                         </ui-select-choices>
31
                     </ui-select>
31
                     </ui-select>