用户修改密码

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@756 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/account/user.html

@@ -83,27 +83,28 @@
 					<label class="col-md-4 col-sm-4 col text-right">用户：</label>
 					<div class="col-md-4 col-sm-4 col">{{::user.userUU}} - {{::user.userName}} </div>
 				</div>
-				<div class="row line">
+				<div class="row line form-group" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}">
 					<label class="col-md-4 col-sm-4 col text-right">原密码：</label>
-					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="text" ng-blur="checkPassword(user.password)" required></div>
+					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="password" ng-blur="checkPassword(user.password)" required></div>
 					<div class="col-md-4 col-sm-4 col">
-						<i ng-show="checking" class="fa fa-spinner fa-spin"></i>
-						<i ng-show="checkSuccess" class="fa fa-check"></i><i ng-show="checkFailed" class="fa fa-close"></i></div>
+						<span ng-show="checking">验证密码...</span>
+						<i ng-show="checkSuccess" class="fa fa-check" style="color:#339933"></i>
+						<i ng-show="checkFailed" class="fa fa-close" style="color:#CC3333;"></i></div>
 				</div>
 				<div class="row">
 					<label class="col-md-4 col-sm-4 col text-right">新密码：</label>
 					<div class="col-md-4 col-sm-4 col">
-						<input ng-model="user.newPassword" class="form-control input-sm" type="text" required>
+						<input ng-model="user.newPassword" class="form-control input-sm" type="password" required>
 						<div>密码复杂度</div>
 					</div>
 				</div>
-				<div class="row line">
+				<div class="row line form-group" ng-class="{'has-success': user.newPassword1 && (user.newPassword1==user.newPassword)}">
 					<label ng-model="user.newPassword1" class="col-md-4 col-sm-4 col text-right">重复新密码：</label>
-					<div class="col-md-4 col-sm-4 col"><input class="form-control input-sm" type="text" required></div>
+					<div class="col-md-4 col-sm-4 col"><input ng-model="user.newPassword1" class="form-control input-sm" type="password" required></div>
 				</div>
         	</div>
         	<div class="modal-footer">
-            	<button class="btn btn-primary" type="submit">确认修改</button>
+            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认修改</button>
             	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
         	</div>
 		</form>
@@ -112,7 +113,9 @@
 	<div class="pane-header">
 		全部用户
 		<div class="pull-right">
-			<a href="#" class="text-simple"><i class="fa fa-user-plus fa-fw"></i>添加用户</a>
+			<a title="新增用户默认密码为111111" ng-show="adding == true" ng-click="addUser()" class="text-simple"><i class="fa fa-user-plus fa-fw"></i>确定添加</a>
+			<a ng-click="adding = false" ng-show="adding == true" class="text-simple"><i class="fa fa-user-plus fa-fw"></i>取消</a>
+			<a ng-click="adding = true" ng-show="adding != true" class="text-simple"><i class="fa fa-user-plus fa-fw"></i>添加用户</a>
 		</div>
 	</div>
 	<div class="pane-body">
@@ -129,6 +132,29 @@
 				</tr>
 			</thead>
 			<tbody>
+				<tr ng-show="adding">
+					<td class="text-center">
+						<input class="form-control input-sm" placeholder="用户名">
+					</td>
+					<td class="text-center">
+						<select class="form-control input-sm">
+							<option value="F">女</option>
+							<option value="M">男</option>
+						</select>
+					</td>
+					<td class="text-center">
+						<input class="form-control input-sm" placeholder="身份证号">
+					</td>
+					<td class="text-center">
+						<div style="line-height: 30px;">UU号由系统生成</div>
+					</td>
+					<td class="text-center">
+						<input class="form-control input-sm" placeholder="手机号">
+					</td>
+					<td class="text-center">
+						<input class="form-control input-sm" placeholder="邮箱">
+					</td>
+				</tr>
 				<tr ng-repeat="u in $data track by u.id">
 					<td class="text-center" ng-bind="::u.userName"></td>
 					<td class="text-center" ng-bind="::u.userSex == 'F' ? '女' : '男'"></td>
@@ -137,6 +163,7 @@
 					<td class="text-center" ng-bind="::u.userTel"></td>
 					<td class="text-center" ng-bind="::u.userEmail"></td>
 				</tr>
+				
 			</tbody>
 		</table>
 	</div>