Merge branch 'lmm'

assets/css/styles.css

@@ -12228,7 +12228,7 @@ fieldset[disabled] .btn-gray.active {
 
 .ui-select-multiple.ui-select-bootstrap {
     height: auto;
-    padding: 3px 3px 0;
+    padding: 1px 3px 1px!important;
 }
 
 .btn-xs,

assets/js/controllers/incident/incidentCtrl.js

@@ -44,6 +44,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         {key: 'resolve', value: '由我解决', num: ''},
         {key: 'owns', value: '与我关联', num: ''},
         {key: 'storage', value: '暂存', num: ''},
+        // {key: 'badEvaluate', value: '异常评价', num: ''},
     ]
     // /是否逾期
     $scope.langs = i18nService.getAllLangs();
@@ -54,6 +55,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     $scope.allFlag = false;//全部事件
     $scope.daochu = false;//导出
     $scope.huifang = false;//回访
+    $scope.badEvaluate = false;//异常评价
     for (var i = 0; i < loginUser.menu.length; i++) {
         if (loginUser.menu[i].link == "shijianliebiao_all") {
             $scope.allFlag = true;
@@ -72,6 +74,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if (loginUser.menu[i].link == "shijianliebiao_daochu") {
             $scope.daochu = true
         }
+        if (loginUser.menu[i].link == "shijianliebiao_badEvaluate") {
+            $scope.badEvaluate = true
+            $scope.tabs.push({key: 'badEvaluate', value: '异常评价', num: ''});
+        }
     }
     var loginuserGroup = "";
     for (var i = 0; i < $rootScope.user.group.length; i++) {
@@ -155,214 +161,296 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         return statecolor;
     }
-    if($scope.repairMain.valueconfig == 1){//报修人
-        $scope.gridOptions.columnDefs = [
-            {
-                name: 'id',
-                displayName: '',
-                width: 35,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity)}}"></i></div></div>' +
-                    '</div>'
-            },
-            {
-                name: 'item',
-                displayName: '序号',
-                width: 45,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'incidentsign',
-                displayName: '事件单号',
-                width: 120,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.incidentsign}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'requester.name',
-                displayName: '报修人',
-                width: '6%',
-                minWidth: '90',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.requester.name}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'requester.account',
-                displayName: '学工号',
-                width: '6%',
-                minWidth: '90',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.requester.account}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'contactsInformation',
-                displayName: '联系电话',
-                width: '105',
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.contactsInformation}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'category',
-                displayName: '故障现象',
-                width: '10%',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'houseNumber',
-                displayName: '区域地点',
-                width: '14%',
-                enableFiltering: false,
-                cellTemplate: '<div><div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.areaplace(row.entity)"></div></div>'
-            },
-            {
-                name: 'acceptUser.name',
-                displayName: '受理人',
-                width: '7%',
-                minWidth: '80',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser.name}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'acceptDate',
-                displayName: '登记时间',
-                width: '10%',
-                minWidth: '140',
-                enableFiltering: false,
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}</div></div>'
-            },
-            {
-                name: 'groupORHandlerUser',
-                displayName: '处理人/组',
-                width: '10%',
-                enableFiltering: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">' +
-                    '{{row.entity.groupORHandlerUser}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'state.name',
-                displayName: '状态',
-                width: '7%',
-                minWidth: '70',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.state.name}}</div>' +
-                    '</div>'
-            },
-            {
-                name: '操作',
-                enableSorting: false,
-                width: 500,
-                cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
-                enableFiltering: false
-            },
-        ];
-        if($scope.wxIncidentWithCmdb==1){
-          let index = $scope.gridOptions.columnDefs.findIndex(v=>v.name == 'contactsInformation');
-          $scope.gridOptions.columnDefs.splice(index,0,{
-            name: 'assetId',
-            displayName: '资产',
-            width: 120
-        },)
+
+    $scope.showColumn = function(){
+        if($scope.repairMain.valueconfig == 1){//报修人
+            $scope.gridOptions.columnDefs = [
+                {
+                    name: 'id',
+                    displayName: '',
+                    width: 35,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity)}}"></i></div></div>' +
+                        '</div>'
+                },
+                {
+                    name: 'item',
+                    displayName: '序号',
+                    width: 45,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'incidentsign',
+                    displayName: '事件单号',
+                    width: 120,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents">{{row.entity.incidentsign}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'requester.name',
+                    displayName: '报修人',
+                    width: '6%',
+                    minWidth: '90',
+                    enableSorting: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents" >{{row.entity.requester.name}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'requester.account',
+                    displayName: '学工号',
+                    width: '6%',
+                    minWidth: '90',
+                    enableSorting: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents" >{{row.entity.requester.account}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'contactsInformation',
+                    displayName: '联系电话',
+                    width: '105',
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents">{{row.entity.contactsInformation}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'category',
+                    displayName: '故障现象',
+                    width: '10%',
+                    enableSorting: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'houseNumber',
+                    displayName: '区域地点',
+                    width: '14%',
+                    enableFiltering: false,
+                    cellTemplate: '<div><div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.areaplace(row.entity)"></div></div>'
+                },
+                {
+                    name: 'acceptUser.name',
+                    displayName: '受理人',
+                    width: '7%',
+                    minWidth: '80',
+                    enableSorting: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser.name}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'acceptDate',
+                    displayName: '登记时间',
+                    width: '10%',
+                    minWidth: '140',
+                    enableFiltering: false,
+                    cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}</div></div>'
+                },
+                {
+                    name: 'groupORHandlerUser',
+                    displayName: '处理人/组',
+                    width: '10%',
+                    enableFiltering: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents">' +
+                        '{{row.entity.groupORHandlerUser}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: 'state.name',
+                    displayName: '状态',
+                    width: '7%',
+                    minWidth: '70',
+                    enableSorting: false,
+                    cellTemplate: '<div>' +
+                        '<div class="ui-grid-cell-contents" >{{row.entity.state.name}}</div>' +
+                        '</div>'
+                },
+                {
+                    name: '操作',
+                    enableSorting: false,
+                    width: 500,
+                    cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
+                    enableFiltering: false
+                },
+            ];
+            if($scope.wxIncidentWithCmdb==1){
+              let index = $scope.gridOptions.columnDefs.findIndex(v=>v.name == 'contactsInformation');
+              $scope.gridOptions.columnDefs.splice(index,0,{
+                name: 'assetId',
+                displayName: '资产',
+                width: 120
+            },)
+            }
+        }else if($scope.repairMain.valueconfig == 2){//报修科室
+            if($scope.searchstate === 'badEvaluate'){
+                // 异常评价
+                $scope.gridOptions.columnDefs = [
+                    {
+                        name: 'id',
+                        displayName: '',
+                        width: 35,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity)}}"></i></div></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row1',
+                        displayName: '序号',
+                        width: 45,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row2',
+                        displayName: '单号|报修科室',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.incidentsign || "无"}}<br>{{row.entity.department ? row.entity.department.dept : "无"}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row3',
+                        displayName: '报修人|来电电话',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.requester ? row.entity.requester.name : "无"}}<br>{{row.entity.incomingPhone || "无"}}<a ng-click="grid.appScope.play(row.entity)" ng-if="row.entity.callID" tooltip="播放录音" tooltip-placement="left"><i class="ti-microphone"></i></a></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row5',
+                        displayName: '故障现象|区域地点',
+                        width: 350,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span><br><span ng-bind-html="grid.appScope.areaplace(row.entity)"></span></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row6',
+                        displayName: '受理人|处理人/组',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br><span tooltip="{{grid.appScope.transferSynergetic(row.entity)}}" tooltip-placement="top">{{grid.appScope.transferSynergetic(row.entity)}}</span></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row7',
+                        displayName: '登记时间',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row9',
+                        displayName: '回访满意度|评价满意度',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents" ><span tooltip={{row.entity.visitRemarks}} tooltip-placement="right">{{row.entity.degree ? row.entity.degree.name : ""}}</span><br><span tooltip={{row.entity.wxdegreeremark}} tooltip-placement="right">{{row.entity.wxdegree ? row.entity.wxdegree.name : ""}}</span></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: '操作',
+                        enableSorting: false,
+                        width: 196,
+                        cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
+                        enableFiltering: false
+                    },
+                ];
+            }else{
+                $scope.gridOptions.columnDefs = [
+                    {
+                        name: 'id',
+                        displayName: '',
+                        width: 35,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity)}}"></i></div></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row1',
+                        displayName: '序号',
+                        width: 45,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row2',
+                        displayName: '单号|报修科室',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.incidentsign || "无"}}<br>{{row.entity.department ? row.entity.department.dept : "无"}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row3',
+                        displayName: '报修人|来电电话',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.requester ? row.entity.requester.name : "无"}}<br>{{row.entity.incomingPhone || "无"}}<a ng-click="grid.appScope.play(row.entity)" ng-if="row.entity.callID" tooltip="播放录音" tooltip-placement="left"><i class="ti-microphone"></i></a></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row5',
+                        displayName: '故障现象|区域地点',
+                        width: 350,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span><br><span ng-bind-html="grid.appScope.areaplace(row.entity)"></span></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row6',
+                        displayName: '受理人|处理人/组',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br><span tooltip="{{grid.appScope.transferSynergetic(row.entity)}}" tooltip-placement="top">{{grid.appScope.transferSynergetic(row.entity)}}</span></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row7',
+                        displayName: '登记时间|接单时间',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}<br>{{grid.appScope.transferTime(row.entity.responseHandleTime)}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row9',
+                        displayName: '状态|解决时间',
+                        width: 150,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents" ><span ng-switch="row.entity.state.value"><span ng-switch-when="pending" style="color:orange;">{{row.entity.state.name}}</span><span ng-switch-when="resolved" style="color:green;">{{row.entity.state.name}}</span><span ng-switch-when="handler" style="font-weight:bold;">{{row.entity.state.name}}</span><span ng-switch-default>{{row.entity.state.name}}</span></span><br>{{grid.appScope.transferTime(row.entity.handleTime)}}</div>' +
+                            '</div>'
+                    },
+                    {
+                        name: 'row10',
+                        displayName: '最近维修记录',
+                        width: 140,
+                        cellTemplate: '<div style="width: 100%;">' +
+                            '<div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.transferHandlerLog(row.entity.currentLog)"></div>' +
+                            '</div>'
+                    },
+                    {
+                        name: '操作',
+                        enableSorting: false,
+                        width: 196,
+                        cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
+                        enableFiltering: false
+                    },
+                ];
+            }
         }
