Merge remote-tracking branch 'origin/release-201846-wangcz' into release-201846-wangcz

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -252,7 +252,6 @@ define(['app/app'], function (app) {
                 toaster.pop('error', '请输入正确的信息后提交');
                 return;
             }
-            console.log($scope.newUser, $scope.userTelSuccess, $scope.userEmailSuccess)
             $scope.adding = true;
             $scope.loading = true;
             Enterprise.saveUser({}, $scope.newUser, function () {
@@ -263,9 +262,10 @@ define(['app/app'], function (app) {
                 $scope.tableParams.page(1);
                 $scope.tableParams.reload();
                 $scope.adding = false;
-                $scope.newUserForm.newUser.userTel.$setValidity('available', false);
+                // $scope.newUserForm.newUser.userTel.$setValidity('available', false);
                 // $scope.newUserForm.newUserEmail.$setValidity('available', false);
                 $scope.userTelSuccess = false;
+                $scope.userEmailSuccess = true;
                 $scope.userTelError = false;
             }, function (response) {
                 $scope.loading = false;

src/main/webapp/resources/view/sso/staffManagement.html

@@ -973,7 +973,7 @@
                                    ng-pattern="/^1\d{10}$/" type="text" placeholder="手机">
                         </td>
                         <td ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
-                            <input ng-model="newUser.userEmail"
+                            <input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
                                    ng-blur="emailValid(newUser.userEmail)"
                                    autocomplete="off"
                                    name="newUserEmail" type="text"