增加系统配置和修复弹屏BUG

assets/js/config.router.js

@@ -1843,7 +1843,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
             .state('app.system.sysconfig', {
                 url: '/sysconfig',
                 templateUrl: "assets/views/system/sysconfig.html",
-                resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'sysconfigCtrl'),
+                resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'ui.select', 'sysconfigCtrl'),
                 title: 'Nav Manager',
                 ncyBreadcrumb: {
                     label: 'User Manager'

assets/js/controllers/mainCtrl.js

@@ -1228,10 +1228,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                             });
                                                             modalInstance.result.then(function(selectedItem) {
                                                                 if (selectedItem) {
-                                                                    if (selectedItem.telephone && !selectedItem.mphone) {
-                                                                        selectedItem.telephone = angular.copy(selectedItem.mphone);
-                                                                        delete selectedItem.mphone;
-                                                                    }
+                                                                    // if (selectedItem.telephone && !selectedItem.mphone) {
+                                                                    //     selectedItem.telephone = angular.copy(selectedItem.mphone);
+                                                                    //     delete selectedItem.mphone;
+                                                                    // }
                                                                     var data = {
                                                                         'requester': selectedItem
                                                                     };

assets/js/controllers/system/sysconfigCtrl.js

@@ -1,5 +1,5 @@
 "use strict";
-app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "$interval", "$modal", "$window", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_sysinfo", "api_is_category", function (t, a, n, e, i, s, r, o, l, u, d, c, g, api_is_category) {
+app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "$interval", "$modal", "$window", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_sysinfo", "api_is_category", "api_wx_role", function (t, a, n, e, i, s, r, o, l, u, d, c, g, api_is_category, api_wx_role) {
     a.langs = l.getAllLangs(), a.lang = "zh-cn", l.setCurrentLang(a.lang);
     var f = (t.user, r._, {
         idx: 0,
@@ -10,6 +10,21 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         var v = parseFloat(e.target.value)?parseFloat(e.target.value):0;
         a.autoCloseIncidentHour.valueconfig  = v > 0 ? v : 0;
     }
+    // 获取角色
+    a.roleList = [];
+    a.getRoleList = function(integralRole){
+        api_wx_role.getWxRole({ "idx": 0, "sum": 1000 }).then(function (data) {
+            a.roleList = data.list || [];
+            angular.forEach(a.myData, function (v, i) {
+                if (v.keyconfig == 'integralRole') {
+                    a.integralRole.valueconfig = a.roleList.filter(function (vv) {
+                        return v.valueconfig.indexOf(vv.id) > -1;
+                    });
+                    console.log(a.integralRole.valueconfig)
+                }
+            })
+        });
+    }
     //保存
     a.savesystem = function () {
         var arr = {};
@@ -29,6 +44,18 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         arr.systemConfiguration.push(a.wxIncidentWithCmdb);//是否需要绑定资产
         arr.systemConfiguration.push(a.ifWorking);//是否开通上下班
         arr.systemConfiguration.push(a.integralMechanism);//积分机制
+        if(a.integralMechanism.valueconfig == 1){
+            if(Array.isArray(a.integralRole.valueconfig)){
+                var integralRole = a.myData.find(v => v.keyconfig == 'integralRole');
+                arr.systemConfiguration.push(Object.assign({}, integralRole, {valueconfig: a.integralRole.valueconfig.map(v => v.id).toString()}));//积分控制角色 
+            }else{
+                arr.systemConfiguration.push(a.integralRole);//积分控制角色
+            }
+        }else{
+            var integralRole = a.myData.find(v => v.keyconfig == 'integralRole');
+            arr.systemConfiguration.push(Object.assign({}, integralRole, {valueconfig: ''}));//积分控制角色 
+            a.integralRole.valueconfig = [];
+        }
         arr.systemConfiguration.push(a.ifRoom);//是否增加房间号选择
         arr.systemConfiguration.push(a.requesterLgoinType);//保修人登录方式
         arr.systemConfiguration.push(a.autoCloseIncidentHour);//自动关单小时
@@ -58,6 +85,9 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                                   case "integralMechanism": //积分机制
                                     sessionStorage.setItem("integralMechanism", v.valueconfig);
                                     break;
+                                  case "integralRole": //积分控制角色
+                                    sessionStorage.setItem("integralRole", v.valueconfig);
+                                    break;
                                 }
                             });
                             o.swal({
@@ -78,8 +108,13 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                 })
             }
         })