-    }else if($scope.repairMain.valueconfig == 2){//报修科室
-        $scope.gridOptions.columnDefs = [
-            {
-                name: 'id',
-                displayName: '',
-                width: 35,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity)}}"></i></div></div>' +
-                    '</div>'
-            },
-            {
-                name: 'row1',
-                displayName: '序号',
-                width: 45,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'row2',
-                displayName: '单号|报修科室',
-                width: 150,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.incidentsign || "无"}}<br>{{row.entity.department ? row.entity.department.dept : "无"}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'row3',
-                displayName: '报修人|来电电话',
-                width: 150,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.requester ? row.entity.requester.name : "无"}}<br>{{row.entity.incomingPhone || "无"}}<a ng-click="grid.appScope.play(row.entity)" ng-if="row.entity.callID" tooltip="播放录音" tooltip-placement="left"><i class="ti-microphone"></i></a></div>' +
-                    '</div>'
-            },
-            {
-                name: 'row5',
-                displayName: '故障现象|区域地点',
-                width: 350,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span><br><span ng-bind-html="grid.appScope.areaplace(row.entity)"></span></div>' +
-                    '</div>'
-            },
-            {
-                name: 'row6',
-                displayName: '受理人|处理人/组',
-                width: 150,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br><span tooltip="{{grid.appScope.transferSynergetic(row.entity)}}" tooltip-placement="top">{{grid.appScope.transferSynergetic(row.entity)}}</span></div>' +
-                    '</div>'
-            },
-            {
-                name: 'row7',
-                displayName: '登记时间|接单时间',
-                width: 150,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}<br>{{grid.appScope.transferTime(row.entity.responseHandleTime)}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'row9',
-                displayName: '状态|解决时间',
-                width: 150,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents" ><span ng-switch="row.entity.state.value"><span ng-switch-when="pending" style="color:orange;">{{row.entity.state.name}}</span><span ng-switch-when="resolved" style="color:green;">{{row.entity.state.name}}</span><span ng-switch-when="handler" style="font-weight:bold;">{{row.entity.state.name}}</span><span ng-switch-default>{{row.entity.state.name}}</span></span><br>{{grid.appScope.transferTime(row.entity.handleTime)}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'row10',
-                displayName: '最近维修记录',
-                width: 140,
-                cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.transferHandlerLog(row.entity.currentLog)"></div>' +
-                    '</div>'
-            },
-            {
-                name: '操作',
-                enableSorting: false,
-                width: 196,
-                cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
-                enableFiltering: false
-            },
-        ];
     }
 
