事件列表修改

assets/js/controllers/incident/incidentCtrl.js

@@ -619,16 +619,19 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     }
     //状态
     $scope.state = [];
-    api_wechatfile.getDictionary({
-        "type": "list",
-        "key": "incident_status"
-    }).then(function (response) {
-        if (response) {
-            if (response.status = 200) {
-                $scope.state = response;
+    $scope.getIncidentStatus = function(){
+        api_wechatfile.getDictionary({
+            "type": "list",
+            "key": "incident_status"
+        }).then(function (response) {
+            $scope.state = response || [];
+            if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
+                $scope.selectTypeChange();
+            }else{
+                $scope.refreshData('expand-right');
             }
-        }
-    })
+        })
+    }
 
     $scope.clear = function () {
         $scope.searchkeys = {};
@@ -676,14 +679,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         var transitiondata = angular.copy(item);
         angular.extend(fildata.incident, transitiondata)
         $scope.memoryfilterData = fildata;
-        // seimin
-        if($scope.searchstate === 'all_del'){
-            fildata.searchType = 'all';
-        }else{
-            fildata.searchType = $scope.searchstate;
-        }
         console.log(fildata,78777);
-        if(fildata.searchType === 'all'){
+        if($scope.searchstate === 'all'){
             if(fildata.incident&&fildata.incident.selectType){
                 fildata.incident.selectType = fildata.incident.selectType.id;
             }
@@ -2037,31 +2034,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     if ($stateParams.model) {
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
-            $scope.searchType = JSON.parse($stateParams.model).searchType;
+            $scope.searchstate = JSON.parse($stateParams.model).searchType;
         } else {
-            $scope.searchType = "todo";
+            $scope.searchstate = "todo";
         }
     } else {
-        $scope.searchType = "todo";
+        $scope.searchstate = "todo";
     }
 
     if ($rootScope.user.group) {
         var defaultFilterData = {
-            "searchType": "todo",
             "idx": 0,
             "sum": mun
         };
     } else {
         var defaultFilterData = {
-            "searchType": "todo",
             "idx": 0,
             "sum": mun
         };
     }
 
     if (angular.isDefined($rootScope.search) && angular.isDefined($rootScope.search.incident)) {
-        defaultFilterData['searchType'] = $rootScope.search.incident;
-        $scope.searchType = $rootScope.search.incident;
+        $scope.searchstate = $rootScope.search.incident;
     }
 
     $scope.ldloading = {};
@@ -2073,15 +2067,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     }else{
         $scope.searchstate = 'todo';
     }
-    $scope.onChange = function (searchType) {
-        if(searchType === 'all_del'){
-            var obj = $scope.state.find(function(v){return v.id == 1708});
-            $scope.othcode = {state:obj};
-            $scope.isDisabledState = true;
-        }else{
-            $scope.isDisabledState = false;
-        }
-        $scope.searchstate = searchType;
+    $scope.onChange = function (searchstate) {
+        $scope.isDisabledState = false;
+        $scope.searchstate = searchstate;
         $scope.chiceIncident($scope.searchkeys,$scope.othcode.state);
     }
     // 是否逾期下拉框选择seimin
@@ -2092,13 +2080,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         var ids = $scope.searchkeys.selectType.id
         if(defaultFilterData.incident){
-            defaultFilterData.incident.selectType = ids;//seimin
+            defaultFilterData.incident.selectType = ids;
         }else{
             defaultFilterData.incident = {
                 selectType:ids
             };
         }
-        defaultFilterData.searchType = 'all';
         console.log(defaultFilterData,2222)
         $scope.onChange('all');
     }
@@ -2116,19 +2103,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
             filterData = defaultFilterData;
-                if ($scope.searchType) {
-                    filterData.searchType = $scope.searchType;
-                    if (filterData.searchType == 'overDate') {
-                        $scope.searchstate = 'overDate';
-                    }
-                }
                 if($state.params.tab){
                     $scope.searchstate = $state.params.tab;
-                    filterData.searchType = $state.params.tab;
                     filterData.idx = 0;
                     $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                }else{
-                    $scope.searchstate = filterData.searchType;
                 }
                 if($state.params.date == 'today'){
                     $scope.othcode = {};
@@ -2136,16 +2114,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.searchkeys.acceptDateEnd = new Date();
                     filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
                 }else{
-                    $scope.searchkeys.acceptDate = null;
-                    $scope.searchkeys.acceptDateEnd = null;
+                    $scope.searchkeys.acceptDate = undefined;
+                    $scope.searchkeys.acceptDateEnd = undefined;
                 }
                 if($state.params.state){
                     var obj = $scope.state.find(function(v){return $state.params.state == v.id});
                     $scope.othcode = {state:obj};
                     filterData.incident = {statusId: $state.params.state};
                 }
-        } else {
-            filterData.searchType = $scope.searchstate;
         }
         console.log(filterData,11111);
         if(window.sessionStorage.getItem('isGoyuqi') == 'yes'){
@@ -2162,187 +2138,97 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.myData = [];
         $scope.memoryfilterData = filterData;
         $scope.gridOptions['sum'] = filterData.sum;
-        // 如果是全部，则根据权限查询
-        if(filterData.searchType == 'all'){
-            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;
-            }
+        // 请求参数调整
+        if(!filterData.incident){
+            filterData.incident = {};
         }
-        if(filterData.searchType == 'all'){
-            //全部事件
-            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;
-            });
-        }else if(filterData.searchType == 'done'){
-            //与我关联
-            api_flow.owns(filterData).then(function (data) {
-                if (data.data.data) {
-                    var myData = Restangular.stripRestangular(data.data);
-                    $scope.gridOptions['totalItems'] = myData.resultCount;
-                    $scope.myData = myData.data;
-                    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;
-            });
+        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{
-            // 非全部事件
-            api_bpm_domain.fetchtask(pdKey, filterData).then(function (data) {
-                if (data.data) {
-                    var myData = Restangular.stripRestangular(data);
-                    $scope.gridOptions['totalItems'] = myData.resultCount;
-                    $scope.myData = myData.data;
-                    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"
-                    });
+            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
                 }
-                $scope.ldloading[style.replace('-', '_')] = false;
+            } else {
+                SweetAlert.swal({
+                    title: "系统错误",
+                    text: "请稍后再试!",
+                    type: "error"
+                });
+            }
+            $scope.ldloading[style.replace('-', '_')] = false;
 
-            }, function () {
-                $scope.ldloading[style.replace('-', '_')] = false;
-            });
-        }
+        }, function () {
+            $scope.ldloading[style.replace('-', '_')] = false;
+        });
     };
     $scope.refreshData2 = function (style, filterData) {
 
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
             filterData = defaultFilterData;
-            if ($scope.searchType) {
-                filterData.searchType = $scope.searchType;
-                if (filterData.searchType == 'overDate') {
-                    $scope.searchstate = 'overDate';
-                }
-            }
-        }else{
-            filterData.searchType = $scope.searchstate;
         }
         $scope.myData = [];
         $scope.memoryfilterData = filterData;
         $scope.gridOptions['sum'] = filterData.sum;
