绩效积分配置

assets/js/controllers/performance/scoreConfigurationPerformanceCtrl.js

@@ -29,7 +29,7 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
     }
     var defaultFilterData = {
         "idx": 0,
-        "sum": 9999
+        "sum": 10
     };
 
     $scope.gridOptions = {};
@@ -66,38 +66,35 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         },
         
         {
-            name: 'incidentCategory.parent.parent.category',
+            name: 'parent.parent.category',
             displayName: '一级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'incidentCategory.parent.category',
+            name: 'parent.category',
             displayName: '二级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'incidentCategory.category',
+            name: 'category',
             displayName: '三级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'incidentCategory.complexity',
+            name: 'complexity.value',
             displayName: '默认积分',
             width: '5%',
-            enableFiltering: false,
-            cellTemplate: '<div style="line-height:34px;">' +
-            '<span>{{row.entity.incidentCategory.complexity?row.entity.incidentCategory.complexity.value:0}}</span>' +
-            '</div>'
+            enableFiltering: false
         },
         {
             name: 'five',
             displayName: '积分规则',
             width: '50%',
             enableFiltering: false,
-            cellTemplate: '<div style="line-height:34px;">' +
+            cellTemplate: '<div class="ui-grid-cell-contents">' +
             '<span ng-repeat="item in row.entity.rules">【{{item.startCount}}-{{item.endCount}}单】获得积分{{item.score}}；</span>' +
             '</div>'
         },
@@ -116,6 +113,18 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         //导入gridApi对象
         $scope.gridApi = gridApi;
 
