事件列表

assets/js/controllers/incident/incidentCtrl.js

@@ -25,6 +25,15 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         { id: '2', name: '是' },
         { id: '0', name: '否' }
     ];
+    $scope.tabs = [
+        // {key: 'all', value: '全部事件', num: ''},
+        {key: 'todo', value: '待我接单', num: ''},
+        {key: 'doing', value: '待我处理', num: ''},
+        // {key: 'callback', value: '待我回访', num: ''},
+        {key: 'resolve', value: '由我解决', num: ''},
+        {key: 'owns', value: '与我关联', num: ''},
+        {key: 'storage', value: '暂存', num: ''},
+    ]
     // /是否逾期
     $scope.langs = i18nService.getAllLangs();
     $scope.lang = 'zh-cn';
@@ -33,9 +42,16 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     var loginUser = $rootScope.user;
     $scope.allFlag = false;//全部事件
     $scope.daochu = false;//导出
+    $scope.huifang = false;//回访
     for (var i = 0; i < loginUser.menu.length; i++) {
         if (loginUser.menu[i].link == "shijianliebiao_all") {
-            $scope.allFlag = true
+            $scope.allFlag = true;
+            $scope.tabs.splice(0, 0 , {key: 'all', value: '全部事件', num: ''});
+        }
+        if (loginUser.menu[i].link == "shijianliebiao_huifang") {
+            $scope.huifang = true;
+            let index = $scope.tabs.findIndex(v => v.key == 'resolve');
+            $scope.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: ''});
         }
         if (loginUser.menu[i].link == "shijianliebiao_daochu") {
             $scope.daochu = true
@@ -2126,12 +2142,17 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         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($scope.searchstate === 'all' || $scope.searchstate === 'callback'){
+            if($rootScope.user.duty){
+                // 当前的所属责任科室
+                filterData.incident.duty = $rootScope.user.duty;
+            }else if($rootScope.user.branch){
+                // 当前的所属院区
+                filterData.incident.branch = $rootScope.user.branch.id;
+            }
+        }else{
+            delete filterData.incident.duty;
+            delete filterData.incident.branch;
         }
         filterData.incident.queryTask = $scope.searchstate;
         filterData.incident.assignee = loginUser.id;
@@ -2141,7 +2162,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             delete filterData.incident.candidateGroups;
         }
 
-        // 调用接口
+        // 调用接口-查列表
         api_user_data.fetchDataList('incident', filterData).then(function (data) {
             if (data.list) {
                 var myData = Restangular.stripRestangular(data);
@@ -2162,6 +2183,38 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }, function () {
             $scope.ldloading[style.replace('-', '_')] = false;
         });
+
+        // 调用接口-查数量
+        let numPostData = {
+            tabs: $scope.tabs.map(v => v.key).toString(),
+            assignee: loginUser.id,
+            candidateGroups: loginuserGroup,
+        }
+        if($rootScope.user.duty){
+            // 当前的所属责任科室
+            numPostData.dutyId = $rootScope.user.duty.id;
+        }else if($rootScope.user.branch){
+            // 当前的所属院区
+            numPostData.branchId = $rootScope.user.branch.id;
+        }
+        api_flow.count(numPostData).then(function (data) {
+            if (data.state == 200) {
+                let myData = data.data[0] || {};
+                $scope.tabs.forEach(v => {
+                    v.num = myData[v.key];
+                })
+            } else {
+                SweetAlert.swal({
+                    title: "系统错误",
+                    text: "请稍后再试!",
+                    type: "error"
+                });
+            }
+            $scope.ldloading[style.replace('-', '_')] = false;
+
+        }, function () {
+            $scope.ldloading[style.replace('-', '_')] = false;
+        });
     }, 500);
     // 进入页面时
     $scope.getIncidentStatus();

assets/js/main.js

@@ -713,9 +713,9 @@ app.factory('api_flow', ['FlowRestangular', function (FlowRestangular) {
     var r_data = FlowRestangular.all("");
 
     return {
-        // 与我关联
-        owns: function (data) {
-            return r_data.customPOST(data, 'incident/owns', {});
+        // 事件列表数量
+        count: function (data) {
+            return r_data.customPOST(data, 'incident/list/count', {});
         },
         // 建单
         accept: function (model, data) {

assets/views/incident/list.html

@@ -12,16 +12,8 @@
     <div class="listbote">
         <div class="list-controls clearfix">
             <div class="btn-group">
-                <button class="btn btn-statebutton statebutton  keepleftbottom wt_btn2" ng-click="onChange('all')"
-                    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=='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>
+                <button class="btn btn-statebutton statebutton wt_btn2" ng-repeat="item in tabs" ng-click="onChange(item.key)"
+                    ng-class="{'statecolor':searchstate==item.key}">{{item.value}}<strong class="red" ng-if="item.num !== ''">({{item.num}})</strong class="red"></button>
             </div>
         </div>
 
@@ -305,7 +297,7 @@
     }
 
     .wt_btn2 {
-        width: 100px;
+        min-width: 100px;
         height: 34px !important;
         border-radius: 2px !important;
     }