各种优化和解决BUG

assets/css/styles.css

@@ -1844,6 +1844,12 @@ fieldset[disabled] .btn-statebutton.btn-o.active {
     /* padding-bottom: 5px; */
 }
 
+.selectuiSearch .ui-select-bootstrap>.ui-select-choices {
+    width: auto;
+    position: relative;
+    top: 0;
+}
+
 .incidentsearchsize {
     font-size: 14px !important;
     /* color: #93989e !important; */

assets/js/controllers/customform/customformCtrl.js

@@ -9186,8 +9186,8 @@ appFormly.config(function config(formlyConfigProvider) {
           var fildata = {
             idx: 0,
             incident: {
-              department: {
-                id: $scope.model.incident.department.id,
+              requester: {
+                id: $scope.model.incident.requester.id,
               },
             },
             sum: 3,

assets/js/controllers/desk/recordCtrl.js

@@ -852,6 +852,7 @@ app.controller("recordCtrl", [
     $scope.cleanItem = function () {
       delete $scope.filData.hjzxRecord.startTime;
       delete $scope.filData.hjzxRecord.endTime;
+      delete $scope.filData.hjzxRecord.ano;
       $scope.refreshData("expand-right", $scope.filData);
     };
     $scope.ldloading = {};

assets/js/controllers/incident/incidentCtrl.js

@@ -255,7 +255,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 width: '200',
                 enableSorting: false,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +
+                    '<div class="ui-grid-cell-contents" title="{{row.entity.description}}">{{row.entity.category.category}}</div>' +
                     '</div>'
             },
             {

assets/views/desk/record.html

@@ -40,6 +40,16 @@
                     <form class="form-inline incidentsearchsize">
                         <div class="form-group incidentsearch">
                             <div>
+                                <div class="control-label pull-left margin-top-5">来电号码:</div>
+                                <input style="margin-right:24px;width: 60%;" class="form-control pull-right incidentsearchsize iptSize" type="text"
+                                    ng-model="filData.hjzxRecord.ano" placeholder="" />
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="filData.hjzxRecord.ano = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            </div>
+                        </div>
+                        <div class="form-group incidentsearch">
+                            <div>
                                 <div class="control-label pull-left margin-top-5">留言时间:</div>
                                 <input style="margin-right:24px;width: 60%;" type="text" class="form-control pull-right incidentsearchsize iptSize"
                                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"

assets/views/incident/list.html

@@ -81,7 +81,7 @@
                             </div>
                         </div>
                         <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
-                            <div class="">
+                            <div class="selectuiSearch">
                                 <div class="control-label pull-left margin-top-5">报修人:</div>
                                 <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
                                     ng-model="searchkeys.requester" theme="bootstrap">
@@ -90,7 +90,7 @@
                                     </ui-select-match>
                                     <ui-select-choices repeat="item in requester"
                                         refresh="onChangeRequester($select.search)">
-                                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                        <div ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"></div>
                                     </ui-select-choices>
                                 </ui-select>
                                 <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.requester = undefined" class="btn btn-default">
@@ -194,36 +194,40 @@
                             </button>
                         </div>
                         <div class="form-group incidentsearch">
-                            <div class="control-label pull-left margin-top-5 ">受理人:</div>
-                            <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
-                                ng-model="searchkeys.acceptUser" theme="bootstrap">
-                                <ui-select-match placeholder="请选择">
-                                    {{$select.selected.name}}
-                                </ui-select-match>
-                                <ui-select-choices repeat="item in acceptUser | filter: $select.search"
-                                    refresh="onChangeacceptUser($select.search)" refresh-delay="0">
-                                    <div ng-bind-html=" item.name | highlight: $select.search "></div>
-                                </ui-select-choices>
-                            </ui-select>
-                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.acceptUser = undefined" class="btn btn-default">
-                                <span class="glyphicon glyphicon-trash"></span>
-                            </button>
+                            <div class="selectuiSearch">
+                                <div class="control-label pull-left margin-top-5 ">受理人:</div>
+                                <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
+                                    ng-model="searchkeys.acceptUser" theme="bootstrap">
+                                    <ui-select-match placeholder="请选择">
+                                        {{$select.selected.name}}
+                                    </ui-select-match>
+                                    <ui-select-choices repeat="item in acceptUser | filter: $select.search"
+                                        refresh="onChangeacceptUser($select.search)" refresh-delay="0">
+                                        <div ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"></div>
+                                    </ui-select-choices>
+                                </ui-select>
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.acceptUser = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            </div>
                         </div>
                         <div class="form-group incidentsearch">
-                            <div class="control-label pull-left margin-top-5">处理人:</div>
-                            <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
-                                ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
-                                <ui-select-match placeholder="请选择">
-                                    {{$select.selected.name}}
-                                </ui-select-match>
-                                <ui-select-choices repeat="item in handlingPersonnelUser"
-                                    refresh="onChangehandling($select.search)">
-                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
-                                </ui-select-choices>
-                            </ui-select>
-                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.handlingPersonnelUser = undefined" class="btn btn-default">
-                                <span class="glyphicon glyphicon-trash"></span>
-                            </button>
+                            <div class="selectuiSearch">
+                                <div class="control-label pull-left margin-top-5">处理人:</div>
+                                <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
+                                    ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
+                                    <ui-select-match placeholder="请选择">
+                                        {{$select.selected.name}}
+                                    </ui-select-match>
+                                    <ui-select-choices repeat="item in handlingPersonnelUser"
+                                        refresh="onChangehandling($select.search)">
+                                        <div ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"></div>
+                                    </ui-select-choices>
+                                </ui-select>
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.handlingPersonnelUser = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            </div>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="">