+    $scope.showColumn();
+
     $scope.transferTime = function (time) {
         if(time){
             return moment(time).format('YYYY-MM-DD HH:mm');
@@ -2251,6 +2339,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.isDisabledState = false;
         $scope.searchstate = searchstate;
         $scope.chiceIncident($scope.searchkeys,$scope.othcode.state, isInit);
+        $scope.showColumn();
     }
     // 是否逾期下拉框选择
     $scope.selectTypeChange = function(isInit){
@@ -2317,7 +2406,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if(!filterData.incident){
             filterData.incident = {};
         }
-        if($scope.searchstate === 'all' || $scope.searchstate === 'callback'){
+        if($scope.searchstate === 'all' || $scope.searchstate === 'callback' || $scope.searchstate === 'badEvaluate'){
             if($rootScope.user.duty){
                 // 当前的所属责任科室
                 filterData.incident.duty = $rootScope.user.duty;
@@ -2375,7 +2464,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             if(!incident){
                 incident = {};
             }
-            if(incident.queryTask === 'all' || incident.queryTask === 'callback'){
+            if(incident.queryTask === 'all' || incident.queryTask === 'callback' || incident.queryTask === 'badEvaluate'){
                 if($rootScope.user.duty){
                     // 当前的所属责任科室
                     incident.duty = $rootScope.user.duty;

assets/js/controllers/report/event_formCtrl.js

@@ -522,6 +522,10 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
             value: $scope.groupSelected[1]//选中
         };
         $scope.own.duty && $scope.tap == 'CLRZ' && $scope.mdxquery();
+
+        $scope.companySelected = [];
+        $scope.companySelectedOne.value = {id:-1,name:''};
+        $scope.own.duty && $scope.tap == 'SFGS' && $scope.mdxquery();
     }
     // 获取院区
     $scope.branchs = [];
@@ -981,12 +985,16 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
                 api_user_data.fetchDataList('company', {
                     idx: 0,
                     sum: 1000,
-                    company: {}
+                    company: {
+                        "duty": $scope.own.duty || undefined,
+                    }
                 }).then(res => {
                     if (res.status == 200) {
                         $scope.companySelected = res.list;//下拉框数据
                         // 请求列表
                         var postData = {
+                            "dutyId": $scope.own.duty ? $scope.own.duty.id : undefined,
+                            "branchId": $scope.own.duty ? undefined: ($scope.own.branch ? $scope.own.branch.id : undefined),
                             "startTime": moment($scope.starttimesModel).format('YYYY-MM-DD'),
                             "endTime": moment($scope.endtimesModel).format('YYYY-MM-DD'),
                             "sortData": name,
@@ -1147,6 +1155,8 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
                 postData.key = 'mdv2_incident_repot_handle';
                 break;
             case 'SFGS'://三方公司
+                postData.dutyId = $scope.own.duty ? $scope.own.duty.id : undefined;
+                postData.branchId = $scope.own.duty ? undefined : ($scope.own.branch ? $scope.own.branch.id : undefined);
                 postData.key = 'mdv2_incident_repot_company';
                 postData.titles = [($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName)?'人员名称':'公司名称', '人员总数', '事件数量', '平均响应时长', '平均解决时长'];
                 if($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName){

assets/js/controllers/system/notificationCtrl.js

@@ -245,6 +245,11 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
                     "[$转派人$]",
                     "[$延期原因$]",
                     "[$进入系统$]",
+                    "[$回访满意度$]",
+                    "[$回访备注$]",
+                    "[$回访处理结果$]",
+                    "[$评价满意度$]",
+                    "[$评价内容$]",
                 ];
                 $scope.varPlaceholder = '';
                 // switch ($scope.editData.noticeCode) {

assets/js/controllers/system/thirdPartyCompanyCtrl.js

@@ -55,8 +55,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
     $scope.gridOptions.columnDefs = [{
             name: 'item',
             displayName: '序号',
-            width: '5%',
-            minWidth: '70',
+            width: '50',
             enableFiltering: false,
             cellTemplate: '<div>' +
                 '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
@@ -65,29 +64,37 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
         {
             name: 'name',
             displayName: '公司名称',
-            width: '20%',
-            minWidth: '100',
+            width: '300',
+            enableFiltering: false
+        },
+        {
+            name: 'duty.dept',
+            displayName: '责任科室',
+            width: '200',
+            enableFiltering: false
+        },
+        {
+            name: 'code',
+            displayName: '公司编码',
+            width: '200',
             enableFiltering: false
         },
         {
             name: 'contacts',
             displayName: '公司联系人',
-            width: '20%',
-            minWidth: '100',
+            width: '100',
             enableFiltering: false
         },
         {
-            name: 'phone',
+            name: 'mphone',
             displayName: '联系人电话',
-            width: '20%',
-            minWidth: '120',
+            width: '200',
             enableFiltering: false
         },
         {
             name: 'serviceTypeNames',
             displayName: '公司服务种类',
-            width: '20%',
-            minWidth: '120',
+            width: '100',
             enableFiltering: false,
             // cellTemplate: '<div>' +
             //     '<div class="ui-grid-cell-contents">{{row.entity.userType.value == 2 ?row.entity.company.name:row.entity.userType.name}}</div>' +
@@ -95,8 +102,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
         },
         {
             name: '操作',
-            width: '10%',
-            minWidth: '100',
+            width: '100',
             cellTemplate: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left">' +
                 '<a ng-click="grid.appScope.saveData(row.entity)" ng-show="grid.appScope.bianji" class="bianjifont">编辑</a>' +
                 '</div></div>',
@@ -119,7 +125,9 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
             categoryTypeIds: data.categoryTypeIds,//故障现象
             contacts: data.contacts,//联系人
             id: data.id,//id
-            phone: data.phone,//联系电话
+            code: data.code,//code
+            duty: data.duty,//duty
+            mphone: data.mphone,//联系电话
             name: data.name,//公司名称
             startTime: data.startTime,//开始时间
             endTime: data.endTime,//结束时间

assets/views/report/event_form.html

@@ -84,7 +84,7 @@
                         </div>
                     </div>
                     <!-- 院区 -->
-                    <div class="selectSj P-0 fl" ng-if="tap != 'SFGS'">
+                    <div class="selectSj P-0 fl">
                         <div class="selectSj-hd">院区：</div>
                         <ui-select class="sj-select" ng-model="own.branch" theme="bootstrap" ng-change="changeBranch()">
                             <ui-select-match placeholder="选择院区" allow-clear>
@@ -96,7 +96,7 @@
                         </ui-select>
                     </div>
                     <!-- 责任科室 -->
-                    <div class="selectSj P-0 fl" ng-if="tap != 'SFGS'">
+                    <div class="selectSj P-0 fl">
                         <div class="selectSj-hd">责任科室：</div>
                         <ui-select class="sj-select" ng-model="own.duty" theme="bootstrap" ng-change="changeDuty()">
                             <ui-select-match placeholder="选择责任科室" allow-clear>