优化

assets/js/controllers/customform/customformDetailCtrl.js

@@ -83,8 +83,8 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
                     datakey = field.templateOptions.modelreasondata
                 }
                 if (field.templateOptions.modelArea) {
-                    if(field.model.branch){
-                        datakey.area = {branch:field.model.branch}
+                    if(field.templateOptions.getScope().originalModel.incident.branch){
+                        datakey.area = {branch:field.templateOptions.getScope().originalModel.incident.branch.id}
                     }else{
                         field.templateOptions.options = [];
                         return;

assets/js/controllers/desk/calllogCtrl.js

@@ -67,16 +67,21 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
             width: '10%'
         },
         {
+            name: 'routeNumber',
+            displayName: '坐席号',
+            width: '100'
+        },
+        {
             name: 'createdTime',
             displayName: '开始时间',
-            width: '17%',
+            width: '140',
             cellTemplate: '<div>' +
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.transferTime(row.entity.createdTime)}} </div>' +
                 '</div>'
         }, {
             name: 'overTime',
             displayName: '结束时间',
-            width: '17%',
+            width: '140',
             cellTemplate: '<div>' +
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.transferTime(row.entity.overTime)}}</div>' +
                 '</div>'

assets/views/report/charging.html

@@ -107,7 +107,7 @@
                             <table class="table table-bordered " ng-if="!isMaskground" cellspacing="0" cellpadding="20" style="font-weight:normal !important">
                                 <thread>
                                     <tr class="grayground incidentsearchsize">
-                                        <th ng-class="header.thclass" style="text-align: center;">处理人</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">处理人（学工号）</th>
                                         <th ng-class="header.thclass" style="text-align: center;">事件数（条）</th>
                                         <th ng-class="header.thclass" style="text-align: center;">工时</th>
                                         <th ng-class="header.thclass" style="text-align: center;">工时占比</th>
@@ -117,7 +117,7 @@
                                 <tbody class="tbody-hover">
                                     <tr ng-repeat="rowData in charginrow">
                                         <td ng-class="fieldData.thclass" style="text-align: center">
-                                            {{rowData.name}}
+                                            {{rowData.name}}（{{rowData.account}}）
                                         </td>
                                         <td ng-class="fieldData.thclass" style="text-align: center">
                                             {{rowData.incidentCount}}

assets/views/report/event_form.html

@@ -236,7 +236,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">
@@ -344,7 +344,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll>
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">
@@ -475,7 +475,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap jry_table_wrap2" ng-nicescroll>
+                            <div class="jry_table_wrap jry_table_wrap2" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">
@@ -619,7 +619,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">
@@ -697,7 +697,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll>
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">
@@ -763,7 +763,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll>
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">

assets/views/report/service_form.html

@@ -190,7 +190,7 @@
                                     </tr>
                                 </thead>
                             </table>
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
+                            <div class="jry_table_wrap" style="overflow-y: overlay;">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
                                     <tbody class="tbody-hover">