服务台增加校区

assets/js/controllers/desk/chartCtrl.js

@@ -179,14 +179,14 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             {
                 name: 'address',
                 displayName: '故障地点',
-                width: 150,
+                width: 300,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.place.place||""}} {{row.entity.address}}</div>' +
+                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.branch?row.entity.branch.hosName:""}} {{row.entity.place?row.entity.place.area.area:""}} {{row.entity.place.place||""}} {{row.entity.address}}</div>' +
                     '</div>'
             }, {
                 name: 'contacts',
                 displayName: '联系人',
-                width: 150,
+                width: 100,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contacts}}</div>' +
                     '</div>'

assets/js/controllers/system/systemFormCtrl.js

@@ -464,6 +464,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                 'model': {
                     'incident': {
                         'requester': data.incident.requester,
+                        'branch': data.incident.branch,
                         'area': data.incident.place.area,
                         'place': data.incident.place,
                         'houseNumber': data.incident.address,

assets/views/desk/jry_wxDetail.html

@@ -165,9 +165,7 @@
           <div class="message" ng-show="repairMain.valueconfig ==2"></div>
           <div class="message">联系人：{{model.contacts}}</div>
           <div class="message">联系电话：{{model.contactsInformation}}</div>
-          <div class="message">区域：{{model.place.area.area}}</div>
-          <div class="message">地点：{{model.place.place}}</div>
-          <div class="message">详细地址：{{model.address}}</div>
+          <div class="message">故障地点：{{model.branch?model.branch.hosName:""}} {{model.place?model.place.area.area:""}} {{model.place.place||""}} {{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="message" ng-if="wxIncidentWithCmdb==1">资产：{{model.assetId}}</div>