优化

assets/js/config.router.js

@@ -1432,7 +1432,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
 
             //管理事件>维修汇总单
             .state('app.incident.summaryDetail', {
-                url: '/summaryDetail/{id}/{incidentId}/{dutyId}/{categoryId}',
+                url: '/summaryDetail/{type}/{id}/{incidentId}/{dutyId}/{categoryId}',
                 templateUrl: "assets/views/inspect/summaryDetail.html",
                 resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'summaryDetailCtrl'),
                 title: 'inspection.LIST',

assets/js/controllers/incident/incidentCtrl.js

@@ -676,6 +676,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     }
                     $scope.my_data = convertParentToChildList(objects);
                     $scope.select_treedata = angular.copy($scope.my_data);
+
+                    var incidentParameter = sessionStorage.incidentParameter && JSON.parse(sessionStorage.incidentParameter);
+                    incidentParameter && selectItem(incidentParameter.searchkeys.levelCategory, $scope.select_treedata);
                 }
                 if ($scope.my_data.length > 0) {
                     $scope.doing_async = false;
@@ -759,14 +762,56 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
                 $scope.selectTypeChange(true);
             }else{
-                $scope.refreshData('expand-right', undefined, true);
+                var incidentParameter = sessionStorage.incidentParameter && JSON.parse(sessionStorage.incidentParameter);
+                if(incidentParameter){
+                    $scope.searchkeys = incidentParameter.searchkeys;
+                    $scope.searchstate = incidentParameter.searchstate;
+                    $scope.othcode = incidentParameter.othcode;
+                    $scope.postData = incidentParameter.postData;
+                    // selectItem(incidentParameter.searchkeys.levelCategory, $scope.select_treedata);
+                    if($scope.postData.idx){
+                        $scope.gridOptions.paginationCurrentPage = $scope.postData.idx + 1;
+                    }
+                    $scope.chiceIncident($scope.searchkeys,$scope.othcode.state,);
+                }else{
+                    $scope.refreshData('expand-right', undefined, true);
+                }
             }
         })
     }
 
