一堆改

assets/js/controllers/desk/recordCtrl.js

@@ -231,10 +231,12 @@ app.controller("recordCtrl", [
                 "assets/views/customform/tpl/modal-add-callrequester.html",
               controller: function (
                 $scope,
+                SweetAlert,
                 $modalInstance,
                 api_user_data,
                 api_wechatfile
               ) {
+                $modalInstance.SweetAlert = SweetAlert;
                 $scope.title = "新增报修人";
                 $scope.requester = {};
                 $scope.branchs = [];
@@ -471,6 +473,12 @@ app.controller("recordCtrl", [
                       $state.go("app.incident.title", {
                         model: JSON.stringify(data),
                       });
+                    }else{
+                      modalInstance.SweetAlert.swal({
+                        title: "系统错误",
+                        text: "账号重复!",
+                        type: "error",
+                      });
                     }
                   });
               }

assets/js/controllers/mainCtrl.js

@@ -1026,6 +1026,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                 backdrop: "static",
                                                                 templateUrl: 'assets/views/customform/tpl/modal-add-callrequester.html',
                                                                 controller: function($scope, $modalInstance, api_user_data, api_wechatfile, SweetAlert) {
+                                                                    $modalInstance.SweetAlert = SweetAlert;
                                                                     $scope.title = "新增报修人";
                                                                     $scope.requester = {};
                                                                     $scope.onChangeadd = function(searchData) {
@@ -1255,7 +1256,11 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                             };
                                                                             $state.go('app.incident.title', { 'model': JSON.stringify(data) });
                                                                         }else{
-                                                                            SweetAlert.swal("操作失败!", "添加报修人失败", "error");
+                                                                          modalInstance.SweetAlert.swal({
+                                                                            title: "系统错误",
+                                                                            text: "账号重复!",
+                                                                            type: "error",
+                                                                          });
                                                                         }
                                                                     })
                                                                 }
@@ -1474,6 +1479,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                     var modalInstance = $modal.open({
                       templateUrl: 'assets/views/customform/tpl/modal-add-callrequester.html',
                       controller: function ($scope, $modalInstance, api_user_data, SweetAlert, api_wechatfile) {
+                        $modalInstance.SweetAlert = SweetAlert;
                         $scope.title = "新增报修人";
                         $scope.requester = {};
                         $scope.onChangeadd = function (searchData) {
@@ -1649,6 +1655,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                             $state.go('app.incident.title', {
                               'model': JSON.stringify(data)
                             });
+                          }else{
+                            modalInstance.SweetAlert.swal({
+                              title: "系统错误",
+                              text: "账号重复!",
+                              type: "error",
+                            });
                           }
                         })
                       }

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

@@ -77,7 +77,7 @@
             </div>
             <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">区域:</div>
-                <div class="pull-right openaddinput">
+                <div class="pull-right openaddinput" style="position:relative;">
                     <ui-select ng-model="requester.place.area" theme="bootstrap" ng-change="onChange(requester.place.area)">
                         <ui-select-match placeholder="区域">
                             {{$select.selected.area}}
@@ -86,12 +86,14 @@
                             <div ng-bind-html="item.area | highlight: $select.search"></div>
                         </ui-select-choices>
                     </ui-select>
-
+                    <button style="position:absolute;right:-24px;top:0;padding: 4px;" ng-click="requester.place = undefined" class="btn btn-default">
+                        <span class="glyphicon glyphicon-trash"></span>
+                    </button>
                 </div>
             </div>
             <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">地点:</div>
-                <div class="pull-right openaddinput">
+                <div class="pull-right openaddinput" style="position:relative;">
                     <ui-select ng-model="requester.place" theme="bootstrap" ng-change="onChangePlace(requester.place)">
                         <ui-select-match placeholder="地点">
                             {{$select.selected.place}}
@@ -100,7 +102,9 @@
                             <div ng-bind-html="item.place | highlight: $select.search"></div>
                         </ui-select-choices>
                     </ui-select>
-
+                    <button style="position:absolute;right:-24px;top:0;padding: 4px;" ng-click="requester.place = undefined" class="btn btn-default">
+                        <span class="glyphicon glyphicon-trash"></span>
+                    </button>
                 </div>
             </div>
             <div class="margin-bottom-15 anline" ng-if="isRoom">