bugfix

assets/js/controllers/customform/customformCtrl.js

@@ -22009,7 +22009,7 @@ appFormly.controller("CustomformCtrl", [
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                     intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                   }
-                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                       controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
@@ -22168,7 +22168,7 @@ appFormly.controller("CustomformCtrl", [
                           currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                           intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                         }
-                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                           api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                             var auditState = res.find(v=>v.value == 0);
                             var postData = { 
@@ -22201,7 +22201,7 @@ appFormly.controller("CustomformCtrl", [
                                       ) {
                                         $rootScope.app.layout.isSidebarClosed = false;
                                         if ($scope.login && !$rootScope.busy) {
-                                          $rootScope.setidle();
+                                          // $rootScope.setidle();
                                         }
                                       }
                                       $state.go($scope.formData.cancelUrl);
@@ -22231,7 +22231,7 @@ appFormly.controller("CustomformCtrl", [
                               ) {
                                 $rootScope.app.layout.isSidebarClosed = false;
                                 if ($scope.login && !$rootScope.busy) {
-                                  $rootScope.setidle();
+                                  // $rootScope.setidle();
                                 }
                               }
                               $state.go($scope.formData.cancelUrl);
@@ -22277,7 +22277,7 @@ appFormly.controller("CustomformCtrl", [
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                     intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                   }
-                  if($scope.formData.name === 'handlerform'&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  if($scope.formData.name === 'handlerform'&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                       $modal.open({
                         templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                         controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {

assets/js/controllers/desk/chartCtrl.js

@@ -10,7 +10,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     // 来源
     $scope.sourceTypes = [
         {name:'事件生成',value:'pcIncident'},
-        {name:'师生报修',value:'wechatRequesterIncident'}
+        {name:'微信/web',value:'wechatRequesterIncident'}
     ]
     
     //修改来源

assets/js/controllers/system/user/adminUserCtrl.js

@@ -44,7 +44,7 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
     $scope.gridOptions.paginationPageSize = 10;
     $scope.gridOptions.multiSelect = false;
 
-    //$scope.gridOptions.rowTemplate= "<div ng-dblclick=\"grid.appScope.onDblClick(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
+    $scope.gridOptions.rowTemplate= "<div ng-dblclick=\"grid.appScope.onDblClick(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
 
     $scope.gridOptions.rowIdentity = function (row) {
         return row.id;
@@ -354,6 +354,11 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
             size: 'sm'
         })
     }
+    // //双击查看详情
+    $scope.onDblClick = function (data) {
+        console.log(data);
+        $scope.saveData(data.entity);
+    };
 
     $scope.saveData = function (data) {
         var modelData = {