事件列表和报修列表样式调整

assets/js/controllers/desk/chartCtrl.js

@@ -147,14 +147,15 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
                     '<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: 50,
+            //     cellTemplate: '<div>' +
+            //         '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
+            //         '</div>'
+            // }, 
             {
-                name: 'item',
-                displayName: '序号',
-                width: 50,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
-                    '</div>'
-            }, {
                 name: 'bxcode',
                 displayName: '报修单号',
                 width: 150,
@@ -187,28 +188,28 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             }, {
                 name: 'contacts',
                 displayName: '联系人',
-                width: 100,
+                width: '70',
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contacts}}</div>' +
                     '</div>'
             }, {
                 name: 'requester.account',
                 displayName: '学工号',
-                width: 150,
+                width: 120,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.account}}</div>' +
                     '</div>'
             }, {
                 name: 'contactsInformation',
                 displayName: '联系电话',
-                width: 150,
+                width: 120,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contactsInformation}}</div>' +
                     '</div>'
             }, {
                 name: 'incident.acceptUser.name',
                 displayName: '受理人',
-                width: 150,
+                width: '70',
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center" ng-if="row.entity.incident&&row.entity.incident.acceptUser">{{row.entity.incident.acceptUser.name||""}}</div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center" ng-if="row.entity.rejectUser">{{row.entity.rejectUser.name||""}}</div>' +
@@ -225,14 +226,14 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             {
                 name: 'serviceState.name',
                 displayName: '状态',
-                width: 150,
+                width: 70,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.serviceState.name}}</div>' +
                     '</div>'
             }, {
                 name: 'createTime',
                 displayName: '报修时间',
-                width: 150,
+                width: 140,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center">{{grid.appScope.transferTime(row.entity.createTime)}}</div>' +
                     '</div>'

assets/js/controllers/incident/incidentCtrl.js

@@ -201,7 +201,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.gridOptions.columnDefs = [
             {
                 name: 'id',
-                displayName: '状态',
+                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>' +
@@ -226,8 +226,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'requester.name',
                 displayName: '报修人',
-                width: '6%',
-                minWidth: '90',
+                width: '70',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" >{{row.entity.requester.name}}</div>' +
@@ -262,15 +261,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'houseNumber',
                 displayName: '校区区域地点',
-                width: '14%',
+                width: '150',
                 enableFiltering: false,
                 cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.areaplace(row.entity)}}</div></div>'
             },
             {
                 name: 'acceptUser.name',
                 displayName: '受理人',
-                width: '7%',
-                minWidth: '80',
+                width: '70',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser.name}}</div>' +
@@ -279,15 +277,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'acceptDate',
                 displayName: '登记时间',
-                width: '10%',
-                minWidth: '140',
+                width: '140',
                 enableFiltering: false,
                 cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}</div></div>'
             },
             {
                 name: 'groupORHandlerUser',
                 displayName: '处理人/组',
-                width: '10%',
+                width: '70',
                 enableFiltering: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents">' +
@@ -297,8 +294,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'state.name',
                 displayName: '状态',
-                width: '7%',
-                minWidth: '70',
+                width: '70',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" >{{row.entity.state.name}}</div>' +

assets/views/desk/chart.html

@@ -111,17 +111,20 @@
                   <div class="control-label pull-left margin-top-5 margin-right-5">
                     联系人:
                   </div>
-                  <input class="form-control pull-right inputcolor iptSize"
+                  <input style="margin-right:24px;width: 60%;" class="form-control pull-right inputcolor iptSize"
                     style="border-color: #dedede;color: #93989e;" type="text" ng-model="fileData.wxincident.contacts"
                     placeholder="" />
+                  <button style="position:absolute;right:0;padding:2px 4px;" ng-click="fileData.wxincident.contacts = 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 margin-right-5">
+                  <div class="control-label pull-left margin-top-5">
                     报修时间:
                   </div>
-                  <input type="text" class="form-control pull-right incidentsearchsize iptSize"
+                  <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"
                     ng-model="fileData.wxincident.createTime" max-date="searchkeys.createTimeEnd" is-open="startOpened"
                     hour-time="true" ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
@@ -131,7 +134,7 @@
               <div class="form-group incidentsearch">
                 <span class="panel-title text-dark pull-left">至</span>
                 <div>
-                  <input type="text" class="form-control selectzise pull-right incidentsearchsize iptSize"
+                  <input style="margin-right:24px;width: 60%;" type="text" class="form-control selectzise pull-right incidentsearchsize iptSize"
                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"
                     ng-model="fileData.wxincident.createTimeEnd" hour-time="true" min-date="searchkeys.createTime"
                     is-open="endOpened" ng-init="endOpened = false" close-text="关闭" ng-click="endOpen($event)"
@@ -140,17 +143,20 @@
               </div>
               <div class="form-group incidentsearch">
                 <div>
-                  <div class="control-label pull-left margin-top-5 margin-right-5">
+                  <div class="control-label pull-left margin-top-5">
                     联系电话:
                   </div>
-                  <input class="form-control pull-right inputcolor iptSize"
+                  <input style="margin-right:24px;width: 60%;" class="form-control pull-right inputcolor iptSize"
                     style="border-color: #dedede;color: #93989e;" type="text"
                     ng-model="fileData.wxincident.contactsInformation" placeholder="" />
+                  <button style="position:absolute;right:0;padding:2px 4px;" ng-click="fileData.wxincident.contactsInformation = undefined" class="btn btn-default">
+                      <span class="glyphicon glyphicon-trash"></span>
+                  </button>
                 </div>
               </div>
               <div class="form-group incidentsearch ksInput" ng-show="repairMain.valueconfig == 2">
                 <div>
-                  <div class="control-label pull-left margin-top-5 margin-right-5">
+                  <div class="control-label pull-left margin-top-5">
                     报修科室:
                   </div>
                   <div class="ks-wrap pull-right">
@@ -163,8 +169,8 @@
                 </div>
               </div>
               <div class="form-group incidentsearch">
-                <div class="control-label pull-left margin-top-5 margin-right-5">来源:</div>
-                <ui-select class="pull-right iptSize" ng-model="seiminObj.sourceType"
+                <div class="control-label pull-left margin-top-5">来源:</div>
+                <ui-select style="margin-right:24px;width: 60%;" class="pull-right iptSize" ng-model="seiminObj.sourceType"
                     theme="bootstrap" ng-change="changeSourceType(seiminObj.sourceType)">
                     <ui-select-match placeholder="请选择来源">
                         {{$select.selected.name}}
@@ -173,6 +179,9 @@
                         <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="seiminObj.sourceType = undefined;fileData.wxincident.sourceType = undefined;" class="btn btn-default">
+                  <span class="glyphicon glyphicon-trash"></span>
+                </button>
             </div>
             </form>
           </div>

assets/views/incident/list.html

@@ -83,7 +83,7 @@
                         <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">报修人:</div>
-                                <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
+                                <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3"
                                     ng-model="searchkeys.requester" theme="bootstrap">
                                     <ui-select-match placeholder="请选择">
                                         {{$select.selected.name}}
@@ -110,7 +110,7 @@
                         <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">联系电话:</div>
-                                <input style="margin-right:24px;" class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
+                                <input style="margin-right:24px;width: 60%;" class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
                                     ng-model="searchkeys.requester.mphone" placeholder="" />
                                 <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.requester.mphone = undefined" class="btn btn-default">
                                     <span class="glyphicon glyphicon-trash"></span>
@@ -135,7 +135,7 @@
                         <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5 ">区域:</div>
-                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
+                            <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
                                 ng-change="onChangearea(searchkeys)">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.area}}
