Merge branch 'TT'

# Conflicts:
#	css/model/sys/user.css

css/model/sys/user.css

@@ -7,12 +7,12 @@
    width: 35px;
}
.sys_user_new,.sys_user_role,.sys_user_right,.sys_user_menu,.sys_user_edit {
.sys_user_new,.sys_user_role,.sys_user_right,.sys_user_menu,.sys_user_edit,.sys_user_cp {
    width: 800px;
    padding: 0 20px 10px;
}
.sys_user_new .newForm,.sys_user_edit .newForm {
.sys_user_new .newForm,.sys_user_edit .newForm,.sys_user_cp .newForm{
    position: relative;
}

html/index.html

@@ -127,6 +127,7 @@
					<ul class="dd-drop">
						<li class="opt-user-info-cfg">个人信息设置</li>
						<li class="opt-user-menu-cfg">个人菜单设置</li>
						<li class="opt-user-cp-cfg">修改密码</li>
					</ul>
				</a>
			</div>
@@ -231,13 +232,17 @@
				});
				$(".opt-user-info-cfg").on("click", function() {
					util.alert("修改个人信息");
                    util.get("../ajax/sys/user/id/" + util.data("loginUser").id, null, function(data) {
                        spa.showModal("sys_user_edit", { data: data})
                    },{});
				});
				$(".opt-user-cp-cfg").on("click", function() {
                    spa.showModal("sys_user_cp");
				});
			});
		});
	</script>
</html>
</html>
</html>

html/model/sys/user/changePw.html

@@ -0,0 +1,27 @@
<div class="sys_user_cp centerModal">
    <div class="modal-ctrl">
        <i class="icon icon-times"></i>
    </div>
    <div class="container newForm">
        <div class="row">
            <div class="col-2 item-caption">新密码</div>
            <div class="col-6">
                <div class="form-item text password" defVal="" name="pw"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-2 item-caption">确认密码</div>
            <div class="col-6">
                <div class="form-item text password" defVal="" name="pw1"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                </div>
            </div>
        </div>
    </div>
</div>

html/model/sys/user/index.html

@@ -64,6 +64,9 @@
			<div class="btn opt-right">
				<i class="icon-key"></i>权限
			</div>
			<div class="btn opt-reset">
				<i class="icon-reply-all"></i>重置密码
			</div>
		</div>
	</div>
	<div class="container dt-tpl">

js/model/sys/user/changePw.js

@@ -0,0 +1,30 @@
/**
 * Created by TT on 2017/4/24.
 */
;
spa_define(function() {
    return $.use(["spa","util","form"],function (spa,util,fb) {
        return {
            modal: function() {
                var root = spa.findInModal(".sys_user_cp");
                var form = fb.build(root.find(".newForm"));
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        if (form.val().pw != null || form.val().pw1 != null) {
                            if (form.val().pw === form.val().pw1) {
                                form.doPost("../ajax/sys/user/cp", function() {
                                    spa.closeModal();
                                }, {});
                            } else {
                                alert("两次输入的密码不同");
                            }
                        }
                    };
                root.find(".modal-ctrl .icon-times").on("click", function() {
                    spa.closeModal();
                });
                saveBtn.on("click", save);
            }
        };
    })
});

js/model/sys/user/index.js

@@ -29,13 +29,13 @@ spa_define(function() {
					var $org = root.find("td.opt-check>i.checked");
					if($org.length) {
						if($org.length > 1) {
							util.alertMsg("只能选择一个用户");
							util.alert("只能选择一个用户");
						} else {
							util.get("../ajax/sys/user/id/" + $org.attr("userId"), null, function(rd) {
								if(rd) {
									spa.showModal("sys_user_edit", { data: rd, hand: function() { pdg.load() } })
								} else {
									util.alertMsg("机构已不存在", function() { pdg.load(); });
									util.alert("用户不存在了", function() { pdg.load(); });
								}
							}, {});
						}
@@ -138,6 +138,29 @@ spa_define(function() {
						util.alert("请选择一个用户");
					}
				});
                root.find(".opt-reset").on("click", function() {
                    var $org = root.find("td.opt-check>i.checked");
                    if($org.length) {
                        var ret = [];
                        $org.each(function() {
                            ret.push($(this).attr("userId"));
                        });
                        util.boxMsg({
                            title: "重置密码",
                            content: "您是否要重置选中用户的密码！！！！！！！！！！！！！！！！！！",
                            btns: [{
                                caption: "确认",
                                hand: function() {
                                    util.post("../ajax/sys/user/resetpw", { ids: ret }, function() { pdg.load() }, {});
                                }
                            },
                                { caption: "取消" }
                            ]
                        });
                    } else {
                        util.alert("请选择一个用户");
                    }
                });
				pdg.load();
			},