事件列表样式修改和呼叫中心添加报修人功能修改

assets/js/controllers/customform/customformCtrl.js

@@ -13877,8 +13877,19 @@ appFormly.config(function config(formlyConfigProvider) {
                   serchdataadd(searchKey);
                 };
                 $scope.getMydata = function (x) {
+                  // $scope.searchField = JSON.parse(x[0]).account;
+                  // $scope.requester = JSON.parse(x[0]);
+                  // console.log($scope.requester);
+                  // $scope.refreshArea('');
+                  // $scope.refresh('');
+                  var reqestdatap = JSON.parse(x[0]);
+                  if ($scope.requester.telephone) {
+                    delete reqestdatap.telephone;
+                  }
                   $scope.searchField = JSON.parse(x[0]).account;
-                  $scope.requester = JSON.parse(x[0]);
+                  angular.extend($scope.requester, reqestdatap);
+                  // $scope.searchField = JSON.parse(x[0]).account;
+                  // $scope.requester = JSON.parse(x[0]);
                   console.log($scope.requester);
                   $scope.refreshArea('');
                   $scope.refresh('');

assets/js/controllers/desk/recordCtrl.js

@@ -256,14 +256,14 @@ app.controller("recordCtrl", [
                   serchdataadd(searchKey);
                 };
                 $scope.getMydata = function (x) {
-                  // var reqestdatap = JSON.parse(x[0]);
-                  // if ($scope.requester.telephone) {
-                  //   delete reqestdatap.telephone;
-                  // }
-                  // $scope.searchField = JSON.parse(x[0]).account;
-                  // angular.extend($scope.requester, reqestdatap);
+                  var reqestdatap = JSON.parse(x[0]);
+                  if ($scope.requester.telephone) {
+                    delete reqestdatap.telephone;
+                  }
                   $scope.searchField = JSON.parse(x[0]).account;
-                  $scope.requester = JSON.parse(x[0]);
+                  angular.extend($scope.requester, reqestdatap);
+                  // $scope.searchField = JSON.parse(x[0]).account;
+                  // $scope.requester = JSON.parse(x[0]);
                   console.log($scope.requester);
                   $scope.refreshArea('');
                   $scope.refresh('');

assets/js/controllers/incident/incidentCtrl.js

@@ -253,7 +253,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'category',
                 displayName: '事件分类',
-                width: '300',
+                width: '200',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +

assets/js/controllers/mainCtrl.js

@@ -1013,12 +1013,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                         serchdataadd(searchKey);
                                                                     }
                                                                     $scope.getMydata = function(x) {
-                                                                        // var reqestdatap = JSON.parse(x[0])
-                                                                        // if ($scope.requester.telephone) {
-                                                                        //     delete reqestdatap.telephone;
-                                                                        // }
-                                                                        // $scope.searchField = JSON.parse(x[0]).account;
-                                                                        // angular.extend($scope.requester, reqestdatap);
+                                                                        var reqestdatap = JSON.parse(x[0])
+                                                                        if ($scope.requester.telephone) {
+                                                                            delete reqestdatap.telephone;
+                                                                        }
+                                                                        $scope.searchField = JSON.parse(x[0]).account;
+                                                                        angular.extend($scope.requester, reqestdatap);
                                                                         // if ($scope.requester.areaDTO && $scope.requester.areaDTO.id && $scope.requester.areaDTO.id != "") {
                                                                         //     api_user_data.fetchDataList('place', { place: { areaId: $scope.requester.areaDTO.id }, idx: 0, sum: 1000 }).then(function(response) {
                                                                         //         if (response.status == 200) {
@@ -1026,8 +1026,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                         //         }
                                                                         //     })
                                                                         // }
-                                                                        $scope.searchField = JSON.parse(x[0]).account;
-                                                                        $scope.requester = JSON.parse(x[0]);
+                                                                        // $scope.searchField = JSON.parse(x[0]).account;
+                                                                        // $scope.requester = JSON.parse(x[0]);
                                                                         console.log($scope.requester);
                                                                         $scope.refreshArea('');
                                                                         $scope.refresh('');
@@ -1213,6 +1213,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                               },
                                                                             };
                                                                             $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                                        }else{
+                                                                            SweetAlert.swal("操作失败!", "添加报修人失败", "error");
                                                                         }
                                                                     })
                                                                 }

assets/views/customform/tpl/modal-add-callrequester.html

@@ -56,7 +56,7 @@
                 </div>
             </div>
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">座机号码:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">来电号码:</div>
                 <div class="pull-right openaddinput">
                     <input style="padding:4px 12px;text-align: left" class="form-control" id="telephone" name="telephone" ng-model="requester.telephone" placeholder="座机号码" />
                     <!-- <div class="form-control" style="padding:4px 12px;text-align: left">{{requester.telephone}}</div> -->