提交

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -85,7 +85,7 @@ app.controller("inspectionScope", [
               }
             })
           }
-          
+
         }
       });
     };
@@ -598,6 +598,51 @@ app.controller("inspectionScope", [
       console.log($scope.notice);
       console.log($scope.copyInspection.tree);
       console.log($scope.stateModel);
+      // let trees = $scope.copyInspection.tree;
+      // for (let i = 0; i < trees.length; i++) {
+      //   let element = trees[i];
+      //   if(!element.group){
+      //     SweetAlert.swal({
+      //       title: "校验错误",
+      //       text: `【${element.name}】未选择线下巡检默认组`,
+      //       type: "error",
+      //       confirmButtonColor: "#DD6B55"
+      //     });
+      //     return;
+      //   }
+      //   if(!element.user){
+      //     SweetAlert.swal({
+      //       title: "校验错误",
+      //       text: `【${element.name}】未选择线上巡检默认人`,
+      //       type: "error",
+      //       confirmButtonColor: "#DD6B55"
+      //     });
+      //     return;
+      //   }
+
+      //   let children = trees[i].children || [];
+      //   for (let i = 0; i < children.length; i++) {
+      //     let element = children[i];
+      //     if(!element.group){
+      //       SweetAlert.swal({
+      //         title: "校验错误",
+      //         text: `【${element.parent.type}】-【${element.name}】未选择线下巡检默认组`,
+      //         type: "error",
+      //         confirmButtonColor: "#DD6B55"
+      //       });
+      //       return;
+      //     }
+      //     if(!element.user){
+      //       SweetAlert.swal({
+      //         title: "校验错误",
+      //         text: `【${element.parent.type}】-【${element.name}】未选择线上巡检默认人`,
+      //         type: "error",
+      //         confirmButtonColor: "#DD6B55"
+      //       });
+      //       return;
+      //     }
+      //   }
+      // }
       if ($scope.stateModel.model === 0) {
         // 不设置为模块的时候需要弹窗提示
         var modalInstance = $modal.open({
@@ -1151,7 +1196,7 @@ app.directive("zTree", function () {
             zTreeOnCheckCommon([], [])
         }
       }
-      
+
       $scope.setFn.call($scope,  {
         params: $scope.clickDirective
       })

assets/js/controllers/system/organizationdesign/deptCtrl.js

@@ -34,10 +34,11 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
     $scope.gridOptions.useExternalPagination = true;
     $scope.gridOptions.paginationPageSizes = [10, 20, 50, 100];
     $scope.gridOptions.paginationPageSize = 10;
-    $scope.gridOptions.multiSelect = false;
+    $scope.gridOptions.multiSelect = true;
+    $scope.gridOptions.enableSelectionBatchEvent = true; //使用批量使用事件
 
     //$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;
     };

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

@@ -42,10 +42,12 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
     $scope.gridOptions.useExternalPagination = true;
     $scope.gridOptions.paginationPageSizes = [10, 20, 50, 100];
     $scope.gridOptions.paginationPageSize = 10;
-    $scope.gridOptions.multiSelect = false;
+    $scope.gridOptions.multiSelect = true;
+    $scope.gridOptions.enableSelectionBatchEvent = true; //使用批量使用事件
 
     //$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;
     };

assets/js/controllers/system/user/adminrequesterCtrl.js

@@ -25,10 +25,11 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
     $scope.gridOptions.useExternalPagination = true;
     $scope.gridOptions.paginationPageSizes = [10, 20, 50, 100];
     $scope.gridOptions.paginationPageSize = 10;
-    $scope.gridOptions.multiSelect = false;
+    $scope.gridOptions.multiSelect = true;
+    $scope.gridOptions.enableSelectionBatchEvent = true; //使用批量使用事件
 
     //$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;
     };