+    function selectItem(pmodel, childrens) {
+        if (angular.isArray(pmodel)) {
+          angular.forEach(pmodel, function (index) {
+            if (index && index.id) {
+              angular.forEach(childrens, function (item) {
+                if (item.id == index.id) {
+                  item.selected = true;
+                }
+                if (item && item.children) {
+                  selectItem(pmodel, item.children);
+                }
+              });
+            }
+          });
+        } else {
+          if (pmodel && pmodel.id) {
+            angular.forEach(childrens, function (item) {
+              if (item.id == pmodel.id) {
+                item.selected = true;
+              }
+              if (item && item.children) {
+                selectItem(pmodel, item.children);
+              }
+            });
+          }
+        }
+      }
+
     $scope.clear = function () {
         $scope.searchkeys = {};
         $scope.othcode = {};
+        sessionStorage.removeItem('incidentParameter');
 
         $scope.try_async_load();
         defaultFilterData = {
@@ -1081,7 +1126,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.jry_idx = 0;
         $scope.jry_sum = 10;
         gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
-            var filtersData = $scope.memoryfilterData;
+            var filtersData = $scope.memoryfilterData || {};
             filtersData.idx = newPage - 1;
             $scope.jry_idx = newPage - 1;
             filtersData.sum = pageSize;
@@ -2318,6 +2363,25 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
     }
 
+    //汇总单
+    $scope.toSummary = function (data) {
+        console.log(data)
+        console.log($scope.searchkeys)
+        sessionStorage.incidentParameter = JSON.stringify({
+            searchkeys: $scope.searchkeys,
+            searchstate: $scope.searchstate,
+            othcode: $scope.othcode,
+            postData: $scope.postData,
+        });
+        $state.go("app.incident.summaryDetail", {
+            type: 'incident.list',
+            incidentId: data.id || '',
+            categoryId: data.category ? data.category.id : '',
+            dutyId: data.duty ? data.duty.id : '',
+            id: data.summaryId || '',
+        });
+    };
+
     if ($stateParams.model) {
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
             $scope.searchstate = JSON.parse($stateParams.model).searchType;
@@ -2377,6 +2441,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.onChange('all', isInit);
     }
     //获取列表数据
+    $scope.postData = {};
     $scope.refreshData = _.debounce(function (style, filterData, isInit) {
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
@@ -2443,7 +2508,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }else{
             delete filterData.incident.candidateGroups;
         }
-
+        $scope.postData = filterData;
         // 调用接口-查列表
         api_user_data.fetchDataList('incident', filterData).then(function (data) {
             if (data.list) {
@@ -2540,6 +2605,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     $scope.assignFlag = false;//指派
     $scope.transferFlag = false;//转派
     $scope.shijianliebiao_duty = false;//设置责任科室
+    $scope.shijianliebiao_summary = false;//汇总单
 
     for (var i = 0; i < loginUser.menu.length; i++) {
         if (loginUser.menu[i].link == "shijianliebiao_all") {
@@ -2572,6 +2638,9 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
         if (loginUser.menu[i].link == "shijianliebiao_duty") {
             $scope.shijianliebiao_duty = true
         }
+        if (loginUser.menu[i].link == "shijianliebiao_summary") {
+            $scope.shijianliebiao_summary = true
+        }
     }
     $scope.up = true;
     $scope.fuwutaiRenYuan = false;//服务台人员
@@ -2652,6 +2721,10 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     $scope.setDuty = function () {
         $scope.colobject.grid.appScope.setDuty($scope.item);
     }
+    // 汇总单
+    $scope.toSummary = function () {
+        $scope.colobject.grid.appScope.toSummary($scope.item);
+    }
 
     $scope.play = function () { //record
         $scope.colobject.grid.appScope.play($scope.item);
@@ -2685,6 +2758,7 @@ app.directive('incidentoperator', function () {
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
             '<a ng-click="changeCenter()" ng-show="jry_modify(item, user)" class="luyinfont">编辑</a>' +
             '<a ng-click="delSj()" ng-show="{{delFlag && item.deleteFlag !== 1}}" class="assign" >删除</a>' +
+            '<a ng-click="toSummary()" ng-show="{{shijianliebiao_summary && item.state.value == \'close\' && item.duty.addSummary == 1 && item.summaryId && item.deleteFlag !== 1}}" class="assign" >汇总单</a>' +
             '<a ng-click="storageSj()" ng-show="{{storageFlag && item.state.value === \'storage\' && item.deleteFlag !== 1}}" class="assign" >继续创建</a><br>' +
             '<a ng-click="edit()"  ng-show="{{item.state.value == \'handler\' && item.handlingPersonnelUser && item.handlingPersonnelUser.id == user.id && chuli && item.deleteFlag !== 1}}"  class="bianjifont">处理</a>' +
             '<a ng-click="handler()" ng-show="{{item.state.value == \'pending\' && ((item.currentLog && item.currentLog.workerId == user.id) || item.tiquPower) && qiangdan && item.deleteFlag !== 1}}" class="bianjifont" >接单</a>' +

assets/js/controllers/inspect/summaryCtrl.js

@@ -49,6 +49,7 @@ app.controller("summaryCtrl", [
     $scope.shanchu = false;
     $scope.shenhe = false;
     $scope.summary_recalculate = false;
+    $scope.summary_incident = false;
     for (var i = 0; i < loginUser.menu.length; i++) {
       if (loginUser.menu[i].link == "summary_chakan") {
         $scope.chakan = true;
@@ -62,6 +63,9 @@ app.controller("summaryCtrl", [
       if (loginUser.menu[i].link == "summary_recalculate") {
         $scope.summary_recalculate = true;
       }
+      if (loginUser.menu[i].link == "summary_incident") {
+        $scope.summary_incident = true;
+      }
     }
     var defaultFilterData = {
       idx: 0,
@@ -69,15 +73,15 @@ app.controller("summaryCtrl", [
       repairSummary:{}
     };
 
-    var repairSummaryParameter = {
-      idx: 0,
-      sum: 10,
-      operation: "",
-      status: "",
-      repairSummary: {},
-    };
+    // var repairSummaryParameter = {
+    //   idx: 0,
+    //   sum: 10,
+    //   operation: "",
+    //   status: "",
+    //   repairSummary: {},
+    // };
     //本地存储
-    sessionStorage.repairSummaryParameter = JSON.stringify(repairSummaryParameter);
+    // sessionStorage.repairSummaryParameter = JSON.stringify(repairSummaryParameter);
 
     $scope.memoryfilterData = {
       idx: 0,
@@ -88,6 +92,7 @@ app.controller("summaryCtrl", [
 
     $scope.gridOptions = {};
     $scope.gridOptions.data = "myData";
+    $scope.gridOptions.rowHeight = 54;
     $scope.gridOptions.enableColumnResizing = true;
     $scope.gridOptions.enableFiltering = false;
     $scope.gridOptions.enableGridMenu = true;
@@ -172,23 +177,30 @@ app.controller("summaryCtrl", [
         width: 50,
         enableFiltering: false,
       },
-
       {
         name: "incidentSign",
-        displayName: "事件单号",
+        displayName: "事件单号|报修科室",
+        width: "10%",
+        enableFiltering: false,
+        cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.incidentSign}}<br>{{row.entity.incidentDTO.department ? row.entity.incidentDTO.department.dept : "无"}}</div>'
+      },
+      {
+        name: "incidentSign1",
+        displayName: "登记时间|维修人",
         width: "10%",
         enableFiltering: false,
+        cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.incidentDTO.acceptDate)}}<br>{{row.entity.maintainer ? row.entity.maintainer.name : ""}}</div>'
       },
       {
         name: "description",
-        displayName: "故障描述",
+        displayName: "故障描述|区域地点",
         width: "400",
         enableFiltering: false,
-        // cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.planStartTime.length>16?grid.appScope.transferTime(row.entity.planStartTime):row.entity.planStartTime}}</div>'
+        cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.description}}<br>{{row.entity.incidentDTO.area ? row.entity.incidentDTO.area.area : ""}} {{row.entity.incidentDTO.place ? row.entity.incidentDTO.place.place : ""}}</div>'
       },
       {
         name: "maintainer",
-        displayName: "维修人",
+        displayName: "耗材名称",
         width: "10%",
         enableFiltering: false,
         cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.maintainer ? row.entity.maintainer.name : ""}}</div>'
@@ -200,23 +212,23 @@ app.controller("summaryCtrl", [
         enableFiltering: false,
         cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.totalMaintenancePrice || 0}}元</div>'
       },
+      // {
+      //   name: "createTime",
+      //   displayName: "生成时间",
+      //   width: "11%",
+      //   enableFiltering: false,
+      //   cellTemplate: '<div class="ui-grid-cell-contents">{{ grid.appScope.transferTime(row.entity.createTime) }}</div>'
+      // },
+      // {
+      //   name: "state",
+      //   displayName: "状态",
+      //   width: "6%",
+      //   enableFiltering: false,
+      //   cellTemplate:
+      //     '<div class="ui-grid-cell-contents"><span ng-if="row.entity.state == 1">暂存</span><span ng-if="row.entity.state == 2">未审核</span><span ng-if="row.entity.state == 3">审核通过</span></div>',
+      // },
       {
-        name: "createTime",
-        displayName: "生成时间",
-        width: "11%",
-        enableFiltering: false,
-        cellTemplate: '<div class="ui-grid-cell-contents">{{ grid.appScope.transferTime(row.entity.createTime) }}</div>'
-      },
-      {
-        name: "state",
-        displayName: "状态",
-        width: "6%",
-        enableFiltering: false,
-        cellTemplate:
-          '<div class="ui-grid-cell-contents"><span ng-if="row.entity.state == 1">暂存</span><span ng-if="row.entity.state == 2">未审核</span><span ng-if="row.entity.state == 3">审核通过</span></div>',
-      },
-      {
-        minWidth: "230",
+        minWidth: "250",
         name: "操作",
         enableFiltering: false,
         cellTemplate:
@@ -225,6 +237,7 @@ app.controller("summaryCtrl", [
           '<a ng-click="grid.appScope.removeData(row.entity)" ng-if="grid.appScope.shanchu" class="bianjifont">删除</a>' +
           '<a ng-click="grid.appScope.runFunction(row.entity)" ng-if="grid.appScope.shenhe && row.entity.state == 2" class="bianjifont">审核通过</a>' +
           '<a ng-click="grid.appScope.recalculate(row.entity)" ng-if="grid.appScope.summary_recalculate && (row.entity.state == 1 || row.entity.state == 2)" class="bianjifont">重算</a>' +
+          '<a ng-click="grid.appScope.toIncident(row.entity)" ng-if="grid.appScope.summary_incident" class="bianjifont">查看事件</a>' +
           "</div>",
       },
       // { name: 'planTime2', displayName: '截止时间', width: 160, enableFiltering: false },
@@ -241,7 +254,15 @@ app.controller("summaryCtrl", [
     //跳转到查看列表
     $scope.seeFunction = function (data) {
       console.log(data)
+      console.log($scope.searchkeys)
+      sessionStorage.summaryParameter = JSON.stringify(
+        {
+          searchkeys: $scope.searchkeys,
+          postData: $scope.postData,
+        }
+      );
       $state.go("app.incident.summaryDetail", {
+        type: 'incident.summary',
         incidentId: data.incidentId || '',
         categoryId: data.incidentCategoryId || '',
         dutyId: data.incidentDutyId || '',
@@ -361,6 +382,13 @@ app.controller("summaryCtrl", [
       });
     };
 
+    // 查看事件
+    $scope.toIncident = function(data){
+      $state.go('app.incident.incidentDetail', {
+        id: data.incidentId,
+      });
+    }
+
     //行删除
     $scope.removeData = function (item) {
       console.log($scope.selected.items);
@@ -453,16 +481,16 @@ app.controller("summaryCtrl", [
       gridApi.pagination.on.paginationChanged(
         $scope,
         function (newPage, pageSize) {
-          var filterData = JSON.parse(sessionStorage.repairSummaryParameter);
+          // var filterData = JSON.parse(sessionStorage.repairSummaryParameter);
           var filtersData = {};
           filtersData.idx = newPage - 1;
           filtersData.sum = pageSize;
           $scope.pageNum = $scope.gridApi.pagination.getPage() - 1;
           // console.log(pp);
-          filterData.idx = $scope.pageNum;
+          // filterData.idx = $scope.pageNum;
           $scope.fileData.idx = newPage - 1;
           $scope.fileData.sum = pageSize;
-          sessionStorage.repairSummaryParameter = JSON.stringify(filterData);
+          // sessionStorage.repairSummaryParameter = JSON.stringify(filterData);
           $scope.refreshData("expand-right", $scope.fileData);
         }
       );
@@ -529,7 +557,8 @@ app.controller("summaryCtrl", [
       gridApi.core.on.filterChanged($scope, function () {
         var grid = this.grid;
 
-        var filterData = JSON.parse(sessionStorage.repairSummaryParameter);
+        // var filterData = JSON.parse(sessionStorage.repairSummaryParameter);
+        var filterData = {};
 
         angular.forEach(grid.columns, function (item) {
           if (item.enableFiltering) {
@@ -545,7 +574,7 @@ app.controller("summaryCtrl", [
           }
         });
 
-        sessionStorage.repairSummaryParameter = JSON.stringify(filterData);
+        // sessionStorage.repairSummaryParameter = JSON.stringify(filterData);
         $scope.refreshData("expand-right", filterData);
       });
     };
@@ -557,6 +586,7 @@ app.controller("summaryCtrl", [
   }
 
     //数据刷新
+    $scope.postData = {};
     $scope.refreshData = function (style, filterData) {
       $scope.ldloading[style.replace("-", "_")] = true;
 
@@ -578,6 +608,7 @@ app.controller("summaryCtrl", [
         state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
         maintainer: $scope.searchkeys.maintainer || undefined,
       })
+      $scope.postData = filterData;
       api_bpm_data.fetchDataList("repairSummary", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
@@ -644,6 +675,7 @@ app.controller("summaryCtrl", [
         state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
         maintainer: $scope.searchkeys.maintainer || undefined,
       })
+      $scope.postData = filterData;
       api_bpm_data.fetchDataList("repairSummary", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
@@ -702,7 +734,7 @@ app.controller("summaryCtrl", [
     };
 
     $scope.refresh = function () {
-      var jry_filterData = JSON.parse(sessionStorage.repairSummaryParameter);
+      // var jry_filterData = JSON.parse(sessionStorage.repairSummaryParameter);
       var intervalData = {};
       intervalData.idx = jry_filterData.idx;
       intervalData.sum = jry_filterData.sum;
@@ -710,6 +742,19 @@ app.controller("summaryCtrl", [
       $scope.refreshData("expand-right", intervalData);
     };
 
+    // init
+    $scope.init = function(){
+      var summaryParameter = sessionStorage.summaryParameter && JSON.parse(sessionStorage.summaryParameter);
+      if(summaryParameter){
+        $scope.searchkeys = summaryParameter.searchkeys;
+        $scope.postData = summaryParameter.postData;
+        if($scope.postData.idx){
+          $scope.gridOptions.paginationCurrentPage = $scope.postData.idx + 1;
+        }
+      }
+    }
+    $scope.init();
+
     $scope.refreshData("expand-right", $scope.fileData);
     $scope.timer = $interval(function () {
       $scope.refreshData2("expand-right", $scope.fileData);

assets/js/controllers/inspect/summaryDetailCtrl.js

@@ -75,6 +75,7 @@ app.controller("summaryDetailCtrl", [
     }
 
     // 获取信息
+    $scope.type = $stateParams.type;
     $scope.consumableList = [];
     $scope.incidentDTO = {};
     $scope.workHourManagementList = [];
@@ -101,8 +102,8 @@ app.controller("summaryDetailCtrl", [
     }
     $scope.getInfo();
     //返回列表
-    $scope.goToList = function(){
-      $state.go("app.incident.summary");
+    $scope.goToList = function(type){
+      $state.go("app." + type);
     }
     $scope.transferTime = function (time) {
       if(time){

assets/js/controllers/mainCtrl.js

@@ -163,6 +163,13 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
         //     $scope.isShowTj = false;
         // }
       }
+      // 汇总单详情=>返回事件列表|返回汇总单列表
+      if(fromState.name !== 'app.incident.summaryDetail' && toState.name === 'app.incident.summary'){
+        sessionStorage.removeItem('summaryParameter');
+      }
+      if(fromState.name !== 'app.incident.summaryDetail' && toState.name === 'app.incident.list'){
+        sessionStorage.removeItem('incidentParameter');
+      }
       if($rootScope.isZncd || $rootScope.isXy){
         // 中南财大
         if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&

assets/js/main.js

@@ -599,6 +599,10 @@ app.factory('api_user_data', ['UserRestangular', function (UserRestangular) {
     var dataService = UserRestangular.all("user/data");
     var userService = UserRestangular.all("auth");
     return {
+        // 校验密码
+        checkDelFileDoc: function (data) {
+            return dataService.customPOST(data, 'checkDelFileDoc', {});
+        },
         cacheFresh: function (model) {
             return dataService.customPOST({}, 'cache/fresh/' + model, {});
         },

assets/views/file/indexes.html

@@ -56,7 +56,7 @@
                     </div>
                     <div class="right">
                         <button class="search" ng-click="list_search()">搜索</button>
-                        <button class="clean" ng-click="clean()">清空</button>                       
+                        <button class="clean" ng-click="clean()">清空</button>
                     </div>
                 </div>
                 <div class="body">
@@ -87,7 +87,7 @@
                 </div>
                 <div>
                     <span class="left"></span><input type="text" class="file_name" placeholder="请输入文件夹名称" maxlength="20" ng-model="add_file_name">
-                </div>         
+                </div>
                 <div class="tit">
                     <span class="left"></span><span>是否有父类：</span>
                 </div>
@@ -147,7 +147,7 @@
         <!-- 确定删除弹框 -->
         <div class="deleteTree_box">
             <div class="head">提示</div>
-            <div class="body">               
+            <div class="body">
                 <div>请输入登录密码:</div>
                 <input type="password" class="password" ng-model="delete_password">
                 <div class="titsc"><i class="iconfont icon-gantan"></i>输入登录密码后,点击"确认",<span class="file_name">{{modify_data.label}}</span>文件夹以及<span class="file_name">{{modify_data.label}}</span>文件夹下的所有文件将被删除!</div>
@@ -201,7 +201,7 @@
         margin: 0 auto;
         display: flex;
         justify-content:center;
-        margin-top: 8px 
+        margin-top: 8px
     }
     .jry_box .folder .search input{
         border-radius: 4px 0 0 4px;
@@ -521,7 +521,7 @@
         background-color: white;
         border-radius: 2px;
         display: none
-        
+
     }
     .fix_back .deleteTree_box .head{
         height: 35px;

assets/views/file/list.html

@@ -59,7 +59,7 @@
                     </div>
                     <div class="right">
                         <button class="search" ng-click="list_search()">搜索</button>
-                        <button class="clean" ng-click="clean()">清空</button>                       
+                        <button class="clean" ng-click="clean()">清空</button>
                     </div>
                     <!-- <input type="text"> -->
                 </div>
@@ -91,7 +91,7 @@
                 </div>
                 <div>
                     <span class="left"></span><input type="text" class="file_name" placeholder="请输入文件夹名称" maxlength="20" ng-model="add_file_name">
-                </div>         
+                </div>
                 <div class="tit">
                     <span class="left"></span><span>是否有父类：</span>
                 </div>
@@ -151,7 +151,7 @@
         <!-- 确定删除树弹框 -->
         <div class="deleteTree_box">
             <div class="head">提示</div>
-            <div class="body">               
+            <div class="body">
                 <div>请输入登录密码:</div>
                 <input type="password" class="password" ng-model="delete_password">
                 <div class="titsc"><i class="iconfont icon-gantan"></i>输入登录密码后,点击"确认",<span class="file_name">{{modify_data.label}}</span>文件夹以及<span class="file_name">{{modify_data.label}}</span>文件夹下的所有文件将被删除!</div>
@@ -164,7 +164,7 @@
         <!-- 确定删除文件弹框 -->
         <div class="deleteDoc_box">
             <div class="head">提示</div>
-            <div class="body">               
+            <div class="body">
                 <div>请输入登录密码:</div>
                 <input type="password" class="password" ng-model="delete_doc_password">
                 <div class="titsc"><i class="iconfont icon-gantan"></i>输入登录密码后,点击"确认",<span class="file_name">{{list_doc_name}}</span>文件以及文件下{{list_doc_version}}个版本将被删除!</div>
@@ -177,7 +177,7 @@
         <!-- 确认删除历史版本弹框 -->
         <div class="deleteVersion_box">
             <div class="head">提示</div>
-            <div class="body">               
+            <div class="body">
                 <div>请输入登录密码:</div>
                 <input type="password" class="password" ng-model="delete_version_password">
                 <div class="titsc"><i class="iconfont icon-gantan"></i>输入登录密码后,点击"确认",该历史版本将被删除!</div>
@@ -256,7 +256,7 @@
         height: 25px;
         line-height: 25px;
         font-size: 16px;
-        
+
     }
     .jry_box .folder{
         border:1px rgb(185, 184, 184) solid;
@@ -309,7 +309,7 @@
         margin: 0 auto;
         display: flex;
         justify-content:center;
-        margin-top: 8px 
+        margin-top: 8px
     }
     .jry_box .folder .search input{
         border-radius: 4px 0 0 4px;
@@ -498,7 +498,7 @@
         color: white
     }
     /* .fix_back .add_new_box .foot button:nth-child(1){
-        
+
     } */
     .fix_back .add_new_box .foot button:nth-child(2){
         border:1px rgb(230,230,230) solid;
@@ -711,7 +711,7 @@
         background-color: white;
         border-radius: 2px;
         display: none
-        
+
     }
     .fix_back .deleteTree_box .head{
         height: 35px;
@@ -789,7 +789,7 @@
         background-color: white;
         border-radius: 2px;
         display: none
-        
+
     }
     .fix_back .deleteDoc_box .head{
         height: 35px;
@@ -867,7 +867,7 @@
         background-color: white;
         border-radius: 2px;
         display: none
-        
+
     }
     .fix_back .deleteVersion_box .head{
         height: 35px;

assets/views/inspect/summary.html

@@ -153,18 +153,22 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa;
+        /* background: #fafafa; */
         display: flex;
-        justify-content: center;
+        /* justify-content: center; */
         align-items: center;
     }
 
     .ui-grid-row:nth-child(odd) .ui-grid-cell {
         display: flex;
-        justify-content: center;
+        /* justify-content: center; */
         align-items: center;
     }
 
+    .ui-grid-cell-contents{
+        height: auto;
+    }
+
     .ui-grid-row .ui-grid-cell:last-of-type {
         justify-content: flex-start;
     }

assets/views/inspect/summaryDetail.html

@@ -346,7 +346,8 @@
             <div class="totalPrice" style="font-size: 16px;">汇总单总价：{{ totalMaintenancePrice }}元</div>
             <div class="btnWrap">
                 <div class="btn btn_search" ng-click="goToIncident()"><span>查看事件</span></div>
-                <div class="btn btn_search" style="margin-left: 8px;" ng-click="goToList()"><span>返回列表</span></div>
+                <div class="btn btn_search" style="margin-left: 8px;" ng-click="goToList(type)" ng-if="type === 'incident.summary'"><span>返回汇总单列表</span></div>
+                <div class="btn btn_search" style="margin-left: 8px;" ng-click="goToList(type)" ng-if="type === 'incident.list'"><span>返回事件列表</span></div>
             </div>
         </div>
     </div>