diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html
index bff55f01..30695079 100644
--- a/erp_web/pages/manage/depot.html
+++ b/erp_web/pages/manage/depot.html
@@ -1,471 +1,471 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>仓库管理</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>仓库名称：</td>
-            <td>
-                <input type="text" name="searchName" id="searchName" style="width:100px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td id="searchRemarkLabel">描述：</td>
-            <td>
-                <input type="text" name="searchRemark" id="searchRemark" style="width:100px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="仓库列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-    <form id="depotFM" method="post" novalidate>
-        <table>
-            <tr>
-                <td>仓库名称</td>
-                <td style="padding:5px">
-                    <input name="name" id="name" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>仓库地址</td>
-                <td style="padding:5px">
-                    <input name="address" id="address" class="easyui-validatebox"
-                           data-options="validType:'length[2,30]'" style="width: 230px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>仓储费</td>
-                <td style="padding:5px">
-                    <input name="warehousing" id="warehousing" class="easyui-numberbox" data-options="min:0,precision:2"
-                           style="width: 175px;height: 20px"/>&nbsp;元/天/KG
-                </td>
-            </tr>
-            <tr>
-                <td>搬运费</td>
-                <td style="padding:5px">
-                    <input name="truckage" id="truckage" class="easyui-numberbox" placeholder="如上下搬运20元,则填写10元"
-                           data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元
-                </td>
-            </tr>
-            <tr>
-                <td>排序</td>
-                <td style="padding:5px">
-                    <input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>描述</td>
-                <td style="padding:5px">
-                    <textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
-</div>
-
-<script type="text/javascript">
-    //初始化界面
-    $(function () {
-        initTableData();
-        ininPager();
-        initForm();
-    });
-
-    //防止表单提交重复
-    function initForm() {
-        $('#depotFM').form({
-            onSubmit: function () {
-                return false;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            //title:'仓库列表',
-            //iconCls:'icon-save',
-            //width:700,
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            selectOnCheck: false,
-            //fitColumns:true,
-            //单击行是否选中
-            checkOnSelect: false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            //loadFilter: pagerFilter,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox: true},
-                {
-                    title: '操作', field: 'op', align: "center", width: 60,
-                    formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
-                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage;
-                        str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
-                        str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
-                        return str;
-                    }
-                },
-                {title: '仓库名称', field: 'name', width: 200},
-                {title: '仓库地址', field: 'address', width: 200},
-                {title: '仓储费', field: 'warehousing', width: 60},
-                {title: '搬运费', field: 'truckage', width: 60},
-                {title: '排序', field: 'sort', width: 60},
-                {title: '描述', field: 'remark', width: 120}
-            ]],
-            toolbar: [
-                {
-                    id: 'addDepot',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addDepot();
-                    }
-                }, '-',
-                {
-                    id: 'deleteDepot',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteDepot();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showDepotDetails(1, initPageSize);
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
-            $("#saveDepot").click();
-        }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh', {
-                        pageNumber: pageNum,
-                        pageSize: pageSize
-                    });
-                    showDepotDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除仓库信息
-    function deleteDepot(depotID) {
-        $.messager.confirm('删除确认', '确定要删除此仓库信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/depot/" + depotID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除仓库信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除仓库信息异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    }
-
-    //批量删除仓库
-    function batDeleteDepot() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条仓库信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/depot/batchDelete",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            ids: ids
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('删除提示', '删除仓库信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('删除提示', '删除仓库信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //增加
-    var url;
-    var depotID = 0;
-    //保存编辑前的名称
-    var oldDepot = "";
-
-    function addDepot() {
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        $('#depotFM').form('clear');
-        $("#name").focus();
-
-        oldDepot = "";
-        depotID = 0;
-        url = '/depot/add';
-    }
-
-    //保存信息
-    $("#saveDepot").off("click").on("click", function () {
-        var infoObj = $("#depotFM").serializeObject();
-        infoObj.type = 0;
-        if (checkDepotName()) {
-            return;
-        }
-        $.ajax({
-            url: url,
-            type: "post",
-            dataType: "json",
-            data: ({
-                info: JSON.stringify(infoObj)
-            }),
-            success: function(res) {
-                if(res && res.code === 200) {
-                    $('#depotDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showDepotDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    });
-
-    //编辑信息
-    function editDepot(depotTotalInfo) {
-        var depotInfo = depotTotalInfo.split("AaBb");
-
-        $("#name").focus().val(depotInfo[1]);
-        $("#sort").val(depotInfo[2]);
-        $("#remark").val(depotInfo[3]);
-        $("#address").val(depotInfo[4]);
-        $("#warehousing").val(depotInfo[5]);
-        $("#truckage").val(depotInfo[6]);
-
-        oldDepot = depotInfo[1];
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        depotID = depotInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#name").val("").focus().val(depotInfo[1]);
-        url = '/depot/update?id=' + depotInfo[0];
-    }
-
-    //检查名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkDepotName() {
-        var name = $.trim($("#name").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名
-        if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
-            $.ajax({
-                type: "get",
-                url: "/depot/checkIsNameExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: depotID,
-                    name: name
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '仓库名称已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showDepotDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh',
-                {
-                    pageNumber: 1,
-                    pageSize: initPageSize
-                });
-        }
-    });
-
-    function showDepotDetails(pageNo, pageSize) {
-        var name = $.trim($("#searchName").val());
-        var type = 0; //仓库
-        var remark = $.trim($("#searchRemark").val());
-        $.ajax({
-            type: "get",
-            url: "/depot/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: name,
-                    type: type,
-                    remark: remark
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchName").val("");
-            $("#searchRemark").val("");
-
-            //加载完以后重新初始化
-            $("#searchBtn").click();
-        }
-    });
-
-    //查看单元（设置）
-    $('#setBuilding').click(function () {
-        var currentRow = $("#tableData").datagrid("getChecked");
-        if (currentRow.length == 0) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
-
-    });
-</script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>仓库管理</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/common/common.js"></script>
+</head>
+<body>
+<!-- 查询 -->
+<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
+     closable="false">
+    <table id="searchTable">
+        <tr>
+            <td>仓库名称：</td>
+            <td>
+                <input type="text" name="searchName" id="searchName" style="width:100px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td id="searchRemarkLabel">描述：</td>
+            <td>
+                <input type="text" name="searchRemark" id="searchRemark" style="width:100px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<!-- 数据显示table -->
+<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="仓库列表" iconCls="icon-list"
+     collapsible="true" closable="false">
+    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+</div>
+
+<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+    <form id="depotFM" method="post" novalidate>
+        <table>
+            <tr>
+                <td>仓库名称</td>
+                <td style="padding:5px">
+                    <input name="name" id="name" class="easyui-validatebox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>仓库地址</td>
+                <td style="padding:5px">
+                    <input name="address" id="address" class="easyui-validatebox"
+                           data-options="validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>仓储费</td>
+                <td style="padding:5px">
+                    <input name="warehousing" id="warehousing" class="easyui-numberbox" data-options="min:0,precision:2"
+                           style="width: 175px;height: 20px"/>&nbsp;元/天/KG
+                </td>
+            </tr>
+            <tr>
+                <td>搬运费</td>
+                <td style="padding:5px">
+                    <input name="truckage" id="truckage" class="easyui-numberbox" placeholder="如上下搬运20元,则填写10元"
+                           data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元
+                </td>
+            </tr>
+            <tr>
+                <td>排序</td>
+                <td style="padding:5px">
+                    <input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>描述</td>
+                <td style="padding:5px">
+                    <textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea>
+                </td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div id="dlg-buttons">
+    <a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
+</div>
+
+<script type="text/javascript">
+    //初始化界面
+    $(function () {
+        initTableData();
+        ininPager();
+        initForm();
+    });
+
+    //防止表单提交重复
+    function initForm() {
+        $('#depotFM').form({
+            onSubmit: function () {
+                return false;
+            }
+        });
+    }
+
+    //初始化表格数据
+    function initTableData() {
+        $('#tableData').datagrid({
+            //title:'仓库列表',
+            //iconCls:'icon-save',
+            //width:700,
+            height: heightInfo,
+            nowrap: false,
+            rownumbers: false,
+            //动画效果
+            animate: false,
+            //选中单行
+            singleSelect: true,
+            collapsible: false,
+            selectOnCheck: false,
+            //fitColumns:true,
+            //单击行是否选中
+            checkOnSelect: false,
+            pagination: true,
+            //交替出现背景
+            striped: true,
+            //loadFilter: pagerFilter,
+            pageSize: initPageSize,
+            pageList: initPageNum,
+            columns: [[
+                {field: 'id', width: 35, align: "center", checkbox: true},
+                {
+                    title: '操作', field: 'op', align: "center", width: 60,
+                    formatter: function (value, rec) {
+                        var str = '';
+                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage;
+                        str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
+                        return str;
+                    }
+                },
+                {title: '仓库名称', field: 'name', width: 200},
+                {title: '仓库地址', field: 'address', width: 200},
+                {title: '仓储费', field: 'warehousing', width: 60},
+                {title: '搬运费', field: 'truckage', width: 60},
+                {title: '排序', field: 'sort', width: 60},
+                {title: '描述', field: 'remark', width: 120}
+            ]],
+            toolbar: [
+                {
+                    id: 'addDepot',
+                    text: '增加',
+                    iconCls: 'icon-add',
+                    handler: function () {
+                        addDepot();
+                    }
+                }, '-',
+                {
+                    id: 'deleteDepot',
+                    text: '删除',
+                    iconCls: 'icon-remove',
+                    handler: function () {
+                        batDeleteDepot();
+                    }
+                }
+            ],
+            onLoadError: function () {
+                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+        showDepotDetails(1, initPageSize);
+    }
+
+    //初始化键盘enter事件
+    $(document).keydown(function (event) {
+        //兼容 IE和firefox 事件
+        var e = window.event || event;
+        var k = e.keyCode || e.which || e.charCode;
+        //兼容 IE,firefox 兼容
+        var obj = e.srcElement ? e.srcElement : e.target;
+        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
+        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
+            $("#saveDepot").click();
+        }
+        //搜索按钮添加快捷键
+        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
+            $("#searchBtn").click();
+        }
+    });
+
+    //分页信息处理
+    function ininPager() {
+        try {
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            pager.pagination({
+                onSelectPage: function (pageNum, pageSize) {
+                    opts.pageNumber = pageNum;
+                    opts.pageSize = pageSize;
+                    pager.pagination('refresh', {
+                        pageNumber: pageNum,
+                        pageSize: pageSize
+                    });
+                    showDepotDetails(pageNum, pageSize);
+                }
+            });
+        }
+        catch (e) {
+            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+        }
+    }
+
+    //删除仓库信息
+    function deleteDepot(depotID) {
+        $.messager.confirm('删除确认', '确定要删除此仓库信息吗？', function (r) {
+            if (r) {
+                $.ajax({
+                    type: "post",
+                    url: "/depot/" + depotID + "/delete",
+                    dataType: "json",
+                    success: function (res) {
+                        if(res && res.code == 200) {
+                            $("#searchBtn").click();
+                        } else {
+                            $.messager.alert('删除提示', '删除仓库信息失败，请稍后再试！', 'error');
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('删除提示', '删除仓库信息异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //批量删除仓库
+    function batDeleteDepot() {
+        var row = $('#tableData').datagrid('getChecked');
+        if (row.length == 0) {
+            $.messager.alert('删除提示', '没有记录被选中！', 'info');
+            return;
+        }
+        if (row.length > 0) {
+            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条仓库信息吗？', function (r) {
+                if (r) {
+                    var ids = "";
+                    for (var i = 0; i < row.length; i++) {
+                        if (i == row.length - 1) {
+                            ids += row[i].id;
+                            break;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type: "post",
+                        url: "/depot/batchDelete",
+                        dataType: "json",
+                        async: false,
+                        data: ({
+                            ids: ids
+                        }),
+                        success: function (res) {
+                            if(res && res.code === 200) {
+                                $("#searchBtn").click();
+                                $(":checkbox").attr("checked", false);
+                            } else {
+                                $.messager.alert('删除提示', '删除仓库信息失败，请稍后再试！', 'error');
+                            }
+                        },
+                        //此处添加错误处理
+                        error: function () {
+                            $.messager.alert('删除提示', '删除仓库信息异常，请稍后再试！', 'error');
+                            return;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //增加
+    var url;
+    var depotID = 0;
+    //保存编辑前的名称
+    var oldDepot = "";
+
+    function addDepot() {
+        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
+        $(".window-mask").css({width: webW, height: webH});
+        $('#depotFM').form('clear');
+        $("#name").focus();
+
+        oldDepot = "";
+        depotID = 0;
+        url = '/depot/add';
+    }
+
+    //保存信息
+    $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 0;
+        if (checkDepotName()) {
+            return;
+        }
+        $.ajax({
+            url: url,
+            type: "post",
+            dataType: "json",
+            data: ({
+                info: JSON.stringify(infoObj)
+            }),
+            success: function(res) {
+                if(res && res.code === 200) {
+                    $('#depotDlg').dialog('close');
+                    //加载完以后重新初始化
+                    var opts = $("#tableData").datagrid('options');
+                    showDepotDetails(opts.pageNumber, opts.pageSize);
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+
+    //编辑信息
+    function editDepot(depotTotalInfo) {
+        var depotInfo = depotTotalInfo.split("AaBb");
+
+        $("#name").focus().val(depotInfo[1]);
+        $("#sort").val(depotInfo[2]);
+        $("#remark").val(depotInfo[3]);
+        $("#address").val(depotInfo[4]);
+        $("#warehousing").val(depotInfo[5]);
+        $("#truckage").val(depotInfo[6]);
+
+        oldDepot = depotInfo[1];
+        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
+        $(".window-mask").css({width: webW, height: webH});
+        depotID = depotInfo[0];
+        //焦点在名称输入框==定焦在输入文字后面
+        $("#name").val("").focus().val(depotInfo[1]);
+        url = '/depot/update?id=' + depotInfo[0];
+    }
+
+    //检查名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkDepotName() {
+        var name = $.trim($("#name").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
+            $.ajax({
+                type: "get",
+                url: "/depot/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: depotID,
+                    name: name
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '仓库名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+
+    //搜索处理
+    $("#searchBtn").unbind().bind({
+        click: function () {
+            showDepotDetails(1, initPageSize);
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            opts.pageNumber = 1;
+            opts.pageSize = initPageSize;
+            pager.pagination('refresh',
+                {
+                    pageNumber: 1,
+                    pageSize: initPageSize
+                });
+        }
+    });
+
+    function showDepotDetails(pageNo, pageSize) {
+        var name = $.trim($("#searchName").val());
+        var type = 0; //仓库
+        var remark = $.trim($("#searchRemark").val());
+        $.ajax({
+            type: "get",
+            url: "/depot/list",
+            dataType: "json",
+            data: ({
+                search: JSON.stringify({
+                    name: name,
+                    type: type,
+                    remark: remark
+                }),
+                currentPage: pageNo,
+                pageSize: pageSize
+            }),
+            success: function (res) {
+                if(res && res.code === 200){
+                    if(res.data && res.data.page) {
+                        $("#tableData").datagrid('loadData', res.data.page);
+                    }
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    }
+
+    //重置按钮
+    $("#searchResetBtn").unbind().bind({
+        click: function () {
+            $("#searchName").val("");
+            $("#searchRemark").val("");
+
+            //加载完以后重新初始化
+            $("#searchBtn").click();
+        }
+    });
+
+    //查看单元（设置）
+    $('#setBuilding').click(function () {
+        var currentRow = $("#tableData").datagrid("getChecked");
+        if (currentRow.length == 0) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
+
+    });
+</script>
+</body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/depotGift.html b/erp_web/pages/manage/depotGift.html
index 8f11b4c6..3b0bb1b7 100644
--- a/erp_web/pages/manage/depotGift.html
+++ b/erp_web/pages/manage/depotGift.html
@@ -1,462 +1,462 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>礼品卡管理</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>礼品卡名称：</td>
-            <td>
-                <input type="text" name="searchName" id="searchName" style="width:150px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td id="searchRemarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
-            <td>
-                <input type="text" name="searchRemark" id="searchRemark" style="width:150px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品卡列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-    <form id="depotFM" method="post" novalidate>
-        <table>
-            <tr>
-                <td><label id="nameLabel">礼品卡名称&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><input name="name" id="name" class="easyui-validatebox"
-                   data-options="required:true,validType:'length[2,30]'"
-                   style="width: 230px;height: 20px"/></td>
-            </tr>
-            <tr>
-                <td><label id="sortLabel">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><input name="sort" id="sort" class="easyui-textbox"
-                           style="width: 230px;height: 20px"/></td>
-            </tr>
-            <tr>
-                <td><label id="remarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea></td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
-</div>
-
-<script type="text/javascript">
-    //初始化界面
-    $(function () {
-        initTableData();
-        ininPager();
-        initForm();
-        browserFit();
-    });
-
-    //浏览器适配
-    function browserFit() {
-        if (getOs() == 'MSIE') {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("礼品卡名称&nbsp;&nbsp;");
-            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;");
-            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
-        }
-        else {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("礼品卡名称&nbsp;");
-            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;");
-            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
-        }
-    }
-
-    //防止表单提交重复
-    function initForm() {
-        $('#depotFM').form({
-            onSubmit: function () {
-                return false;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            //title:'仓库列表',
-            //iconCls:'icon-save',
-            //width:700,
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            selectOnCheck: false,
-            //fitColumns:true,
-            //单击行是否选中
-            checkOnSelect: false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            //loadFilter: pagerFilter,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox: true},
-                {title: '礼品卡名称', field: 'name', width: 200},
-                {title: '排序', field: 'sort', width: 200},
-                {title: '描述', field: 'remark', width: 200},
-                {
-                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark;
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editDepot(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>&nbsp;<a onclick="deleteDepot(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        return str;
-                    }
-                }
-            ]],
-            toolbar: [
-                {
-                    id: 'addDepot',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addDepot();
-                    }
-                },
-                {
-                    id: 'deleteDepot',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteDepot();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showDepotDetails(1, initPageSize);
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
-            $("#saveDepot").click();
-        }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh',
-                        {
-                            pageNumber: pageNum,
-                            pageSize: pageSize
-                        });
-                    showDepotDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除礼品卡信息
-    function deleteDepot(depotID) {
-        $.messager.confirm('删除确认', '确定要删除此礼品卡信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/depot/" + depotID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    }
-
-    //批量删除礼品卡
-    function batDeleteDepot() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条礼品卡信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        //alert(row[i].id);
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/depot/batchDelete",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            ids: ids
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //增加
-    var url;
-    var depotID = 0;
-    //保存编辑前的名称
-    var oldDepot = "";
-
-    function addDepot() {
-        $("#sort").val("");
-        $("#remark").val("");
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        $("#name").val("").focus();
-        //$('#depotFM').form('clear');
-
-        oldDepot = "";
-        depotID = 0;
-        url = '/depot/add';
-    }
-
-    //保存信息
-    $("#saveDepot").off("click").on("click", function () {
-        var infoObj = $("#depotFM").serializeObject();
-        infoObj.type = 1;
-        if (checkDepotName()) {
-            return;
-        }
-        $.ajax({
-            url: url,
-            type: "post",
-            dataType: "json",
-            data: ({
-                info: JSON.stringify(infoObj)
-            }),
-            success: function(res) {
-                if(res && res.code === 200) {
-                    $('#depotDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showDepotDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    });
-
-    //编辑信息
-    function editDepot(depotTotalInfo) {
-        var depotInfo = depotTotalInfo.split("AaBb");
-
-        $("#name").focus().val(depotInfo[1]);
-        $("#sort").val(depotInfo[2]);
-        $("#remark").val(depotInfo[3]);
-
-        oldDepot = depotInfo[1];
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        depotID = depotInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#name").val("").focus().val(depotInfo[1]);
-        url = '/depot/update?id=' + depotInfo[0];
-    }
-
-    //检查名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkDepotName() {
-        var name = $.trim($("#name").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名
-        if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
-            $.ajax({
-                type: "get",
-                url: "/depot/checkIsNameExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: depotID,
-                    name: name
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '礼品卡名称已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查礼品卡名称是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showDepotDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh',
-                {
-                    pageNumber: 1,
-                    pageSize: initPageSize
-                });
-        }
-    });
-
-    function showDepotDetails(pageNo, pageSize) {
-        var name = $.trim($("#searchName").val());
-        var type = 1; // 礼品卡
-        var remark = $.trim($("#searchRemark").val());
-        $.ajax({
-            type: "get",
-            url: "/depot/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: name,
-                    type: type,
-                    remark: remark
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchName").val("");
-            $("#searchRemark").val("");
-
-            //加载完以后重新初始化
-            $("#searchBtn").click();
-        }
-    });
-
-    //查看单元（设置）
-    $('#setBuilding').click(function () {
-        var currentRow = $("#tableData").datagrid("getChecked");
-        if (currentRow.length == 0) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
-
-    });
-</script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>礼品卡管理</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/common/common.js"></script>
+</head>
+<body>
+<!-- 查询 -->
+<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
+     closable="false">
+    <table id="searchTable">
+        <tr>
+            <td>礼品卡名称：</td>
+            <td>
+                <input type="text" name="searchName" id="searchName" style="width:150px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td id="searchRemarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
+            <td>
+                <input type="text" name="searchRemark" id="searchRemark" style="width:150px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<!-- 数据显示table -->
+<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品卡列表" iconCls="icon-list"
+     collapsible="true" closable="false">
+    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+</div>
+
+<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+    <form id="depotFM" method="post" novalidate>
+        <table>
+            <tr>
+                <td><label id="nameLabel">礼品卡名称&nbsp;&nbsp;</label></td>
+                <td style="padding:5px"><input name="name" id="name" class="easyui-validatebox"
+                   data-options="required:true,validType:'length[2,30]'"
+                   style="width: 230px;height: 20px"/></td>
+            </tr>
+            <tr>
+                <td><label id="sortLabel">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;</label></td>
+                <td style="padding:5px"><input name="sort" id="sort" class="easyui-textbox"
+                           style="width: 230px;height: 20px"/></td>
+            </tr>
+            <tr>
+                <td><label id="remarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label></td>
+                <td style="padding:5px"><textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea></td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div id="dlg-buttons">
+    <a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
+</div>
+
+<script type="text/javascript">
+    //初始化界面
+    $(function () {
+        initTableData();
+        ininPager();
+        initForm();
+        browserFit();
+    });
+
+    //浏览器适配
+    function browserFit() {
+        if (getOs() == 'MSIE') {
+            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
+            $("#nameLabel").empty().append("礼品卡名称&nbsp;&nbsp;");
+            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;");
+            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
+        }
+        else {
+            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
+            $("#nameLabel").empty().append("礼品卡名称&nbsp;");
+            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;");
+            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
+        }
+    }
+
+    //防止表单提交重复
+    function initForm() {
+        $('#depotFM').form({
+            onSubmit: function () {
+                return false;
+            }
+        });
+    }
+
+    //初始化表格数据
+    function initTableData() {
+        $('#tableData').datagrid({
+            //title:'仓库列表',
+            //iconCls:'icon-save',
+            //width:700,
+            height: heightInfo,
+            nowrap: false,
+            rownumbers: false,
+            //动画效果
+            animate: false,
+            //选中单行
+            singleSelect: true,
+            collapsible: false,
+            selectOnCheck: false,
+            //fitColumns:true,
+            //单击行是否选中
+            checkOnSelect: false,
+            pagination: true,
+            //交替出现背景
+            striped: true,
+            //loadFilter: pagerFilter,
+            pageSize: initPageSize,
+            pageList: initPageNum,
+            columns: [[
+                {field: 'id', width: 35, align: "center", checkbox: true},
+                {title: '礼品卡名称', field: 'name', width: 200},
+                {title: '排序', field: 'sort', width: 200},
+                {title: '描述', field: 'remark', width: 200},
+                {
+                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
+                        var str = '';
+                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark;
+                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editDepot(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                        str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>&nbsp;<a onclick="deleteDepot(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                        return str;
+                    }
+                }
+            ]],
+            toolbar: [
+                {
+                    id: 'addDepot',
+                    text: '增加',
+                    iconCls: 'icon-add',
+                    handler: function () {
+                        addDepot();
+                    }
+                },
+                {
+                    id: 'deleteDepot',
+                    text: '删除',
+                    iconCls: 'icon-remove',
+                    handler: function () {
+                        batDeleteDepot();
+                    }
+                }
+            ],
+            onLoadError: function () {
+                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+        showDepotDetails(1, initPageSize);
+    }
+
+    //初始化键盘enter事件
+    $(document).keydown(function (event) {
+        //兼容 IE和firefox 事件
+        var e = window.event || event;
+        var k = e.keyCode || e.which || e.charCode;
+        //兼容 IE,firefox 兼容
+        var obj = e.srcElement ? e.srcElement : e.target;
+        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
+        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
+            $("#saveDepot").click();
+        }
+        //搜索按钮添加快捷键
+        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
+            $("#searchBtn").click();
+        }
+    });
+
+    //分页信息处理
+    function ininPager() {
+        try {
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            pager.pagination({
+                onSelectPage: function (pageNum, pageSize) {
+                    opts.pageNumber = pageNum;
+                    opts.pageSize = pageSize;
+                    pager.pagination('refresh',
+                        {
+                            pageNumber: pageNum,
+                            pageSize: pageSize
+                        });
+                    showDepotDetails(pageNum, pageSize);
+                }
+            });
+        }
+        catch (e) {
+            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+        }
+    }
+
+    //删除礼品卡信息
+    function deleteDepot(depotID) {
+        $.messager.confirm('删除确认', '确定要删除此礼品卡信息吗？', function (r) {
+            if (r) {
+                $.ajax({
+                    type: "post",
+                    url: "/depot/" + depotID + "/delete",
+                    dataType: "json",
+                    success: function (res) {
+                        if(res && res.code == 200) {
+                            $("#searchBtn").click();
+                        } else {
+                            $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //批量删除礼品卡
+    function batDeleteDepot() {
+        var row = $('#tableData').datagrid('getChecked');
+        if (row.length == 0) {
+            $.messager.alert('删除提示', '没有记录被选中！', 'info');
+            return;
+        }
+        if (row.length > 0) {
+            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条礼品卡信息吗？', function (r) {
+                if (r) {
+                    var ids = "";
+                    for (var i = 0; i < row.length; i++) {
+                        if (i == row.length - 1) {
+                            ids += row[i].id;
+                            break;
+                        }
+                        //alert(row[i].id);
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type: "post",
+                        url: "/depot/batchDelete",
+                        dataType: "json",
+                        async: false,
+                        data: ({
+                            ids: ids
+                        }),
+                        success: function (res) {
+                            if(res && res.code === 200) {
+                                $("#searchBtn").click();
+                                $(":checkbox").attr("checked", false);
+                            } else {
+                                $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
+                            }
+                        },
+                        //此处添加错误处理
+                        error: function () {
+                            $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
+                            return;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //增加
+    var url;
+    var depotID = 0;
+    //保存编辑前的名称
+    var oldDepot = "";
+
+    function addDepot() {
+        $("#sort").val("");
+        $("#remark").val("");
+        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
+        $(".window-mask").css({width: webW, height: webH});
+        $("#name").val("").focus();
+        //$('#depotFM').form('clear');
+
+        oldDepot = "";
+        depotID = 0;
+        url = '/depot/add';
+    }
+
+    //保存信息
+    $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 1;
+        if (checkDepotName()) {
+            return;
+        }
+        $.ajax({
+            url: url,
+            type: "post",
+            dataType: "json",
+            data: ({
+                info: JSON.stringify(infoObj)
+            }),
+            success: function(res) {
+                if(res && res.code === 200) {
+                    $('#depotDlg').dialog('close');
+                    //加载完以后重新初始化
+                    var opts = $("#tableData").datagrid('options');
+                    showDepotDetails(opts.pageNumber, opts.pageSize);
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+
+    //编辑信息
+    function editDepot(depotTotalInfo) {
+        var depotInfo = depotTotalInfo.split("AaBb");
+
+        $("#name").focus().val(depotInfo[1]);
+        $("#sort").val(depotInfo[2]);
+        $("#remark").val(depotInfo[3]);
+
+        oldDepot = depotInfo[1];
+        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
+        $(".window-mask").css({width: webW, height: webH});
+        depotID = depotInfo[0];
+        //焦点在名称输入框==定焦在输入文字后面
+        $("#name").val("").focus().val(depotInfo[1]);
+        url = '/depot/update?id=' + depotInfo[0];
+    }
+
+    //检查名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkDepotName() {
+        var name = $.trim($("#name").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
+            $.ajax({
+                type: "get",
+                url: "/depot/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: depotID,
+                    name: name
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '礼品卡名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查礼品卡名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+
+    //搜索处理
+    $("#searchBtn").unbind().bind({
+        click: function () {
+            showDepotDetails(1, initPageSize);
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            opts.pageNumber = 1;
+            opts.pageSize = initPageSize;
+            pager.pagination('refresh',
+                {
+                    pageNumber: 1,
+                    pageSize: initPageSize
+                });
+        }
+    });
+
+    function showDepotDetails(pageNo, pageSize) {
+        var name = $.trim($("#searchName").val());
+        var type = 1; // 礼品卡
+        var remark = $.trim($("#searchRemark").val());
+        $.ajax({
+            type: "get",
+            url: "/depot/list",
+            dataType: "json",
+            data: ({
+                search: JSON.stringify({
+                    name: name,
+                    type: type,
+                    remark: remark
+                }),
+                currentPage: pageNo,
+                pageSize: pageSize
+            }),
+            success: function (res) {
+                if(res && res.code === 200){
+                    if(res.data && res.data.page) {
+                        $("#tableData").datagrid('loadData', res.data.page);
+                    }
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    }
+
+    //重置按钮
+    $("#searchResetBtn").unbind().bind({
+        click: function () {
+            $("#searchName").val("");
+            $("#searchRemark").val("");
+
+            //加载完以后重新初始化
+            $("#searchBtn").click();
+        }
+    });
+
+    //查看单元（设置）
+    $('#setBuilding').click(function () {
+        var currentRow = $("#tableData").datagrid("getChecked");
+        if (currentRow.length == 0) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
+
+    });
+</script>
+</body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html
index aec01838..abad95c1 100644
--- a/erp_web/pages/manage/role.html
+++ b/erp_web/pages/manage/role.html
@@ -1,453 +1,453 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>角色管理</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <script type="text/javascript" src="/js/colorbox/jquery.colorbox-min.js"></script>
-    <script type="text/javascript" src="/js/colorbox/colorboxSet.js"></script>
-    <link href="/js/colorbox/colorbox.css" rel="stylesheet" type="text/css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>角色名称：</td>
-            <td>
-                <input type="text" name="searchName" id="searchName" style="width:150px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>&nbsp;&nbsp;
-                <a id="btnSetApp" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配应用'>分配应用</a>&nbsp;&nbsp;
-                <a id="btnSetFunctions" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配功能'>分配功能</a>&nbsp;&nbsp;
-                <a id="btnSetPushBtn" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配按钮'>分配按钮</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="角色列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="roleDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-    <form id="roleFM" method="post" novalidate>
-        <table>
-            <tr>
-                <td><label id="nameLabel">角色名称&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><input name="name" id="name" class="easyui-validatebox"
-                data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="saveRole" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelRole" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#roleDlg').dialog('close')">取消</a>
-</div>
-
-<script type="text/javascript">
-    //初始化界面
-    $(function () {
-        initTableData();
-        ininPager();
-        initForm();
-        browserFit();
-    });
-
-    //浏览器适配
-    function browserFit() {
-        if (getOs() == 'MSIE') {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("角色名称&nbsp;&nbsp;");
-        }
-        else {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("角色名称&nbsp;");
-        }
-    }
-
-    //防止表单提交重复
-    function initForm() {
-        $('#roleFM').form({
-            onSubmit: function () {
-                return false;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            //title:'角色列表',
-            //iconCls:'icon-save',
-            //width:700,
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            //selectOnCheck:false,
-            //fitColumns:true,
-            //单击行是否选中
-            //checkOnSelect : false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            //loadFilter: pagerFilter,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox: true},
-                {title: '角色名称', field: 'name', width: 200},
-                {
-                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name;
-                            str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editRole(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                            str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>&nbsp;<a onclick="deleteRole(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        return str;
-                    }
-                }
-            ]],
-            toolbar: [
-                {
-                    id: 'addRole',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addRole();
-                    }
-                },
-                {
-                    id: 'deleteRole',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteRole();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showRoleDetails(1, initPageSize);
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
-            $("#saveRole").click();
-        }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh', {
-                        pageNumber: pageNum,
-                        pageSize: pageSize
-                    });
-                    showRoleDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除角色信息
-    function deleteRole(roleID) {
-        $.messager.confirm('删除确认', '确定要删除此角色信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/role/" + roleID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除角色信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除角色信息异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    }
-
-    //批量删除角色
-    function batDeleteRole() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条角色信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/role/batchDelete",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            ids: ids,
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('删除提示', '删除角色信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('删除提示', '删除角色信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //增加
-    var url;
-    var roleID = 0;
-    //保存编辑前的名称
-    var oldName = "";
-
-    function addRole() {
-        $("#sort").val("");
-        $("#remark").val("");
-        $('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加角色信息');
-        $(".window-mask").css({width: webW, height: webH});
-        $("#name").val("").focus();
-        //$('#roleFM').form('clear');
-
-        oldName = "";
-        roleID = 0;
-        url = '/role/add';
-    }
-
-    //保存信息
-    $("#saveRole").off("click").on("click", function () {
-        if (checkRoleName()) {
-            return;
-        }
-        $.ajax({
-            type: "post",
-            url: url,
-            dataType: "json",
-            data: ({
-                info: JSON.stringify($("#roleFM").serializeObject())
-            }),
-            success: function (res) {
-                if(res && res.code === 200) {
-                    $('#roleDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showRoleDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '保存角色信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    });
-
-    //编辑信息
-    function editRole(roleTotalInfo) {
-        var roleInfo = roleTotalInfo.split("AaBb");
-
-        $("#name").focus().val(roleInfo[1]);
-
-        oldName = roleInfo[1];
-        $('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑角色信息');
-        $(".window-mask").css({width: webW, height: webH});
-        roleID = roleInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#name").val("").focus().val(roleInfo[1]);
-        url = '/role/update?id=' + roleInfo[0];
-    }
-
-    //检查名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkRoleName() {
-        var name = $.trim($("#name").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名
-        if (name.length > 0 && (oldName.length == 0 || name != oldName)) {
-            $.ajax({
-                type: "get",
-                url: "/role/checkIsNameExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: roleID,
-                    name: name
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '角色名称已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查角色名称是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showRoleDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh', {
-                pageNumber: 1,
-                pageSize: initPageSize
-            });
-        }
-    });
-
-    function showRoleDetails(pageNo, pageSize) {
-        var searchName = $.trim($("#searchName").val());
-        $.ajax({
-            type: "get",
-            url: "/role/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: searchName
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchName").val("");
-
-            //加载完以后重新初始化
-            $("#searchBtn").click();
-        }
-    });
-
-    //分配应用
-    $('#btnSetApp').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/manage/roleApp.html?id=" + currentRow.id;
-    });
-
-    //分配功能
-    $('#btnSetFunctions').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/manage/roleFunctions.html?id=" + currentRow.id;
-    });
-
-    //分配按钮
-    $('#btnSetPushBtn').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/manage/rolePushBtn.html?id=" + currentRow.id;
-    });
-</script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>角色管理</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
+    <script type="text/javascript" src="/js/colorbox/jquery.colorbox-min.js"></script>
+    <script type="text/javascript" src="/js/colorbox/colorboxSet.js"></script>
+    <link href="/js/colorbox/colorbox.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/common/common.js"></script>
+</head>
+<body>
+<!-- 查询 -->
+<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
+     closable="false">
+    <table id="searchTable">
+        <tr>
+            <td>角色名称：</td>
+            <td>
+                <input type="text" name="searchName" id="searchName" style="width:150px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>&nbsp;&nbsp;
+                <a id="btnSetApp" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配应用'>分配应用</a>&nbsp;&nbsp;
+                <a id="btnSetFunctions" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配功能'>分配功能</a>&nbsp;&nbsp;
+                <a id="btnSetPushBtn" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配按钮'>分配按钮</a>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<!-- 数据显示table -->
+<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="角色列表" iconCls="icon-list"
+     collapsible="true" closable="false">
+    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+</div>
+
+<div id="roleDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+    <form id="roleFM" method="post" novalidate>
+        <table>
+            <tr>
+                <td><label id="nameLabel">角色名称&nbsp;&nbsp;</label></td>
+                <td style="padding:5px"><input name="name" id="name" class="easyui-validatebox"
+                data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div id="dlg-buttons">
+    <a href="javascript:void(0)" id="saveRole" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelRole" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#roleDlg').dialog('close')">取消</a>
+</div>
+
+<script type="text/javascript">
+    //初始化界面
+    $(function () {
+        initTableData();
+        ininPager();
+        initForm();
+        browserFit();
+    });
+
+    //浏览器适配
+    function browserFit() {
+        if (getOs() == 'MSIE') {
+            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
+            $("#nameLabel").empty().append("角色名称&nbsp;&nbsp;");
+        }
+        else {
+            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
+            $("#nameLabel").empty().append("角色名称&nbsp;");
+        }
+    }
+
+    //防止表单提交重复
+    function initForm() {
+        $('#roleFM').form({
+            onSubmit: function () {
+                return false;
+            }
+        });
+    }
+
+    //初始化表格数据
+    function initTableData() {
+        $('#tableData').datagrid({
+            //title:'角色列表',
+            //iconCls:'icon-save',
+            //width:700,
+            height: heightInfo,
+            nowrap: false,
+            rownumbers: false,
+            //动画效果
+            animate: false,
+            //选中单行
+            singleSelect: true,
+            collapsible: false,
+            //selectOnCheck:false,
+            //fitColumns:true,
+            //单击行是否选中
+            //checkOnSelect : false,
+            pagination: true,
+            //交替出现背景
+            striped: true,
+            //loadFilter: pagerFilter,
+            pageSize: initPageSize,
+            pageList: initPageNum,
+            columns: [[
+                {field: 'id', width: 35, align: "center", checkbox: true},
+                {title: '角色名称', field: 'name', width: 200},
+                {
+                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
+                        var str = '';
+                        var rowInfo = rec.id + 'AaBb' + rec.name;
+                            str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editRole(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                            str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>&nbsp;<a onclick="deleteRole(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                        return str;
+                    }
+                }
+            ]],
+            toolbar: [
+                {
+                    id: 'addRole',
+                    text: '增加',
+                    iconCls: 'icon-add',
+                    handler: function () {
+                        addRole();
+                    }
+                },
+                {
+                    id: 'deleteRole',
+                    text: '删除',
+                    iconCls: 'icon-remove',
+                    handler: function () {
+                        batDeleteRole();
+                    }
+                }
+            ],
+            onLoadError: function () {
+                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+        showRoleDetails(1, initPageSize);
+    }
+
+    //初始化键盘enter事件
+    $(document).keydown(function (event) {
+        //兼容 IE和firefox 事件
+        var e = window.event || event;
+        var k = e.keyCode || e.which || e.charCode;
+        //兼容 IE,firefox 兼容
+        var obj = e.srcElement ? e.srcElement : e.target;
+        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
+        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
+            $("#saveRole").click();
+        }
+        //搜索按钮添加快捷键
+        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
+            $("#searchBtn").click();
+        }
+    });
+
+    //分页信息处理
+    function ininPager() {
+        try {
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            pager.pagination({
+                onSelectPage: function (pageNum, pageSize) {
+                    opts.pageNumber = pageNum;
+                    opts.pageSize = pageSize;
+                    pager.pagination('refresh', {
+                        pageNumber: pageNum,
+                        pageSize: pageSize
+                    });
+                    showRoleDetails(pageNum, pageSize);
+                }
+            });
+        }
+        catch (e) {
+            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+        }
+    }
+
+    //删除角色信息
+    function deleteRole(roleID) {
+        $.messager.confirm('删除确认', '确定要删除此角色信息吗？', function (r) {
+            if (r) {
+                $.ajax({
+                    type: "post",
+                    url: "/role/" + roleID + "/delete",
+                    dataType: "json",
+                    success: function (res) {
+                        if(res && res.code == 200) {
+                            $("#searchBtn").click();
+                        } else {
+                            $.messager.alert('删除提示', '删除角色信息失败，请稍后再试！', 'error');
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('删除提示', '删除角色信息异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //批量删除角色
+    function batDeleteRole() {
+        var row = $('#tableData').datagrid('getChecked');
+        if (row.length == 0) {
+            $.messager.alert('删除提示', '没有记录被选中！', 'info');
+            return;
+        }
+        if (row.length > 0) {
+            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条角色信息吗？', function (r) {
+                if (r) {
+                    var ids = "";
+                    for (var i = 0; i < row.length; i++) {
+                        if (i == row.length - 1) {
+                            ids += row[i].id;
+                            break;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type: "post",
+                        url: "/role/batchDelete",
+                        dataType: "json",
+                        async: false,
+                        data: ({
+                            ids: ids,
+                        }),
+                        success: function (res) {
+                            if(res && res.code === 200) {
+                                $("#searchBtn").click();
+                                $(":checkbox").attr("checked", false);
+                            } else {
+                                $.messager.alert('删除提示', '删除角色信息失败，请稍后再试！', 'error');
+                            }
+                        },
+                        //此处添加错误处理
+                        error: function () {
+                            $.messager.alert('删除提示', '删除角色信息异常，请稍后再试！', 'error');
+                            return;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //增加
+    var url;
+    var roleID = 0;
+    //保存编辑前的名称
+    var oldName = "";
+
+    function addRole() {
+        $("#sort").val("");
+        $("#remark").val("");
+        $('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加角色信息');
+        $(".window-mask").css({width: webW, height: webH});
+        $("#name").val("").focus();
+        //$('#roleFM').form('clear');
+
+        oldName = "";
+        roleID = 0;
+        url = '/role/add';
+    }
+
+    //保存信息
+    $("#saveRole").off("click").on("click", function () {
+        if (checkRoleName()) {
+            return;
+        }
+        $.ajax({
+            type: "post",
+            url: url,
+            dataType: "json",
+            data: ({
+                info: JSON.stringify($("#roleFM").serializeObject())
+            }),
+            success: function (res) {
+                if(res && res.code === 200) {
+                    $('#roleDlg').dialog('close');
+                    //加载完以后重新初始化
+                    var opts = $("#tableData").datagrid('options');
+                    showRoleDetails(opts.pageNumber, opts.pageSize);
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '保存角色信息异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+
+    //编辑信息
+    function editRole(roleTotalInfo) {
+        var roleInfo = roleTotalInfo.split("AaBb");
+
+        $("#name").focus().val(roleInfo[1]);
+
+        oldName = roleInfo[1];
+        $('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑角色信息');
+        $(".window-mask").css({width: webW, height: webH});
+        roleID = roleInfo[0];
+        //焦点在名称输入框==定焦在输入文字后面
+        $("#name").val("").focus().val(roleInfo[1]);
+        url = '/role/update?id=' + roleInfo[0];
+    }
+
+    //检查名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkRoleName() {
+        var name = $.trim($("#name").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (name.length > 0 && (oldName.length == 0 || name != oldName)) {
+            $.ajax({
+                type: "get",
+                url: "/role/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: roleID,
+                    name: name
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '角色名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查角色名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+
+    //搜索处理
+    $("#searchBtn").unbind().bind({
+        click: function () {
+            showRoleDetails(1, initPageSize);
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            opts.pageNumber = 1;
+            opts.pageSize = initPageSize;
+            pager.pagination('refresh', {
+                pageNumber: 1,
+                pageSize: initPageSize
+            });
+        }
+    });
+
+    function showRoleDetails(pageNo, pageSize) {
+        var searchName = $.trim($("#searchName").val());
+        $.ajax({
+            type: "get",
+            url: "/role/list",
+            dataType: "json",
+            data: ({
+                search: JSON.stringify({
+                    name: searchName
+                }),
+                currentPage: pageNo,
+                pageSize: pageSize
+            }),
+            success: function (res) {
+                if(res && res.code === 200){
+                    if(res.data && res.data.page) {
+                        $("#tableData").datagrid('loadData', res.data.page);
+                    }
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    }
+
+    //重置按钮
+    $("#searchResetBtn").unbind().bind({
+        click: function () {
+            $("#searchName").val("");
+
+            //加载完以后重新初始化
+            $("#searchBtn").click();
+        }
+    });
+
+    //分配应用
+    $('#btnSetApp').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/manage/roleApp.html?id=" + currentRow.id;
+    });
+
+    //分配功能
+    $('#btnSetFunctions').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/manage/roleFunctions.html?id=" + currentRow.id;
+    });
+
+    //分配按钮
+    $('#btnSetPushBtn').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/manage/rolePushBtn.html?id=" + currentRow.id;
+    });
+</script>
+</body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 77d1411b..8ef2eadd 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -1,553 +1,553 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>用户管理</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <script type="text/javascript" src="/js/colorbox/jquery.colorbox-min.js"></script>
-    <script type="text/javascript" src="/js/colorbox/colorboxSet.js"></script>
-    <link href="/js/colorbox/colorbox.css" rel="stylesheet" type="text/css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>登录名称：</td>
-            <td>
-                <input type="text" name="searchLoginame" id="searchLoginame" style="width:100px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>用户名称：</td>
-            <td>
-                <input type="text" name="searchUsername" id="searchUsername" style="width:100px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>&nbsp;&nbsp;
-                <a id="btnSetRole" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配角色'>分配角色</a>&nbsp;&nbsp;
-                <a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配仓库'>分配仓库</a>&nbsp;&nbsp;
-                <a id="btnSetCustomer" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配客户'>分配客户</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="用户列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="userDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-     closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
-    <form id="usernameFM" method="post" novalidate>
-        <div class="fitem" style="padding:5px">
-            <label id="loginameLabel">登录名称 &nbsp;&nbsp;</label>
-            <input name="loginame" id="loginame" class="easyui-validatebox"
-                   data-options="required:true,validType:'length[2,15]'" style="width: 120px;height: 20px"/>
-            初始密码：123456
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="usernameLabel">用户名称&nbsp;&nbsp;</label>
-            <input name="username" id="username" class="easyui-validatebox"
-                   data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="departmentLabel">部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;</label>
-            <input name="department" id="department" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="positionLabel">职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;&nbsp;</label>
-            <input name="position" id="position" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="phonenumLabel">联系电话&nbsp;&nbsp;</label>
-            <input name="phonenum" id="phonenum" class="easyui-numberbox" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="emailLabel">电子邮箱&nbsp;&nbsp;</label>
-            <input name="email" id="email" class="easyui-validatebox" validType="email"
-                   style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label id="descriptionLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label>
-            <textarea name="description" id="description" rows="2" cols="2" style="width: 230px;"></textarea>
-        </div>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="resetPwd" class="easyui-linkbutton" iconCls="icon-redo">重置密码</a>
-    <a href="javascript:void(0)" id="saveusername" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelusername" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#userDlg').dialog('close')">取消</a>
-</div>
-<script type="text/javascript">
-    //初始化界面
-    $(function () {
-        initTableData();
-        ininPager();
-        browserFit();
-    });
-
-    //浏览器适配
-    function browserFit() {
-        if (getOs() == 'MSIE') {
-            $("#usernameLabel").empty().append("用户名称&nbsp;&nbsp;");
-            $("#loginameLabel").empty().append("登录名称&nbsp;&nbsp;");
-            $("#departmentLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;");
-            $("#positionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;&nbsp;");
-            $("#phonenumLabel").empty().append("联系电话&nbsp;&nbsp;");
-            $("#emailLabel").empty().append("电子邮箱&nbsp;&nbsp;");
-            $("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
-            $("#searchPositionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位：");
-            $("#searchDeptLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门：");
-            $("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-        }
-        else {
-            $("#usernameLabel").empty().append("用户名称&nbsp;");
-            $("#loginameLabel").empty().append("登录名称&nbsp;");
-            $("#departmentLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;");
-            $("#positionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;");
-            $("#phonenumLabel").empty().append("联系电话&nbsp;");
-            $("#emailLabel").empty().append("电子邮箱&nbsp;");
-            $("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
-            $("#searchPositionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;位：");
-            $("#searchDeptLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;门：");
-            $("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-        }
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox:true},
-                {title: '登录名称', field: 'loginame', width: 80},
-                {title: '用户名称', field: 'username', width: 80, align: "center"},
-                {title: '职位', field: 'position', width: 115, align: "center"},
-                {title: '部门', field: 'department', width: 115, align: "center"},
-                {title: '电子邮箱', field: 'email', width: 150, align: "center"},
-                {title: '电话号码', field: 'phonenum', width: 150, align: "center"},
-                {title: '描述', field: 'description', width: 150},
-                {
-                    title: '操作', field: 'isystem', width: 160, formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position
-                            + 'AaBb' + rec.department + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
-                            + 'AaBb' + rec.isystem + 'AaBb' + rec.description;
-                        if (0 == value) {
-                            str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                            str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        }
-                        else {
-                            str += '';
-                        }
-                        return str;
-                    }
-                }
-            ]],
-            toolbar: [
-                {
-                    id: 'addUser',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addUser();
-                    }
-                },
-                {
-                    id: 'deleteUser',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteUser();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showUserDetails(1, initPageSize);
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件
-        if (k == "13" && (obj.id == "username" || obj.id == "department" || obj.id == "phonenum"
-                || obj.id == "email" || obj.id == "description" || obj.id == "position")) {
-            $("#saveusername").click();
-        }
-
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginame" || obj.id == "searchPhonenum"
-                || obj.id == "searchPosition" || obj.id == "searchEmail" || obj.id == "searchDesc" || obj.id == "searchDept")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh',
-                        {
-                            pageNumber: pageNum,
-                            pageSize: pageSize
-                        });
-                    showUserDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除用户信息
-    function deleteUser(userID) {
-        $.messager.confirm('删除确认', '确定要删除此用户信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/user/" + userID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除用户信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除用户信息异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    }
-
-    //批量删除用户
-    function batDeleteUser() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条用户信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    if(row[i].loginame == "jsh"){
-                        $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
-                        return;
-                    } else {
-                        $.ajax({
-                            type: "post",
-                            url: "/user/batchDelete",
-                            dataType: "json",
-                            async: false,
-                            data: ({
-                                ids: ids,
-                            }),
-                            success: function (res) {
-                                if(res && res.code === 200) {
-                                    $("#searchBtn").click();
-                                    $(":checkbox").attr("checked", false);
-                                } else {
-                                    $.messager.alert('删除提示', '删除用户信息失败，请稍后再试！', 'error');
-                                }
-                            },
-                            //此处添加错误处理
-                            error: function () {
-                                $.messager.alert('删除提示', '删除用户信息异常，请稍后再试！', 'error');
-                                return;
-                            }
-                        });
-                    }
-                }
-            });
-        }
-    }
-
-    //增加用户
-    var url;
-    var userID = 0;
-    //保存编辑前的名称
-    var oldLoginName = "";
-
-    function addUser() {
-        $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加用户');
-        $(".window-mask").css({width: webW, height: webH});
-        $('#usernameFM').form('clear');
-        var row = {};
-        $('#usernameFM').form('load', row);
-        $("#username").focus();
-        oldLoginName = "";
-        userID = 0;
-        url = '/user/add';
-    }
-
-    //重置用户密码
-    $("#resetPwd").off("click").on("click", function () {
-        $.messager.confirm('重置用户密码', '确定重置该用户的密码为123456吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/user/resetPwd",
-                    dataType: "json",
-                    data: ({
-                        id: userID
-                    }),
-                    success: function (res) {
-                        if (res && res.code === 200) {
-                            $.messager.alert('提示', '重置密码成功', 'info');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('提示', '重置密码失败，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    });
-
-    //保存用户信息
-    $("#saveusername").off("click").on("click", function () {
-        if (checkusernameName()) {
-            return;
-        }
-        var reg = /^([0-9])+$/;
-        var phonenum = $.trim($("#phonenum").val());
-        if (phonenum.length > 0 && !reg.test(phonenum)) {
-            $.messager.alert('提示', '电话号码只能是数字', 'info');
-            $("#phonenum").val("").focus();
-            return;
-        }
-        $.ajax({
-            url: url,
-            type: "post",
-            dataType: "json",
-            data: {
-                info: JSON.stringify($("#usernameFM").serializeObject())
-            },
-            success: function(res) {
-                if(res && res.code === 200) {
-                    $('#userDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showUserDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '网络异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    });
-
-    //编辑用户信息
-    function editUser(usernameTotalInfo) {
-        var usernameInfo = usernameTotalInfo.split("AaBb");
-        var row = {
-            username: usernameInfo[1],
-            loginame: usernameInfo[2],
-            position: usernameInfo[3],
-            department: usernameInfo[4],
-            email: usernameInfo[5],
-            phonenum: usernameInfo[6],
-            description: usernameInfo[9]
-        };
-        oldLoginName = usernameInfo[1];
-        $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑用户信息');
-        $(".window-mask").css({width: webW, height: webH});
-        $('#usernameFM').form('load', row);
-        userID = usernameInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#username").val("").focus().val(usernameInfo[1]);
-        url = '/user/update?id=' + usernameInfo[0];
-    }
-
-    //检查用户 名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkusernameName() {
-        var loginName = $.trim($("#loginame").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名
-        if (loginName.length > 0 && (oldLoginName.length == 0 || loginName != oldLoginName)) {
-            $.ajax({
-                type: "get",
-                url: "/user/checkIsNameExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: userID,
-                    name: loginName
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '用户名称已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查用户名称是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showUserDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh',
-                {
-                    pageNumber: 1,
-                    pageSize: initPageSize
-                });
-        }
-    });
-
-    function showUserDetails(pageNo, pageSize) {
-        var userName = $.trim($("#searchUsername").val());
-        var loginName = $.trim($("#searchLoginame").val());
-        $.ajax({
-            type: "get",
-            url: "/user/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    userName: userName,
-                    loginName: loginName
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchUsername").val("");
-            $("#searchLoginame").val("");
-            $("#searchPhonenum").val("");
-            $("#searchPosition").val("");
-            $("#searchDept").val("");
-            $("#searchEmail").val("");
-            $("#searchDesc").val("");
-
-
-            //加载完以后重新初始化
-            $("#searchBtn").click();
-        }
-    });
-
-    //分配角色
-    $('#btnSetRole').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/user/userRole.html?id=" + currentRow.id;
-    });
-
-    //分配部门
-    $('#btnSetDepart').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/user/userDepot.html?id=" + currentRow.id;
-    });
-
-    //分配客户
-    $('#btnSetCustomer').click(function () {
-        var currentRow = $("#tableData").datagrid("getSelected");
-        if (currentRow == null) {
-            alert("请选择一条数据再操作！");
-            return false;
-        }
-        this.href = "/pages/user/userCustomer.html?id=" + currentRow.id;
-    });
-</script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>用户管理</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
+    <script type="text/javascript" src="/js/colorbox/jquery.colorbox-min.js"></script>
+    <script type="text/javascript" src="/js/colorbox/colorboxSet.js"></script>
+    <link href="/js/colorbox/colorbox.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/common/common.js"></script>
+</head>
+<body>
+<!-- 查询 -->
+<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
+     closable="false">
+    <table id="searchTable">
+        <tr>
+            <td>登录名称：</td>
+            <td>
+                <input type="text" name="searchLoginame" id="searchLoginame" style="width:100px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>用户名称：</td>
+            <td>
+                <input type="text" name="searchUsername" id="searchUsername" style="width:100px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>&nbsp;&nbsp;
+                <a id="btnSetRole" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配角色'>分配角色</a>&nbsp;&nbsp;
+                <a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配仓库'>分配仓库</a>&nbsp;&nbsp;
+                <a id="btnSetCustomer" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配客户'>分配客户</a>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<!-- 数据显示table -->
+<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="用户列表" iconCls="icon-list"
+     collapsible="true" closable="false">
+    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+</div>
+
+<div id="userDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
+    <form id="usernameFM" method="post" novalidate>
+        <div class="fitem" style="padding:5px">
+            <label id="loginameLabel">登录名称 &nbsp;&nbsp;</label>
+            <input name="loginame" id="loginame" class="easyui-validatebox"
+                   data-options="required:true,validType:'length[2,15]'" style="width: 120px;height: 20px"/>
+            初始密码：123456
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="usernameLabel">用户名称&nbsp;&nbsp;</label>
+            <input name="username" id="username" class="easyui-validatebox"
+                   data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="departmentLabel">部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;</label>
+            <input name="department" id="department" style="width: 230px;height: 20px"/>
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="positionLabel">职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;&nbsp;</label>
+            <input name="position" id="position" style="width: 230px;height: 20px"/>
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="phonenumLabel">联系电话&nbsp;&nbsp;</label>
+            <input name="phonenum" id="phonenum" class="easyui-numberbox" style="width: 230px;height: 20px"/>
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="emailLabel">电子邮箱&nbsp;&nbsp;</label>
+            <input name="email" id="email" class="easyui-validatebox" validType="email"
+                   style="width: 230px;height: 20px"/>
+        </div>
+        <div class="fitem" style="padding:5px">
+            <label id="descriptionLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label>
+            <textarea name="description" id="description" rows="2" cols="2" style="width: 230px;"></textarea>
+        </div>
+    </form>
+</div>
+<div id="dlg-buttons">
+    <a href="javascript:void(0)" id="resetPwd" class="easyui-linkbutton" iconCls="icon-redo">重置密码</a>
+    <a href="javascript:void(0)" id="saveusername" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelusername" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#userDlg').dialog('close')">取消</a>
+</div>
+<script type="text/javascript">
+    //初始化界面
+    $(function () {
+        initTableData();
+        ininPager();
+        browserFit();
+    });
+
+    //浏览器适配
+    function browserFit() {
+        if (getOs() == 'MSIE') {
+            $("#usernameLabel").empty().append("用户名称&nbsp;&nbsp;");
+            $("#loginameLabel").empty().append("登录名称&nbsp;&nbsp;");
+            $("#departmentLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;");
+            $("#positionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;&nbsp;");
+            $("#phonenumLabel").empty().append("联系电话&nbsp;&nbsp;");
+            $("#emailLabel").empty().append("电子邮箱&nbsp;&nbsp;");
+            $("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
+            $("#searchPositionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位：");
+            $("#searchDeptLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门：");
+            $("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
+        }
+        else {
+            $("#usernameLabel").empty().append("用户名称&nbsp;");
+            $("#loginameLabel").empty().append("登录名称&nbsp;");
+            $("#departmentLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;门&nbsp;");
+            $("#positionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;位&nbsp;");
+            $("#phonenumLabel").empty().append("联系电话&nbsp;");
+            $("#emailLabel").empty().append("电子邮箱&nbsp;");
+            $("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
+            $("#searchPositionLabel").empty().append("职&nbsp;&nbsp;&nbsp;&nbsp;位：");
+            $("#searchDeptLabel").empty().append("部&nbsp;&nbsp;&nbsp;&nbsp;门：");
+            $("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
+        }
+    }
+
+    //初始化表格数据
+    function initTableData() {
+        $('#tableData').datagrid({
+            height: heightInfo,
+            nowrap: false,
+            rownumbers: false,
+            //动画效果
+            animate: false,
+            //选中单行
+            singleSelect: true,
+            collapsible: false,
+            pagination: true,
+            //交替出现背景
+            striped: true,
+            pageSize: initPageSize,
+            pageList: initPageNum,
+            columns: [[
+                {field: 'id', width: 35, align: "center", checkbox:true},
+                {title: '登录名称', field: 'loginame', width: 80},
+                {title: '用户名称', field: 'username', width: 80, align: "center"},
+                {title: '职位', field: 'position', width: 115, align: "center"},
+                {title: '部门', field: 'department', width: 115, align: "center"},
+                {title: '电子邮箱', field: 'email', width: 150, align: "center"},
+                {title: '电话号码', field: 'phonenum', width: 150, align: "center"},
+                {title: '描述', field: 'description', width: 150},
+                {
+                    title: '操作', field: 'isystem', width: 160, formatter: function (value, rec) {
+                        var str = '';
+                        var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position
+                            + 'AaBb' + rec.department + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
+                            + 'AaBb' + rec.isystem + 'AaBb' + rec.description;
+                        if (0 == value) {
+                            str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                            str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                        }
+                        else {
+                            str += '';
+                        }
+                        return str;
+                    }
+                }
+            ]],
+            toolbar: [
+                {
+                    id: 'addUser',
+                    text: '增加',
+                    iconCls: 'icon-add',
+                    handler: function () {
+                        addUser();
+                    }
+                },
+                {
+                    id: 'deleteUser',
+                    text: '删除',
+                    iconCls: 'icon-remove',
+                    handler: function () {
+                        batDeleteUser();
+                    }
+                }
+            ],
+            onLoadError: function () {
+                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+        showUserDetails(1, initPageSize);
+    }
+
+    //初始化键盘enter事件
+    $(document).keydown(function (event) {
+        //兼容 IE和firefox 事件
+        var e = window.event || event;
+        var k = e.keyCode || e.which || e.charCode;
+        //兼容 IE,firefox 兼容
+        var obj = e.srcElement ? e.srcElement : e.target;
+        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件
+        if (k == "13" && (obj.id == "username" || obj.id == "department" || obj.id == "phonenum"
+                || obj.id == "email" || obj.id == "description" || obj.id == "position")) {
+            $("#saveusername").click();
+        }
+
+        //搜索按钮添加快捷键
+        if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginame" || obj.id == "searchPhonenum"
+                || obj.id == "searchPosition" || obj.id == "searchEmail" || obj.id == "searchDesc" || obj.id == "searchDept")) {
+            $("#searchBtn").click();
+        }
+    });
+
+    //分页信息处理
+    function ininPager() {
+        try {
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            pager.pagination({
+                onSelectPage: function (pageNum, pageSize) {
+                    opts.pageNumber = pageNum;
+                    opts.pageSize = pageSize;
+                    pager.pagination('refresh',
+                        {
+                            pageNumber: pageNum,
+                            pageSize: pageSize
+                        });
+                    showUserDetails(pageNum, pageSize);
+                }
+            });
+        }
+        catch (e) {
+            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+        }
+    }
+
+    //删除用户信息
+    function deleteUser(userID) {
+        $.messager.confirm('删除确认', '确定要删除此用户信息吗？', function (r) {
+            if (r) {
+                $.ajax({
+                    type: "post",
+                    url: "/user/" + userID + "/delete",
+                    dataType: "json",
+                    success: function (res) {
+                        if(res && res.code == 200) {
+                            $("#searchBtn").click();
+                        } else {
+                            $.messager.alert('删除提示', '删除用户信息失败，请稍后再试！', 'error');
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('删除提示', '删除用户信息异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //批量删除用户
+    function batDeleteUser() {
+        var row = $('#tableData').datagrid('getChecked');
+        if (row.length == 0) {
+            $.messager.alert('删除提示', '没有记录被选中！', 'info');
+            return;
+        }
+        if (row.length > 0) {
+            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条用户信息吗？', function (r) {
+                if (r) {
+                    var ids = "";
+                    for (var i = 0; i < row.length; i++) {
+                        if (i == row.length - 1) {
+                            ids += row[i].id;
+                            break;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    if(row[i].loginame == "jsh"){
+                        $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
+                        return;
+                    } else {
+                        $.ajax({
+                            type: "post",
+                            url: "/user/batchDelete",
+                            dataType: "json",
+                            async: false,
+                            data: ({
+                                ids: ids,
+                            }),
+                            success: function (res) {
+                                if(res && res.code === 200) {
+                                    $("#searchBtn").click();
+                                    $(":checkbox").attr("checked", false);
+                                } else {
+                                    $.messager.alert('删除提示', '删除用户信息失败，请稍后再试！', 'error');
+                                }
+                            },
+                            //此处添加错误处理
+                            error: function () {
+                                $.messager.alert('删除提示', '删除用户信息异常，请稍后再试！', 'error');
+                                return;
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    }
+
+    //增加用户
+    var url;
+    var userID = 0;
+    //保存编辑前的名称
+    var oldLoginName = "";
+
+    function addUser() {
+        $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加用户');
+        $(".window-mask").css({width: webW, height: webH});
+        $('#usernameFM').form('clear');
+        var row = {};
+        $('#usernameFM').form('load', row);
+        $("#username").focus();
+        oldLoginName = "";
+        userID = 0;
+        url = '/user/add';
+    }
+
+    //重置用户密码
+    $("#resetPwd").off("click").on("click", function () {
+        $.messager.confirm('重置用户密码', '确定重置该用户的密码为123456吗？', function (r) {
+            if (r) {
+                $.ajax({
+                    type: "post",
+                    url: "/user/resetPwd",
+                    dataType: "json",
+                    data: ({
+                        id: userID
+                    }),
+                    success: function (res) {
+                        if (res && res.code === 200) {
+                            $.messager.alert('提示', '重置密码成功', 'info');
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('提示', '重置密码失败，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //保存用户信息
+    $("#saveusername").off("click").on("click", function () {
+        if (checkusernameName()) {
+            return;
+        }
+        var reg = /^([0-9])+$/;
+        var phonenum = $.trim($("#phonenum").val());
+        if (phonenum.length > 0 && !reg.test(phonenum)) {
+            $.messager.alert('提示', '电话号码只能是数字', 'info');
+            $("#phonenum").val("").focus();
+            return;
+        }
+        $.ajax({
+            url: url,
+            type: "post",
+            dataType: "json",
+            data: {
+                info: JSON.stringify($("#usernameFM").serializeObject())
+            },
+            success: function(res) {
+                if(res && res.code === 200) {
+                    $('#userDlg').dialog('close');
+                    //加载完以后重新初始化
+                    var opts = $("#tableData").datagrid('options');
+                    showUserDetails(opts.pageNumber, opts.pageSize);
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '网络异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+
+    //编辑用户信息
+    function editUser(usernameTotalInfo) {
+        var usernameInfo = usernameTotalInfo.split("AaBb");
+        var row = {
+            username: usernameInfo[1],
+            loginame: usernameInfo[2],
+            position: usernameInfo[3],
+            department: usernameInfo[4],
+            email: usernameInfo[5],
+            phonenum: usernameInfo[6],
+            description: usernameInfo[9]
+        };
+        oldLoginName = usernameInfo[1];
+        $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑用户信息');
+        $(".window-mask").css({width: webW, height: webH});
+        $('#usernameFM').form('load', row);
+        userID = usernameInfo[0];
+        //焦点在名称输入框==定焦在输入文字后面
+        $("#username").val("").focus().val(usernameInfo[1]);
+        url = '/user/update?id=' + usernameInfo[0];
+    }
+
+    //检查用户 名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkusernameName() {
+        var loginName = $.trim($("#loginame").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (loginName.length > 0 && (oldLoginName.length == 0 || loginName != oldLoginName)) {
+            $.ajax({
+                type: "get",
+                url: "/user/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: userID,
+                    name: loginName
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '用户名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查用户名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+
+    //搜索处理
+    $("#searchBtn").unbind().bind({
+        click: function () {
+            showUserDetails(1, initPageSize);
+            var opts = $("#tableData").datagrid('options');
+            var pager = $("#tableData").datagrid('getPager');
+            opts.pageNumber = 1;
+            opts.pageSize = initPageSize;
+            pager.pagination('refresh',
+                {
+                    pageNumber: 1,
+                    pageSize: initPageSize
+                });
+        }
+    });
+
+    function showUserDetails(pageNo, pageSize) {
+        var userName = $.trim($("#searchUsername").val());
+        var loginName = $.trim($("#searchLoginame").val());
+        $.ajax({
+            type: "get",
+            url: "/user/list",
+            dataType: "json",
+            data: ({
+                search: JSON.stringify({
+                    userName: userName,
+                    loginName: loginName
+                }),
+                currentPage: pageNo,
+                pageSize: pageSize
+            }),
+            success: function (res) {
+                if(res && res.code === 200){
+                    if(res.data && res.data.page) {
+                        $("#tableData").datagrid('loadData', res.data.page);
+                    }
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    }
+
+    //重置按钮
+    $("#searchResetBtn").unbind().bind({
+        click: function () {
+            $("#searchUsername").val("");
+            $("#searchLoginame").val("");
+            $("#searchPhonenum").val("");
+            $("#searchPosition").val("");
+            $("#searchDept").val("");
+            $("#searchEmail").val("");
+            $("#searchDesc").val("");
+
+
+            //加载完以后重新初始化
+            $("#searchBtn").click();
+        }
+    });
+
+    //分配角色
+    $('#btnSetRole').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/user/userRole.html?id=" + currentRow.id;
+    });
+
+    //分配部门
+    $('#btnSetDepart').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/user/userDepot.html?id=" + currentRow.id;
+    });
+
+    //分配客户
+    $('#btnSetCustomer').click(function () {
+        var currentRow = $("#tableData").datagrid("getSelected");
+        if (currentRow == null) {
+            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
+            return false;
+        }
+        this.href = "/pages/user/userCustomer.html?id=" + currentRow.id;
+    });
+</script>
+</body>
 </html>
\ No newline at end of file

仓库名称	- -
仓库地址	- -
仓储费	- 元/天/KG -
搬运费	- 元 -
排序	- -
描述	- -