事件列表

assets/js/controllers/incident/incidentCtrl.js

@@ -626,9 +626,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }).then(function (response) {
             $scope.state = response || [];
             if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
-                $scope.selectTypeChange();
+                $scope.selectTypeChange(true);
             }else{
-                $scope.refreshData('expand-right');
+                $scope.refreshData('expand-right', undefined, true);
             }
         })
     }
@@ -638,6 +638,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.othcode = {};
 
         $scope.try_async_load();
+        defaultFilterData = {
+            idx: 0,
+            sum: mun
+        }
         $scope.refreshData('expand-right');
         $interval.cancel($scope.timer);
         $scope.timer = $interval(function () {
@@ -652,12 +656,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         fildata.idx = $scope.jry_idx;
         fildata.sum = $scope.jry_sum;
-        $scope.refreshData2('expand-right', fildata);
+        $scope.refreshData('expand-right', fildata);
         console.log($scope.cifilter_classic);
 
     }
     // 搜索
-    $scope.chiceIncident = function (item, stateid) {
+    $scope.chiceIncident = function (item, stateid, isInit) {
         if (stateid && stateid.id) {
             item.statusId = stateid.id;
         } else {
@@ -690,7 +694,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         }
         // /seimin
-        $scope.refreshData('expand-right', fildata);
+        $scope.refreshData('expand-right', fildata, isInit);
         $interval.cancel($scope.timer);
         $scope.timer = $interval(function () {
             $scope.jry_refresh()
@@ -1926,7 +1930,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                                 // 当前的所属责任科室
                                 $scope.assign.branch = $scope.hospitalList.find(v=>v.id == $rootScope.user.duty.branch);
                                 $scope.assign.duty = $rootScope.user.duty;
-                                $scope.changeDuty();
                             }else if($rootScope.user.branch){
                                 // 当前的所属院区
                                 $scope.assign.branch = $scope.hospitalList.find(v=>v.id == $rootScope.user.branch.id);
@@ -2067,13 +2070,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     }else{
         $scope.searchstate = 'todo';
     }
-    $scope.onChange = function (searchstate) {
+    $scope.onChange = function (searchstate, isInit) {
         $scope.isDisabledState = false;
         $scope.searchstate = searchstate;
-        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state);
+        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state, isInit);
     }
-    // 是否逾期下拉框选择seimin
-    $scope.selectTypeChange = function(){
+    // 是否逾期下拉框选择
+    $scope.selectTypeChange = function(isInit){
         console.log($scope.searchkeys.selectType,66666);
         if(window.sessionStorage.getItem('isGoyuqi') == 'yes'){
             $scope.searchkeys.selectType = {id:'2',name:'是'};
@@ -2087,22 +2090,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             };
         }
         console.log(defaultFilterData,2222)
-        $scope.onChange('all');
+        $scope.onChange('all', isInit);
     }
     //获取列表数据
-    $scope.refreshData = function (style, filterData) {
-        console.log(filterData,9090)
-
-        if (filterData && filterData.incident && filterData.incident.area) {
-            filterData.incident.place = {
-                id: filterData.incident.place ? filterData.incident.place.id : '',
-                area: filterData.incident.area
-            }
-            delete filterData.incident.area
-        }
+    $scope.refreshData = _.debounce(function (style, filterData, isInit) {
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
             filterData = defaultFilterData;
+            if(isInit){
                 if($state.params.tab){
                     $scope.searchstate = $state.params.tab;
                     filterData.idx = 0;
@@ -2122,18 +2117,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.othcode = {state:obj};
                     filterData.incident = {statusId: $state.params.state};
                 }
-        }
-        console.log(filterData,11111);
-        if(window.sessionStorage.getItem('isGoyuqi') == 'yes'){
-            $scope.searchkeys.selectType = {id:'2',name:'是'};
-            if(filterData.incident&&filterData.incident.selectType){
-                filterData.incident.selectType = '2';
-            }else{
-                filterData.incident = {
-                    selectType : '2'
-                }
             }
-            window.sessionStorage.removeItem('isGoyuqi');
         }
         $scope.myData = [];
         $scope.memoryfilterData = filterData;
@@ -2178,56 +2162,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }, function () {
             $scope.ldloading[style.replace('-', '_')] = false;
         });
-    };
-    $scope.refreshData2 = function (style, filterData) {
-
-        $scope.ldloading[style.replace('-', '_')] = true;
-        if (angular.isUndefined(filterData)) {
-            filterData = defaultFilterData;
-        }
-        $scope.myData = [];
-        $scope.memoryfilterData = filterData;
-        $scope.gridOptions['sum'] = filterData.sum;
-        // 请求参数调整
-        if(!filterData.incident){
-            filterData.incident = {};
-        }
-        if($rootScope.user.duty){
-            // 当前的所属责任科室
-            filterData.incident.duty = $rootScope.user.duty;
-        }else if($rootScope.user.branch){
-            // 当前的所属院区
-            filterData.incident.branch = $rootScope.user.branch.id;
-        }
-        filterData.incident.queryTask = $scope.searchstate;
-        filterData.incident.assignee = loginUser.id;
-        if($scope.searchstate === 'todo' || $scope.searchstate === 'owns'){
-            filterData.incident.candidateGroups = loginuserGroup;
-        }else{
-            delete filterData.incident.candidateGroups;
-        }
-        //调用接口
-        api_user_data.fetchDataList('incident', filterData).then(function (data) {
-            if (data.list) {
-                var myData = Restangular.stripRestangular(data);
-                $scope.gridOptions['totalItems'] = myData.totalNum;
-                $scope.myData = myData.list;
-                for (var i = 0; i < $scope.myData.length; i++) {
-                    $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-                }
-            } else {
-                SweetAlert.swal({
-                    title: "系统错误",
-                    text: "请稍后再试!",
-                    type: "error"
-                });
-            }
-            $scope.ldloading[style.replace('-', '_')] = false;
-        }, function () {
-            $scope.ldloading[style.replace('-', '_')] = false;
-        });
-    };
-    // 进入页面时111
+    }, 500);
+    // 进入页面时
     $scope.getIncidentStatus();
 
     $scope.timer = $interval(function () {

assets/views/incident/incidentDetail.html

@@ -178,7 +178,7 @@
                                             <div class="row pull-left ">登记时间:</div>
                                         </div>
                                         <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
-                                            <div>{{model.acceptDate}}
+                                            <div>{{model.acceptDate | date:"yyyy-MM-dd HH:mm:ss"}}
                                             </div>
                                         </div>
                                     </div>
@@ -214,7 +214,7 @@
                                         </div>
                                         <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
 
-                                            <div>{{model.overdueTime||'--'}}</div>
+                                            <div>{{model.overdueTime | date:"yyyy-MM-dd HH:mm:ss"}}</div>
                                         </div>
                                     </div>
                                     <div class="col-md-12 ">