浏览代码

8.pc端报修列表的申请时间查询,查结束时间有问题

seimin 11 月之前
父节点
当前提交
34b400c3f0
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      assets/js/controllers/desk/chartCtrl.js
  2. 2 2
      assets/views/desk/chart.html
  3. 2 2
      assets/views/incident/list.html

+ 1 - 1
assets/js/controllers/desk/chartCtrl.js

@@ -258,7 +258,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
258 258
             $scope.fileData.incident.startDate_start = moment($scope.fileData.incident.startDate_start).format('YYYY-MM-DD HH:mm:ss');
259 259
         }
260 260
         if ($scope.fileData.incident.startDate_end) {
261
-            $scope.fileData.incident.startDate_end = moment($scope.fileData.incident.startDate_end).format('YYYY-MM-DD HH:mm:ss');
261
+            $scope.fileData.incident.startDate_end = moment($scope.fileData.incident.startDate_end).endOf("day").format('YYYY-MM-DD HH:mm:ss');
262 262
         }
263 263
         $scope.refreshData('expand-right', $scope.fileData);
264 264
     }

+ 2 - 2
assets/views/desk/chart.html

@@ -108,7 +108,7 @@
108 108
                   </div>
109 109
                   <input type="text" class="form-control pull-right incidentsearchsize iptSize"
110 110
                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"
111
-                    ng-model="fileData.incident.startDate_start" max-date="searchkeys.startDate_end" is-open="startOpened"
111
+                    ng-model="fileData.incident.startDate_start" max-date="fileData.incident.startDate_end" is-open="startOpened"
112 112
                     hour-time="true" ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
113 113
                     placeholder="" />
114 114
                 </div>
@@ -118,7 +118,7 @@
118 118
                 <div>
119 119
                   <input type="text" class="form-control selectzise pull-right incidentsearchsize iptSize"
120 120
                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"
121
-                    ng-model="fileData.incident.startDate_end" hour-time="true" min-date="searchkeys.startDate_start"
121
+                    ng-model="fileData.incident.startDate_end" hour-time="true" min-date="fileData.incident.startDate_start"
122 122
                     is-open="endOpened" ng-init="endOpened = false" close-text="关闭" ng-click="endOpen($event)"
123 123
                     placeholder="" />
124 124
                 </div>

+ 2 - 2
assets/views/incident/list.html

@@ -28,7 +28,7 @@
28 28
                             <div class="control-label pull-left margin-top-5">登记时间:</div>
29 29
                             <input type="text" class=" incidentsearchsize wt_width5"
30 30
                                 datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDate"
31
-                                max-date="searchkeys.acceptDateEnd" is-open="startOpened" hour-time=true
31
+                                max-date="searchkeys.acceptDateEnd" is-open="startOpened" hour-time="true"
32 32
                                 ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
33 33
                                 placeholder="" />
34 34
                         </div>
@@ -37,7 +37,7 @@
37 37
                         <div class="">
38 38
                             <div class="control-label pull-left margin-top-5">至</div>
39 39
                             <input type="text" class=" selectzise incidentsearchsize wt_width5"
40
-                                datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDateEnd" hour-time=true
40
+                                datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDateEnd" hour-time="true"
41 41
                                 min-date="searchkeys.acceptDate" is-open="endOpened" ng-init="endOpened = false"
42 42
                                 close-text="关闭" ng-click="endOpen($event)" placeholder="" />
43 43
                         </div>