-        // 如果是全部，则根据权限查询
-        if(filterData.searchType == 'all'){
-            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;
-            }
+        // 请求参数调整
+        if(!filterData.incident){
+            filterData.incident = {};
         }
-        if(filterData.searchType == 'all'){
-            //全部事件
-            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;
-            });
-        }else if(filterData.searchType == 'done'){
-            //与我关联
-            api_flow.owns(filterData).then(function (data) {
-                if (data.data.data) {
-                    var myData = Restangular.stripRestangular(data.data);
-                    $scope.gridOptions['totalItems'] = myData.resultCount;
-                    $scope.myData = myData.data;
-                    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;
-            });
+        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{
-            api_bpm_domain.fetchtask(pdKey, filterData).then(function (data) {
-                if (data.data) {
-                    var myData = Restangular.stripRestangular(data);
-                    $scope.gridOptions['totalItems'] = myData.resultCount;
-                    $scope.myData = myData.data;
-                    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;
-            });
+            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
-    if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
-        $scope.selectTypeChange();
-    }else{
-        $scope.refreshData('expand-right');
-    }
+    $scope.getIncidentStatus();
 
     $scope.timer = $interval(function () {
         $scope.jry_refresh()

assets/js/main.js

@@ -715,7 +715,7 @@ app.factory('api_flow', ['FlowRestangular', function (FlowRestangular) {
     return {
         // 与我关联
         owns: function (data) {
-            return r_data.customPOST(data, 'owns', {});
+            return r_data.customPOST(data, 'incident/owns', {});
         },
         // 建单
         accept: function (model, data) {

assets/views/incident/list.html

@@ -16,8 +16,12 @@
                     ng-class="{'statecolor':searchstate=='all'}" ng-if="allFlag">全部事件</button>
                 <button class="btn btn-statebutton statebutton wt_btn2" ng-class="{'statecolor':searchstate=='todo'}"
                     ng-click="onChange('todo')">待我处理</button>
-                <button class="btn btn-statebutton statebutton wt_btn2" ng-class="{'statecolor':searchstate=='done'}"
-                    ng-click="onChange('done')">与我关联</button>
+                <button class="btn btn-statebutton statebutton wt_btn2" ng-class="{'statecolor':searchstate=='owns'}"
+                    ng-click="onChange('owns')">与我关联</button>
+                <button class="btn btn-statebutton statebutton wt_btn2" ng-class="{'statecolor':searchstate=='callback'}"
+                    ng-click="onChange('callback')">待回访</button>
+                <button class="btn btn-statebutton statebutton wt_btn2" ng-class="{'statecolor':searchstate=='storage'}"
+                    ng-click="onChange('storage')">暂存</button>
             </div>
         </div>