报修列表增加受理人和学号，BUG修复

assets/js/controllers/desk/chartCtrl.js

@@ -145,6 +145,13 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             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,
+            cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.account}}</div>' +
+                '</div>'
         }, {
             name: 'contactsInformation',
             displayName: '联系电话',
@@ -152,6 +159,13 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             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,
+            cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{(row.entity.incident&&row.entity.incident.acceptUser)?row.entity.incident.acceptUser.name:""}}</div>' +
+                '</div>'
         },
         // {
         //     name: 'requester.name',
@@ -185,7 +199,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         },
         {
             name: '操作',
-            width:150,
+            width:200,
             cellTemplate: '<wechatoperator item="row.entity" colobject="col">',
             enableFiltering: false
         }
@@ -282,7 +296,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         },
         {
             name: '操作',
-            width:150,
+            width:200,
             cellTemplate: '<wechatoperator item="row.entity" colobject="col">',
             enableFiltering: false
         }
@@ -760,17 +774,17 @@ app.controller('Wechatoperator', ['$rootScope', '$http', '$scope', '$modal', fun
     }
     $scope.edit = function () {
         $scope.colobject.grid.appScope.selectRowFunction($scope.item);
-        $scope.doEdit($scope.item.id);
+        // $scope.doEdit($scope.item.id);
     }
     //查看，查看详情
     $scope.look = function () {
         $scope.colobject.grid.appScope.lookFunction($scope.item);
-        $scope.doEdit($scope.item.id);
+        // $scope.doEdit($scope.item.id);
     }
     //处理
     $scope.handleFn = function () {
         $scope.colobject.grid.appScope.toHandleFunction($scope.item);
-        $scope.doEdit($scope.item.id);
+        // $scope.doEdit($scope.item.id);
     }
     //查看事件
     $scope.seeIncident = function () {

assets/views/desk/jry_wxDetail.html

@@ -160,6 +160,7 @@
           <div class="message" ng-show="repairMain.valueconfig ==1">报修人：{{model.requester.name}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==2">报修科室：{{model.departmentDTO.dept}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==1">报修电话：{{model.requester.mphone}}</div>
+          <div class="message" ng-show="repairMain.valueconfig ==1">学号：{{model.requester.account}}</div>
           <div class="message">状态：{{model.serviceState.name}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==2"></div>
           <div class="message">联系人：{{model.contacts}}</div>
@@ -168,6 +169,7 @@
           <div class="message">地点：{{model.place.place}}</div>
           <div class="message">详细地址：{{model.address}}</div>
           <div class="message" ng-if="model.category">报修类别：{{model.category.category}}</div>
+          <div class="message" ng-if="model.incident">受理人：{{model.incident.acceptUser.name}}</div>
           <div class="messageCont">报修内容：{{model.incidentDescription}}</div>
         </div>
       </div>
@@ -196,7 +198,7 @@
             <div class="date-str-wrap">
               <div class="date-str">{{v.startTime}}</div>
               <span ng-if="v.user">【</span>{{v.user.name}}
-              {{v.user.phone}}<span ng-if="v.user">】</span>{{v.desc}}
+              {{v.user.phone}}<span ng-if="v.user">】</span><span ng-bind-html="v.desc"></span>
             </div>
           </div>
         </div>

assets/views/system/tpl/department.html

@@ -37,7 +37,7 @@
         <div class="row form-group">
             <label class="col-md-3 col-md-offset-1 control-label">电话*:</label>
             <div class="col-md-7">
-                <input class="form-control" ng-model="check.phone" placeholder="请输入电话" />
+                <input class="form-control" ng-model="check.phone" maxlength="12" placeholder="请输入电话" />
             </div>
         </div>
         <div class="row form-group">