-    }, a.ldloading = {}, a.refreshData = function (t, n) {
-        a.ldloading[t.replace("-", "_")] = !0, angular.isUndefined(n) && (n = f), a.myData = [], g.fetchDataList("systemConfiguration", n).then(function (n) {
+    };
+    a.ldloading = {};
+    a.refreshData = function (t, n) {
+        a.ldloading[t.replace("-", "_")] = !0;
+        angular.isUndefined(n) && (n = f);
+        a.myData = [];
+        g.fetchDataList("systemConfiguration", n).then(function (n) {
             if (n.status == 200) {
                 var e = c.stripRestangular(n);
                 a.myData = e.list, a.ldloading[t.replace("-", "_")] = !1
@@ -88,6 +123,8 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                 a.cacheConfig = [];//缓存配置
                 a.linkConfig = [];//链接配置
                 a.repairMain = {};//报修主体
+
+                a.integralRole = {valueconfig:[]};
                 console.log(a.myData,77777)
                 angular.forEach(a.myData, function (v, i) {
                     if (v.keyconfig == 'pwd' || v.keyconfig == 'conversationSeconds' || v.keyconfig == 'formUri' || v.keyconfig == 'localhost' || v.keyconfig == 'verificationPath' || v.keyconfig == 'docpath') {
@@ -120,6 +157,11 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                     if (v.keyconfig == 'integralMechanism') {
                         a.integralMechanism = v;//积分机制
                     }
+                    if (v.keyconfig == 'integralRole') {
+                        // a.integralRole = v;//积分控制角色
+                        console.log(v);
+                        a.getRoleList(v);
+                    }
                     if (v.keyconfig == 'ifRoom') {
                         a.ifRoom = v;//是否增加房间号选择
                     }
@@ -137,5 +179,6 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         }, function () {
             a.ldloading[t.replace("-", "_")] = !1
         })
-    }, a.refreshData("expand-right", f)
+    };
+    a.refreshData("expand-right", f);
 }]);

assets/views/system/sysconfig.html

@@ -171,7 +171,7 @@
             <div class="panel panel-white">
                 <div class="panel-hd">其他配置</div>
             </div>
-            <div class="panel-bd">
+            <div class="panel-bd" style="padding-bottom:100px;">
                 <div class="form-group col-sm-6">
                     <label class="col-sm-4 control-label">
                         自动关单时间：
@@ -261,6 +261,29 @@
                         </ul>
                     </div>
                 </div>
+                <div class="form-group col-sm-6">
+                    <label class="col-sm-4 control-label"></label>
+                    <div class="col-sm-8"></div>
+                </div>
+                <div class="form-group col-sm-6" ng-if="integralMechanism.valueconfig == 1">
+                    <label class="col-sm-4 control-label">
+                        积分控制角色：
+                    </label>
+                    <div class="col-sm-8">
+                        <ui-select ng-model="integralRole.valueconfig" theme="bootstrap" multiple>
+                            <ui-select-match placeholder="请选择">
+                                {{$item.role}}
+                            </ui-select-match>
+                            <ui-select-choices repeat="item in roleList">
+                                <div ng-bind-html="item.role | highlight: $select.search"></div>
+                            </ui-select-choices>
+                        </ui-select>
+                    </div>
+                </div>
+                <div class="form-group col-sm-6">
+                    <label class="col-sm-4 control-label"></label>
+                    <div class="col-sm-8"></div>
+                </div>
             </div>
             <!-- 保存 -->
             <div class="form-group margin-bottom-0">