巡检二期修改

assets/js/controllers/inspect/inspectListCtrl.js

@@ -17,6 +17,8 @@ app.controller("inspectListCtrl", [
   "api_bpm_schedule",
   "api_bpm_data",
   "api_configure_data",
+  "api_bpm",
+  "api_user_data",
   function (
     $rootScope,
     $scope,
@@ -31,7 +33,9 @@ app.controller("inspectListCtrl", [
     Restangular,
     api_bpm_schedule,
     api_bpm_data,
-    api_configure_data
+    api_configure_data,
+    api_bpm,
+    api_user_data
   ) {
     $scope.langs = i18nService.getAllLangs();
     $scope.lang = "zh-cn";
@@ -40,10 +44,14 @@ app.controller("inspectListCtrl", [
 
     var loginUser = $rootScope.user;
     $scope.chuli = false;
+    $scope.assign = false;
     for (var i = 0; i < loginUser.menu.length; i++) {
       if (loginUser.menu[i].link == "xunjianliebiao_chuli") {
         $scope.chuli = true;
       }
+      if (loginUser.menu[i].link == "xunjianliebiao_assign") {
+        $scope.assign = true;
+      }
     }
     var defaultFilterData = {
       assignee: loginUser.id,
@@ -74,7 +82,6 @@ app.controller("inspectListCtrl", [
     $scope.gridOptions.enableColumnResizing = true;
     $scope.gridOptions.enableFiltering = true;
     $scope.gridOptions.enableGridMenu = true;
-    $scope.gridOptions.enableSelectAll = true;
     $scope.gridOptions.enableRowSelection = true;
     $scope.gridOptions.showGridFooter = true;
     $scope.gridOptions.showColumnFooter = false;
@@ -94,6 +101,15 @@ app.controller("inspectListCtrl", [
     $scope.gridOptions.getRowIdentity = function (row) {
       return row.id;
     };
+    //执行中的巡检才能批量派单
+    $scope.gridOptions.isRowSelectable = function (row,i) {
+      // console.log(row,row.uid,document);
+      if (row.entity.state == 0) {
+        return true;
+      } else {
+        return false;
+      }
+    };
     $scope.transferColor = function (item) {
       var color = "icon iconfont icon-zhengchang greenfont";
       if (item && item.colourInfo) {
@@ -296,6 +312,129 @@ app.controller("inspectListCtrl", [
     //         })
     //     }
     // }
+    //批量派单
+    $scope.toAssign = function() {
+      var _$scope = $scope;
+      console.log($scope.selected.items);
+        var sendList = [];
+        angular.forEach($scope.selected.items, function(item) {
+            sendList.push(item.id);
+        });
+        // --------------------------------------------------------
+        var modalInstance = $modal.open({
+          templateUrl: 'assets/views/incident/tpl/toAssign.tpl.html',
+          controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
+              console.log(_$scope.selected.items,loginUser);
+              //获取组下面的用户
+              $scope.getUsers = function(groupId){
+                  $scope.user = [];
+                  var postData = {};
+                  if(groupId){
+                      postData = {
+                          "idx": 0,
+                          "sum": 100,
+                          user: {
+                              groupdata:{id:groupId},
+                              roledata: { rolecode: "inspectman" },
+                              selectType: "1",
+                              selectDetails:1
+                          }
+                      }
+                  }else{
+                      postData = {
+                          "idx": 0,
+                          "sum": 100,
+                          user: {
+                              roledata: { rolecode: "inspectman" },
+                              selectType: "1",
+                              selectDetails:1
+                          }
+                      }
+                  }
+                  api_user_data.fetchDataList('user', postData).then(function (data) {
+                      $scope.user = data.list;
+                  })
+              }
+              $scope.assignUser = null;
+              $scope.user = [];
+              $scope.group = [];
+              $scope.getUsers();
+              api_user_data.fetchDataList('group', {
+                  "idx": 0,
+                  "sum": 100,
+                  group: {}
+              }).then(function (data) {
+                  $scope.group = data.list;
+              })
+              $scope.onChangeRotateUser = function(item){
+                  $scope.assignUser = item.id;
+              }
+              $scope.onChangeRotateGroup = function(item){
+                  $scope.assignGroup = item.id;
+                  $scope.getUsers(item.id)
+              }
+              
+              $scope.ok = function () {
+                  if (!$scope.assignUser){
+                      Alert.swal({
+                          title: "操作失败",
+                          text: "请选择转派对象信息!",
+                          type: "error"
+                      });
+                      return;
+                  }
+                  api_bpm.assign({ids:sendList.join(),userId:$scope.assignUser}).then(function (response) {
+                      console.log(response)
+                      if (response.status == 200) {
+                          Alert.swal({
+                              title: "操作成功!",
+                              confirmButtonColor: "#007AFF",
+                              type: "success"
+                          });
+                          $modalInstance.close('success');
+                          _$scope.gridApi.selection.clearSelectedRows();
+                      } else {
+                          Alert.swal({
+                              title: "操作失败",
+                              text: "操作失败, 请稍后再试!",
+                              type: "error"
+                          });
+                      }
+                  });
+              }
+
+              $scope.cancel = function () {
+                  $modalInstance.dismiss('cancel');
+              }
+          },
+          size: 'sm',
+          resolve: {
+              api_bpm: function () {
+                  return api_bpm;
+              },
+              modelData: function () {
+                  return _$scope.selected.items;
+              },
+              currentUserId: function () {
+                  return loginUser.id;
+              },
+              Alert: function () {
+                  return SweetAlert;
+              },
+              api_user_data: function () {
+                  return api_user_data;
+              }
+          }
+      });
+      modalInstance.result.then(function (selectedItem) {
+          if (selectedItem == 'success') {
+              defaultFilterData.assignee = loginUser.id;
+              $scope.refreshData('expand-right', defaultFilterData);
+          }
+      });
+      return;
+        // --------------------------------------------------------
+    }
 
     $scope.selected = {
       items: [],
@@ -308,6 +447,7 @@ app.controller("inspectListCtrl", [
     $scope.jry_sum = 10;
     //分页控制
     $scope.gridOptions.onRegisterApi = function (gridApi) {
+      $scope.gridApi = gridApi;
       gridApi.pagination.on.paginationChanged(
         $scope,
         function (newPage, pageSize) {
@@ -322,10 +462,41 @@ app.controller("inspectListCtrl", [
           $scope.refreshData("expand-right", $scope.model);
         }
       );
-      // gridApi.selection.on.rowSelectionChanged($scope, function(data) {
-      //     data.grid.appScope.selected.items = data.entity
-      //     console.log(data);
-      // });
+      // 单选
+      gridApi.selection.on.rowSelectionChanged($scope, function(scope) {
+        console.log(scope)
+        if (scope.isSelected) {
+            scope.grid.appScope.selected.items.push(scope.entity)
+        } else {
+            for (var i = 0; i <= scope.grid.appScope.selected.items.length; i++) {
+                if (scope.grid.appScope.selected.items[i].id == scope.entity.id) {
+                    scope.grid.appScope.selected.items.splice(i, 1);
+                    break;
+                }
+            }
+        }
+        console.log(scope.grid.appScope.selected.items)
+      });
+      // 全选/全不选
+      gridApi.selection.on.rowSelectionChangedBatch($scope, function(rows) {
+        console.log(rows)
+        var selectitem = [];
+        selectitem = angular.copy($scope.selected.items);
+        for (var j = 0; j < rows.length; j++) {
+            if (rows[j].isSelected == true) {
+                selectitem.push(rows[j].entity);
+            } else {
+                delete selectitem[j];
+            }
+        }
+        $scope.selected.items = [];
+        for (var i = 0; i < selectitem.length; i++) {
+            if (selectitem[i]) {
+                $scope.selected.items.push(selectitem[i]);
+            }
+        }
+        console.log($scope.selected.items)
+    });
     };
 
     // var data = JSON.parse(sessionStorage.inspectListParameter);
@@ -406,6 +577,8 @@ app.controller("inspectListCtrl", [
     //搜索栏点击事件
     $scope.searchstate = "todo";
     $scope.onChange = function (searchType) {
+      console.log($scope.gridApi)
+      $scope.gridApi.selection.clearSelectedRows();
       $scope.searchstate = searchType;
       var filterData = JSON.parse(sessionStorage.inspectListParameter);
       filterData.searchType = searchType;

assets/js/controllers/inspect/inspectReportCtrl.js

@@ -247,7 +247,7 @@ app.controller("inspectReportCtrl", [
       {
         name: "inspectItem",
         displayName: "巡检项",
-        width: "22%",
+        width: "25%",
         enableFiltering: false,
         cellTemplate: `<div class="ui-grid-cell-contents">
             <div class="inspectPar">

assets/js/controllers/report/incident_reportCtrl.js

@@ -542,6 +542,8 @@ app.controller('incident_reportCtrl', ["$scope", "$rootScope", "$state", "$timeo
     }
     //重置
     $scope.report_Reset = function () {
+        $scope.select_treedata = [];
+        $scope.my_data = [];
         $scope.dateChoose.dateSelected = {};
         if($scope.searchkeys.placeId){
             delete($scope.searchkeys.placeId)

assets/js/main.js

@@ -660,6 +660,10 @@ app.factory('api_bpm', ['BpmRestangular', function (BpmRestangular) {
     var getData = BpmRestangular.all('data');
     var InspectionProcessActual = BpmRestangular.all('InspectionProcessActual');
     return {
+        //巡检列表批量指派
+        assign: function (data) {
+            return InspectionProcessActual.customPOST(data, 'batchAssign', {});
+        },
         //获取巡检报告
         report: function (data) {
             return InspectionProcessActual.customPOST(data, 'report', {});

assets/views/incident/tpl/toAssign.tpl.html

@@ -39,6 +39,6 @@
     </div>
 </div>
 <div class="modal-footer modelfooter-hint pointfont">
-    <div class="hintfooterleft pull-left" ng-click="ok()">确定</div>
-    <div class="hintfooterright pull-right" ng-click="cancel()">取消</div>
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
 </div>

assets/views/inspect/inspectList.html

@@ -242,6 +242,7 @@
             <span>搜索</span>
           </div>
           <div class="btn btn_clean" ng-click="clean()">重置</div>
+          <div class="btn btn_clean" ng-if="assign" ng-click="toAssign()" ng-disabled="selected.items.length==0">批量派单</div>
           <!-- <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="reload()">
                         <span translate="list.button.REFRESH">Refresh Data</span>
                         <i class="ti-reload" />
@@ -275,7 +276,8 @@
           ui-grid="gridOptions "
           ui-grid-pagination
           external-scopes="$scope "
-          ui-grid-resize-columns
+          ui-grid-resize-columns 
+          ui-grid-selection
           ui-grid-auto-resize
           class="grid"
         ></div>

bower_components/angular-ui-grid/ui-grid.css

@@ -2352,6 +2352,9 @@ select[multiple].ui-grid-pager-row-count-picker select {
 .ui-grid-selection-row-header-buttons.ui-grid-all-selected {
     opacity: 1;
 }
+.ui-grid-seimin .borderboxs{
+    display: none;
+}
 
 
 /* This file contains variable declarations (do not remove this line) */

bower_components/angular-ui-grid/ui-grid.js

@@ -26529,7 +26529,7 @@ angular.module('ui.grid').run(['$templateCache', function($templateCache) {
 
 
     $templateCache.put('ui-grid/ui-grid-row',
-        "<div 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>"
+        "<div 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,'ui-grid-seimin':!row.enableSelection }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>"
     );