@@ -152,7 +152,7 @@
                         <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5">地点:</div>
-                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
+                            <ui-select style="margin-right:24px;width: 60%;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
                                 ng-change="onChangeplace(key)">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.place}}
@@ -168,7 +168,7 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">状态:</div>
-                            <ui-select style="margin-right:24px;" ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
+                            <ui-select style="margin-right:24px;width: 60%;" ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
                                 theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
@@ -183,7 +183,7 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">事件分类:</div>
-                            <multi-select-tree style="margin-right:24px;" data-default-label="请选择" class="pull-right selectzise wt_width1 wt_width3"
+                            <multi-select-tree style="margin-right:24px;width: 60%;" data-default-label="请选择" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="cifilter_classic" data-input-model="select_treedata"
                                 data-output-model="cifilter_classics" theme="bootstrap" multi-select="false"
                                 data-callback="onFilterCallback(item)" data-select-only-leafs="false"
@@ -195,7 +195,7 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5 ">受理人:</div>
-                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
+                            <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}}
@@ -211,7 +211,7 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">处理人:</div>
-                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
+                            <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}}
@@ -228,7 +228,7 @@
                         <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">登记时间:</div>
-                                <input style="margin-right:24px;" type="text" class=" incidentsearchsize wt_width5"
+                                <input style="margin-right:24px;width: 60%;" type="text" class=" incidentsearchsize wt_width5"
                                     datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDate"
                                     max-date="searchkeys.acceptDateEnd" is-open="startOpened" hour-time=true
                                     ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
@@ -238,7 +238,7 @@
                         <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">至</div>
-                                <input style="margin-right:24px;" type="text" class=" selectzise incidentsearchsize wt_width5"
+                                <input style="margin-right:24px;width: 60%;" type="text" class=" selectzise incidentsearchsize wt_width5"
                                     datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDateEnd" hour-time=true
                                     min-date="searchkeys.acceptDate" is-open="endOpened" ng-init="endOpened = false"
                                     close-text="关闭" ng-click="endOpen($event)" placeholder="" />
@@ -247,7 +247,7 @@
                         <div class="form-group incidentsearch">
                             <div>
                                 <div class="control-label pull-left margin-top-5">事件单号:</div>
-                                <input style="margin-right:24px;" class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
+                                <input style="margin-right:24px;width: 60%;" class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
                                     ng-model="searchkeys.incidentsign" placeholder="" />
                                 <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.incidentsign = undefined" class="btn btn-default">
                                     <span class="glyphicon glyphicon-trash"></span>
@@ -256,7 +256,7 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">是否逾期:</div>
-                            <ui-select style="margin-right:24px;" ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
+                            <ui-select style="margin-right:24px;width: 60%;" ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     <span ng-bind="$select.selected.name"></span>
                                 </ui-select-match>