优化

assets/js/config.router.js

@@ -543,7 +543,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                 }
             }).state('app.incident.incidentDetail', {
                 // 事件详情
-                url: '/incidentDetail/:id',
+                url: '/incidentDetail/:id/:type',
                 templateUrl: "assets/views/incident/incidentDetail.html",
                 resolve: loadSequence('jquery-sparkline', 'api-check', 'formly', 'angularFormly', 'angularFileUpload', 'multi.select.tree', 'customformCtrl', 'sanitize', 'incidentDetailCtrl'),
                 title: 'form detail',

assets/js/controllers/incident/incidentCtrl.js

@@ -2382,6 +2382,25 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
     };
 
+    //事件详情
+    $scope.toDetail = function (data) {
+        console.log(data,$rootScope.isFuwutai);
+        sessionStorage.incidentParameter = JSON.stringify({
+            searchkeys: $scope.searchkeys,
+            searchstate: $scope.searchstate,
+            othcode: $scope.othcode,
+            postData: $scope.postData,
+        });
+        if($rootScope.isFuwutai){
+            //角色是服务台人员
+            $state.go('app.incident.incidentDetail', {
+                id: data.id,
+            });
+        }else{
+            window.open(location.origin+'/#/app/incident/incidentDetail/'+data.id);
+        }
+    };
+
     if ($stateParams.model) {
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
             $scope.searchstate = JSON.parse($stateParams.model).searchType;
@@ -2734,15 +2753,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     }
     //查看
     $scope.toDetail = function (data) {
-        console.log(data,$rootScope.isFuwutai);
-        if($rootScope.isFuwutai){
-            //角色是服务台人员
-            $state.go('app.incident.incidentDetail', {
-                id: data.id,
-            });
-        }else{
-            window.open(location.origin+'/#/app/incident/incidentDetail/'+data.id);
-        }
+        $scope.colobject.grid.appScope.toDetail($scope.item);
     };
 }]);
 //操作按钮

assets/js/controllers/incident/incidentDetailCtrl.js

@@ -56,6 +56,12 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
         })
     }
 
+    $scope.type = $stateParams.type || 'incident.list';
+    //返回列表
+    $scope.goToList = function(type){
+        $state.go("app." + type);
+    }
+
     // 预览图片
     $scope.preview = function (type, url, idx) {
         let title = $scope[type][idx].title;
@@ -139,7 +145,7 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
         });
       }
     };
-		
+
 		// 回访
 		$scope.payReturn = function () {
 			let model = $scope.model
@@ -149,27 +155,27 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
 		      controller: function ($scope,$rootScope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data,api_category) {
 		          console.log(model,loginUser);
 		          $scope.model = model;
-		  
+
 		          $scope.postData = {
 		              degree: undefined,
 		              visitRemarks: '',
 		          }
 		          $scope.degreeList = [];
-		  
+
 		          // 获取满意度评价
 		          $scope.getDegree = function(){
 		              api_wechatfile.getDictionary({"key":"incident_degree","type":"list"}).then(function (data) {
 		                  $scope.degreeList = data || [];
 		              })
 		          }
-		  
+
 		          // 获取结果类型
 		          $scope.getHandleResult = function(){
 		              api_wechatfile.getDictionary({"key":"incident_handleresult","type":"list"}).then(function (data) {
 		                  $scope.handleResultList = data || [];
 		              })
 		          }
-		  
+
 		          // 初始化
 		          $scope.getDegree();
 		          $scope.getHandleResult();
@@ -195,7 +201,7 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
 		                  handleResult: $scope.postData.handleResult,
 		                  visitRemarks: $scope.postData.visitRemarks,
 		              }}};
-		  
+
 		              $rootScope.isMask = true;
 		              api_flow.accept("callback", postData).then(function (response) {
 		                  console.log(response)
@@ -220,7 +226,7 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
 		                  }
 		              });
 		          }
-		  
+
 		          $scope.cancel = function () {
 		              $modalInstance.dismiss('cancel');
 		          }
@@ -250,7 +256,7 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
 		      }
 		  });
 		};
-		
+
     // 关闭
     $scope.closeModel = function () {
       $state.go('app.incident.list', {});

assets/js/controllers/inspect/summaryCtrl.js

@@ -194,16 +194,16 @@ app.controller("summaryCtrl", [
       {
         name: "description",
         displayName: "故障描述|区域地点",
-        width: "400",
+        width: "20%",
         enableFiltering: false,
         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",
+        name: "consumableList",
         displayName: "耗材名称",
-        width: "10%",
+        width: "20%",
         enableFiltering: false,
-        cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.maintainer ? row.entity.maintainer.name : ""}}</div>'
+        cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferConsumableList(row.entity.consumableList)}}</div>'
       },
       {
         name: "totalMaintenancePrice",
@@ -250,6 +250,10 @@ app.controller("summaryCtrl", [
         return '';
       }
     };
+    $scope.transferConsumableList = function (consumableList) {
+      console.log(consumableList)
+      return consumableList ? consumableList.map(v => v.name).toString() : ""
+    };
     $scope.inspectdata = {};
     //跳转到查看列表
     $scope.seeFunction = function (data) {
@@ -384,7 +388,14 @@ app.controller("summaryCtrl", [
 
     // 查看事件
     $scope.toIncident = function(data){
+      sessionStorage.summaryParameter = JSON.stringify(
+        {
+          searchkeys: $scope.searchkeys,
+          postData: $scope.postData,
+        }
+      );
       $state.go('app.incident.incidentDetail', {
+        type: 'incident.summary',
         id: data.incidentId,
       });
     }

assets/js/controllers/mainCtrl.js

@@ -163,13 +163,14 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
         //     $scope.isShowTj = false;
         // }
       }
-      // 汇总单详情=>返回事件列表|返回汇总单列表
-      if(fromState.name !== 'app.incident.summaryDetail' && toState.name === 'app.incident.summary'){
+      // 汇总单/事件详情=>返回事件列表|返回汇总单列表
+      if(fromState.name !== 'app.incident.summaryDetail' && fromState.name !== 'app.incident.incidentDetail' && toState.name === 'app.incident.summary'){
         sessionStorage.removeItem('summaryParameter');
       }
-      if(fromState.name !== 'app.incident.summaryDetail' && toState.name === 'app.incident.list'){
+      if(fromState.name !== 'app.incident.summaryDetail' && fromState.name !== 'app.incident.incidentDetail' && 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/views/incident/incidentDetail.html

@@ -562,8 +562,8 @@
                     ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
 								<button type="close" ng-if="model.state.name=='已关闭'" class="btn btn_pay" ng-click="payReturn()"
 										>回访</button>
-                <button type="close" class="btn btn-default default" ng-click="closeModel()"
-                    translate="form.button.CLOSE">CLOSE</button>
+                    <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>
     </form>