+        //分页选项
+        gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
+            var filtersData = {};
+            filtersData.idx = newPage - 1;
+            filtersData.sum = pageSize;
+            $scope.pageNum = $scope.gridApi.pagination.getPage() - 1;
+            $scope.fileData.idx = newPage - 1;
+            $scope.fileData.sum = pageSize;
+            $scope.refreshData('expand-right', $scope.fileData);
+
+        });
+
         //勾选行事件
         gridApi.selection.on.rowSelectionChanged($scope, function (data) {
             if (data.isSelected) {
@@ -149,43 +158,110 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
 
     
     // 批量修改积分
-    $scope.edits = function (data) {
-        console.log(data);
+    $scope.edits = function () {
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/scoreConfigurationPerformance-edit.html',
             size: "sm",
-            controller: function ($scope, $modalInstance) {
+            controller: function ($scope, scope, $modalInstance, SweetAlert) {
+                console.log(scope.selected.items);
+                $scope.incidentComplexity = scope.incidentComplexity;
                 $scope.configs = {
-                    defaultScore:0,
-                    configs: []
+                    defaultScore:null,
+                    configs: [],
+                    selectedItems: scope.selected.items,
+                    refreshData: scope.refreshData,
+                    fileData: scope.fileData
                 };
                 // 增加配置
                 $scope.addConfig = function(){
-                    $scope.configs.configs.push({startNum: 0, endNum: 0, score: 0});
+                    $scope.configs.configs.push({startCount: 1, endCount: 1, score: 1});
                 }
                 // 移除配置
                 $scope.removeConfig = function(index){
                     $scope.configs.configs.splice(index, 1);
                 }
                 $scope.ok = function () {
-                    $modalInstance.close(data);
+                    // 校验
+                    var flag = true;
+                    if($scope.configs.configs.length){
+                        //是否是大于1的正整数
+                        var isNumberReg = /^[1-9][0-9]*$/;
+                        $scope.configs.configs.forEach(v => {
+                            if(!isNumberReg.test(v.startCount) || !isNumberReg.test(v.endCount) || !isNumberReg.test(v.score)){
+                                flag = false;
+                            }
+                        })
+                        //是否起始 < 终值
+                        if(flag){
+                            $scope.configs.configs.forEach(v => {
+                                if(v.startCount > v.endCount){
+                                    flag = false;
+                                }
+                            })
+                        }
+                        // 是否有区间交叉
+                        if(flag){
+                            let startArr = $scope.configs.configs.map(v => v.startCount);
+                            let endArr = $scope.configs.configs.map(v => v.endCount);
+                            for(let i=1;i<startArr.length;i++){
+                                if (startArr[i] <= endArr[i-1]){
+                                    flag = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if(!flag){
+                        SweetAlert.swal({
+                            title: "提示",
+                            text: "请正确填写选项！",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    $modalInstance.close($scope.configs);
                 };
 
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
             },
+            resolve: {
+                scope: function(){
+                    return $scope;
+                }
+            }
         })
 
         modalInstance.result.then(function (result) {
             console.log(result);
+            var postData = {
+                ids: result.selectedItems.map(v => v.id).toString(),
+                removeComplexity: 1,
+                removeRules: 1
+            }
             if (result) {
-                api_bpm_data.executeOnce({inspection:data}).then(function (response) {
+                api_bpm_data.setScoreRule(postData).then(function (response) {
                     if(response.status == 200){
-                        SweetAlert.swal({
-                            title: "操作成功!",
-                            type: "success",
-                        });
+                        var postData = {
+                            ids: result.selectedItems.map(v => v.id).toString(),
+                            complexity: result.defaultScore?result.defaultScore.id:undefined,
+                            rules: result.configs.length?result.configs:undefined
+                        }
+                        api_bpm_data.setScoreRule(postData).then(function (response) {
+                            if(response.status == 200){
+                                SweetAlert.swal({
+                                    title: "操作成功!",
+                                    type: "success",
+                                });
+                                result.refreshData('expand-right', result.fileData);
+                            }else{
+                                SweetAlert.swal({
+                                    title: "操作失败!",
+                                    type: "error",
+                                });
+                            }
+                        })
                     }else{
                         SweetAlert.swal({
                             title: "操作失败!",
@@ -202,38 +278,106 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/scoreConfigurationPerformance-edit.html',
             size: "sm",
-            controller: function ($scope, $modalInstance) {
+            controller: function ($scope, scope, $modalInstance, SweetAlert) {
+                console.log(scope.selected.items);
+                $scope.incidentComplexity = scope.incidentComplexity;
                 $scope.configs = {
-                    defaultScore:0,
-                    configs: []
+                    defaultScore:data.complexity || null,
+                    configs: data.rules ? data.rules.map(v=>({startCount:v.startCount,endCount:v.endCount,score:v.score})) : [],
+                    selectedItems: [data],
+                    refreshData: scope.refreshData,
+                    fileData: scope.fileData
                 };
                 // 增加配置
                 $scope.addConfig = function(){
-                    $scope.configs.configs.push({startNum: 0, endNum: 0, score: 0});
+                    $scope.configs.configs.push({startCount: 1, endCount: 1, score: 1});
                 }
                 // 移除配置
                 $scope.removeConfig = function(index){
                     $scope.configs.configs.splice(index, 1);
                 }
                 $scope.ok = function () {
-                    $modalInstance.close(data);
+                    // 校验
+                    var flag = true;
+                    if($scope.configs.configs.length){
+                        //是否是大于1的正整数
+                        var isNumberReg = /^[1-9][0-9]*$/;
+                        $scope.configs.configs.forEach(v => {
+                            if(!isNumberReg.test(v.startCount) || !isNumberReg.test(v.endCount) || !isNumberReg.test(v.score)){
+                                flag = false;
+                            }
+                        })
+                        //是否起始 < 终值
+                        if(flag){
+                            $scope.configs.configs.forEach(v => {
+                                if(v.startCount > v.endCount){
+                                    flag = false;
+                                }
+                            })
+                        }
+                        // 是否有区间交叉
+                        if(flag){
+                            let startArr = $scope.configs.configs.map(v => v.startCount);
+                            let endArr = $scope.configs.configs.map(v => v.endCount);
+                            for(let i=1;i<startArr.length;i++){
+                                if (startArr[i] <= endArr[i-1]){
+                                    flag = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if(!flag){
+                        SweetAlert.swal({
+                            title: "提示",
+                            text: "请正确填写选项！",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    $modalInstance.close($scope.configs);
                 };
 
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
             },
+            resolve: {
+                scope: function(){
+                    return $scope;
+                }
+            }
         })
 
         modalInstance.result.then(function (result) {
             console.log(result);
+            var postData = {
+                ids: result.selectedItems.map(v => v.id).toString(),
+                removeComplexity: 1,
+                removeRules: 1
+            }
             if (result) {
-                api_bpm_data.executeOnce({inspection:data}).then(function (response) {
+                api_bpm_data.setScoreRule(postData).then(function (response) {
                     if(response.status == 200){
-                        SweetAlert.swal({
-                            title: "操作成功!",
-                            type: "success",
-                        });
+                        var postData = {
+                            ids: result.selectedItems.map(v => v.id).toString(),
+                            complexity: result.defaultScore?result.defaultScore.id:undefined,
+                            rules: result.configs.length?result.configs:undefined
+                        }
+                        api_bpm_data.setScoreRule(postData).then(function (response) {
+                            if(response.status == 200){
+                                SweetAlert.swal({
+                                    title: "操作成功!",
+                                    type: "success",
+                                });
+                                result.refreshData('expand-right', result.fileData);
+                            }else{
+                                SweetAlert.swal({
+                                    title: "操作失败!",
+                                    type: "error",
+                                });
+                            }
+                        })
                     }else{
                         SweetAlert.swal({
                             title: "操作失败!",
@@ -251,7 +395,6 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
 
     //重置按钮
     $scope.reload = function () {
-        this.one_cates = [];
         this.two_cates = [];
         delete $scope.fileData.incidentcategory.oneCate;
         delete $scope.fileData.incidentcategory.twoCate;
@@ -270,34 +413,23 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
 
         var postData = angular.copy(filterData);
         if(postData.incidentcategory.twoCate){
-            postData.incidentcategory.categoryid = postData.incidentcategory.twoCate.id;
+            postData.incidentcategory.id = postData.incidentcategory.twoCate.id;
+            postData.incidentcategory.cascade = true;
             delete postData.incidentcategory.oneCate;
             delete postData.incidentcategory.twoCate;
         }else if(postData.incidentcategory.oneCate){
-            postData.incidentcategory.categoryid = postData.incidentcategory.oneCate.id;
+            postData.incidentcategory.id = postData.incidentcategory.oneCate.id;
+            postData.incidentcategory.cascade = true;
             delete postData.incidentcategory.oneCate;
         }
+        postData.incidentcategory.selectType = 'three';
+        postData.incidentcategory.rules = [];
 
         api_bpm_data.fetchDataList('incidentcategory', postData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             if (angular.isArray(myData.list)) {
                 $scope.myData = myData.list;
-                var arr = [];
-                $scope.myData.forEach(v => {
-                    // 判断arr数组里是否有该事件分类
-                    let index = arr.findIndex(vv => vv.id == v.categoryid);
-                    if(index > -1){
-                        arr[index].rules.push(v);
-                    }else{
-                        arr.push({
-                            id: v.categoryid,
-                            incidentCategory: v.incidentCategory,
-                            rules: [v]
-                        })
-                    }
-                })
-                $scope.myData = arr;
                 for (var i = 0; i < $scope.myData.length; i++) {
                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum;
                 }
@@ -323,34 +455,23 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
 
         var postData = angular.copy(filterData);
         if(postData.incidentcategory.twoCate){
-            postData.incidentcategory.categoryid = postData.incidentcategory.twoCate.id;
+            postData.incidentcategory.id = postData.incidentcategory.twoCate.id;
+            postData.incidentcategory.cascade = true;
             delete postData.incidentcategory.oneCate;
             delete postData.incidentcategory.twoCate;
         }else if(postData.incidentcategory.oneCate){
-            postData.incidentcategory.categoryid = postData.incidentcategory.oneCate.id;
+            postData.incidentcategory.id = postData.incidentcategory.oneCate.id;
+            postData.incidentcategory.cascade = true;
             delete postData.incidentcategory.oneCate;
         }
+        postData.incidentcategory.selectType = 'three';
+        postData.incidentcategory.rules = [];
 
         api_bpm_data.fetchDataList('incidentcategory', postData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             if (angular.isArray(myData.list)) {
                 $scope.myData = myData.list;
-                var arr = [];
-                $scope.myData.forEach(v => {
-                    // 判断arr数组里是否有该事件分类
-                    let index = arr.findIndex(vv => vv.id == v.categoryid);
-                    if(index > -1){
-                        arr[index].rules.push(v);
-                    }else{
-                        arr.push({
-                            id: v.categoryid,
-                            incidentCategory: v.incidentCategory,
-                            rules: [v]
-                        })
-                    }
-                })
-                $scope.myData = arr;
                 for (var i = 0; i < $scope.myData.length; i++) {
                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
                 }
@@ -371,12 +492,23 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
     $scope.ldloading = {};
     $scope.fileData = {
         "idx": 0,
-        "sum": 9999,
+        "sum": 10,
         "incidentcategory": {}
     }
     $scope.searchinspe = function () {
         $scope.refreshData('expand-right', $scope.fileData);
     }
+    // 获取默认积分
+    $scope.incidentComplexity = [];
+    $scope.getIncidentComplexity = function () {
+        api_wechatfile.getDictionary({
+            key: "incident_complexity",
+            type: "list"
+          }).then(function (res) {
+            $scope.incidentComplexity = res;
+        })
+    }
+    $scope.getIncidentComplexity();
     // 获取一级分类
     $scope.getOneCates = function (keyword='') {
         $scope.one_cates = [];

assets/js/main.js

@@ -947,6 +947,10 @@ app.factory('api_bpm_data', ['BpmRestangular', function (BpmRestangular) {
     var inspectionProcessActual = BpmRestangular.all("InspectionProcessActual");
     var solutionService = BpmRestangular.all("solution");
     return {
+        // 设置服务台积分规则
+        setScoreRule: function (data) {
+            return dataService.customPOST(data, 'setScoreRule');
+        },
         // 服务台绩效
         serviceCount: function (data) {
             return dataService.customPOST(data, 'serviceCount');

assets/views/performance/scoreConfigurationPerformance.html

@@ -71,7 +71,7 @@
     </div>
     <div class="tableList" ui-i18n="{{lang}}">
         <div>
-            <div id="grid1 " ui-grid="gridOptions" external-scopes="$scope" ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid">
+            <div id="grid1 " ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid">
             </div>
         </div>
     </div>

assets/views/scoreConfigurationPerformance-edit.html

@@ -6,12 +6,19 @@
 </div>
 <div class="modal-body center">
     <div class="col-xs-12 padding-top-15 padding-bottom-15 padding-left-5 padding-right-5">
-        <div class="col-xs-6 no-padding text-left">
+        <div class="col-xs-6 no-padding text-left" style="display: flex;align-items:center;">
             <div class="col-xs-5 no-padding">
                 默认积分:
             </div>
             <div class="col-xs-7 no-padding">
-                <input type="number" min="0" max="999" style="width: 100%;" ng-model="configs.defaultScore">
+                <ui-select style="width: 100%;" ng-model="configs.defaultScore" theme="bootstrap">
+                    <ui-select-match placeholder="" allow-clear>
+                        {{$select.selected.value}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in incidentComplexity">
+                        <div ng-bind-html="item.value | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
             </div>
         </div>
         <div class="col-xs-6 no-padding text-right">
@@ -24,7 +31,7 @@
                 起值:
             </div>
             <div class="col-xs-7 no-padding">
-                <input type="number" min="0" max="{{config.endNum}}" style="width: 100%;" ng-model="config.startNum">
+                <input type="number" min="1" max="999" step="1" style="width: 100%;" ng-model="config.startCount">
             </div>
         </div>
         <div class="col-xs-3 no-padding">
@@ -32,7 +39,7 @@
                 终值:
             </div>
             <div class="col-xs-7 no-padding">
-                <input type="number" min="{{config.startNum}}" max="999" style="width: 100%;" ng-model="config.endNum">
+                <input type="number" min="1" max="999" step="1" style="width: 100%;" ng-model="config.endCount">
             </div>
         </div>
         <div class="col-xs-3 no-padding">
@@ -40,7 +47,7 @@
                 积分:
             </div>
             <div class="col-xs-7 no-padding">
-                <input type="number" min="0" max="999" style="width: 100%;" ng-model="config.score">
+                <input type="number" min="1" max="999" step="1" style="width: 100%;" ng-model="config.score">
             </div>
         </div>
         <div class="col-xs-3 no-padding text-right">