diff --git a/OpenAuth.Mvc/BllScripts/assignRes.js b/OpenAuth.Mvc/BllScripts/assignRes.js
index e8ac400c..5239ea40 100644
--- a/OpenAuth.Mvc/BllScripts/assignRes.js
+++ b/OpenAuth.Mvc/BllScripts/assignRes.js
@@ -76,7 +76,7 @@ function DialogList() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/categoryManager.js b/OpenAuth.Mvc/BllScripts/categoryManager.js
index 5c04018c..96c3085f 100644
--- a/OpenAuth.Mvc/BllScripts/categoryManager.js
+++ b/OpenAuth.Mvc/BllScripts/categoryManager.js
@@ -67,7 +67,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/moduleElementMan.js b/OpenAuth.Mvc/BllScripts/moduleElementMan.js
index 9ca0936c..3c9108e6 100644
--- a/OpenAuth.Mvc/BllScripts/moduleElementMan.js
+++ b/OpenAuth.Mvc/BllScripts/moduleElementMan.js
@@ -117,7 +117,7 @@ var thisDlg = function () {
         paging: false,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
 
     var getSelectDatas = function () {
diff --git a/OpenAuth.Mvc/BllScripts/modulemanager.js b/OpenAuth.Mvc/BllScripts/modulemanager.js
index 0b21fa70..29355e8b 100644
--- a/OpenAuth.Mvc/BllScripts/modulemanager.js
+++ b/OpenAuth.Mvc/BllScripts/modulemanager.js
@@ -90,7 +90,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/orgManager.js b/OpenAuth.Mvc/BllScripts/orgManager.js
index 587caaef..b2b2462b 100644
--- a/OpenAuth.Mvc/BllScripts/orgManager.js
+++ b/OpenAuth.Mvc/BllScripts/orgManager.js
@@ -64,7 +64,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/resourceManager.js b/OpenAuth.Mvc/BllScripts/resourceManager.js
index 3ba4b22e..fb475edc 100644
--- a/OpenAuth.Mvc/BllScripts/resourceManager.js
+++ b/OpenAuth.Mvc/BllScripts/resourceManager.js
@@ -54,7 +54,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js
index a497c2ec..b5d2a467 100644
--- a/OpenAuth.Mvc/BllScripts/roleManager.js
+++ b/OpenAuth.Mvc/BllScripts/roleManager.js
@@ -46,7 +46,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/roleModuleElement.js b/OpenAuth.Mvc/BllScripts/roleModuleElement.js
index e7a0ad1e..ccec2b0c 100644
--- a/OpenAuth.Mvc/BllScripts/roleModuleElement.js
+++ b/OpenAuth.Mvc/BllScripts/roleModuleElement.js
@@ -15,7 +15,7 @@
 
 $(document).ready(function () {
     $.CurrentDialog.find("#btnAccess").on("click", function () {
-        var ids = list.getSelectedProperties('Id');
+        var ids = roleMenuList.getSelectedProperties('Id');
         if (ids == null) return;
 
         $.post("/ModuleElementManager/AssignForRole",
@@ -23,18 +23,18 @@ $(document).ready(function () {
                 RoleId: $('#roleId').val(),
                 menuIds: ids,
             }, function (json) {
-                list.reload();
+                roleMenuList.reload();
             });
     });
     $.CurrentDialog.find("#btnDelAccess").on("click", function () {
-        var ids = list.getSelectedProperties('Id');
+        var ids = roleMenuList.getSelectedProperties('Id');
         if (ids == null) return;
 
         $.post("/ModuleElementManager/CancelForRole",{
             RoleId: $('#roleId').val(),
             menuIds: ids,
         }, function (json) {
-            list.reload();
+            roleMenuList.reload();
         });
     });
 });
@@ -77,8 +77,7 @@ function RoleMEGrid() {
         showCheckboxcol: true,
         paging: true,
         filterMult: false,
-        showTfoot: false,
-        height: '100%'
+        showTfoot: false
     });
     this.reload = function(id) {
         if (id != undefined) selectedId = id;
@@ -86,7 +85,7 @@ function RoleMEGrid() {
     };
 };
 RoleMEGrid.prototype = new Grid();
-var list = new RoleMEGrid();
+var roleMenuList = new RoleMEGrid();
 
 var ztree = function () {
     var setting = {
@@ -111,6 +110,6 @@ var ztree = function () {
     });
 }();
 function zTreeOnClick(event, treeId, treeNode) {
-    list.reload(treeNode.Id);
+    roleMenuList.reload(treeNode.Id);
 }
 //@@ sourceURL=RoleModuleElement.js
diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js
new file mode 100644
index 00000000..7d08ae4e
--- /dev/null
+++ b/OpenAuth.Mvc/BllScripts/stockManager.js
@@ -0,0 +1,252 @@
+
+//grid列表模块
+function MainGrid() {
+    var url = '/StockManager/Load?parentId=';
+    var selectedId = 0; //ztree选中的模块
+    this.maingrid = $('#maingrid').datagrid({
+        showToolbar: false,
+        filterThead: false,
+        target: $(this),
+        columns: [
+               {
+                   name: 'Id',
+                   label: '数据ID',
+                   width: 100
+                    , hide: true
+               },
+               {
+                   name: 'Name',
+                   label: '产品名称',
+                   width: 100
+               },
+               {
+                   name: 'Number',
+                   label: '产品数量',
+                   width: 100
+               },
+               {
+                   name: 'Price',
+                   label: '产品单价',
+                   width: 100
+               },
+               {
+                   name: 'Status',
+                   label: '出库/入库',
+                   width: 100
+                     , align: 'center',
+                   items: [{ '0': '出库' }, { '1': '入库' }],
+               },
+               {
+                   name: 'User',
+                   label: '操作人',
+                   width: 100
+               },
+               {
+                   name: 'Time',
+                   label: '操作时间',
+                   width: 100
+               },
+               {
+                   name: 'OrgId',
+                   label: '组织ID',
+                   width: 100
+               },
+        ],
+        dataUrl: url + selectedId,
+        fullGrid: true,
+        showLinenumber: true,
+        showCheckboxcol: true,
+        paging: true,
+        filterMult: false,
+        showTfoot: false,
+      
+    });
+    this.reload = function (id) {
+        if (id != undefined) selectedId = id;
+        this.maingrid.datagrid('reload', { dataUrl: url + selectedId });
+    };
+};
+MainGrid.prototype = new Grid();
+var list = new MainGrid();
+
+//左边分类导航树
+var ztree = function () {
+    var url = '/OrgManager/LoadOrg';
+    var setting = {
+        view: { selectedMulti: false },
+        data: {
+            key: {
+                name: 'Name',
+                title: 'Name'
+            },
+            simpleData: {
+                enable: true,
+                idKey: 'Id',
+                pIdKey: 'ParentId',
+                rootPId: 'null'
+            }
+        },
+        callback: { onClick: zTreeOnClick }
+    };
+    $.getJSON(url, function (json) {
+        $.fn.zTree.init($("#tree"), setting, json).expandAll(true);
+    });
+    function zTreeOnClick(event, treeId, treeNode) {
+        list.reload(treeNode.Id);
+    }
+
+    return {
+        reload: function () {
+            $.getJSON(url, function (json) {
+                $.fn.zTree.init($("#tree"), setting, json).expandAll(true);
+            });
+        }
+    }
+}();
+
+//编辑时，选择上级弹出的树
+var parentTree = function () {
+    var nameDom = "#ParentName";
+    var idDom = "#OrgId";
+    var zTreeObj;
+    var setting = {
+        view: {
+            selectedMulti: false
+        },
+        check: {
+            enable: true,
+            chkStyle: "radio",  //单选
+            radioType: "all"
+        },
+        data: {
+            key: {
+                name: 'Name',
+                title: 'Name'
+            },
+            simpleData: {
+                enable: true,
+                idKey: 'Id',
+                pIdKey: 'ParentId',
+                rootPId: 'null'
+            }
+        },
+        callback: {
+            onClick: zTreeOnClick,
+            onCheck: zTreeCheck
+        }
+    };
+
+    function zTreeCheck(event, treeId, treeNode) {
+        var nodes = zTreeObj.getCheckedNodes(true);
+        var ids = nodes.map(function (e) { return e.Id; }).join(",");
+        var names = nodes.map(function (e) { return e.Name; }).join(",");
+
+        $(nameDom).val(names);
+        $(idDom).val(ids);
+    }
+    function zTreeOnClick(event, treeId, treeNode) {
+        zTreeObj.checkNode(treeNode, !treeNode.checked, true, true);
+        event.preventDefault();
+    }
+
+    return {
+        show: function () {
+            $.getJSON('/OrgManager/LoadForTree', function (json) {
+                zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
+                var orgstr = $(idDom).val();
+                var name = '';
+                if (orgstr != '') {
+                    var nodeIds = orgstr.split(',');
+                    $.each(nodeIds, function () {
+                        var node = zTreeObj.getNodeByParam("Id", this, null);
+                        name += ',' + node.Name;
+                        zTreeObj.checkNode(node, true, true);
+                    });
+                    $(nameDom).val(name.substr(1));  //显示名称
+                }
+                zTreeObj.expandAll(true);
+            });
+        }
+    };
+}();
+
+
+//添加（编辑）对话框
+var editDlg = function () {
+    var update = false;
+    var show = function () {
+        BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' });
+        $("#btnSave").on("click", function () {
+            editDlg.save();
+        });
+    }
+    return {
+        add: function () {  //弹出添加
+            update = false;
+            show();
+            $.CurrentDialog.find("form")[0].reset();  //reset方法只能通过dom调用
+            $("#Id").val(0);
+            parentTree.show();
+        },
+        update: function (ret) {  //弹出编辑框
+            update = true;
+            show();
+            $('#Id').val(ret.Id);
+            $('#Name').val(ret.Name);
+            $('#Number').selectpicker('val', ret.Number);
+            $('#Price').val(ret.Price);
+            $('#Status').selectpicker('val', ret.Status);
+            $('#User').val(ret.User);
+            $('#Time').val(ret.Time);
+            $('#OrgId').val(ret.OrgId);
+            parentTree.show();
+        },
+        save: function () {  //编辑-->保存
+            $('#editForm').isValid(function (v) {
+                if (!v) return;  //验证没通过
+                $("#editForm").bjuiajax('ajaxForm', {
+                    reload: false,
+                    callback: function (json) {
+                        list.reload();
+                        ztree.reload();
+                    }
+                });
+            });
+        }
+    };
+}();
+
+//删除
+function del() {
+    var selected = list.getSelectedObj();
+    if (selected == null) return;
+
+    $.getJSON('/StockManager/Delete?Id=' + selected.Id, function (data) {
+        if (data.statusCode == "200") {
+            list.reload();
+            ztree.reload();
+        }
+        else {
+            $(this).alertmsg('warn', data.message);
+        }
+    });
+}
+
+//自定义的编辑按钮
+function edit() {
+    var selected = list.getSelectedObj();
+    if (selected == null) {
+        return;
+    }
+    editDlg.update(selected);
+}
+
+function add() {
+    editDlg.add();
+}
+
+function refresh() {
+    list.reload();
+}
+
+//@@ sourceURL=StockManager.js
\ No newline at end of file
diff --git a/OpenAuth.Mvc/BllScripts/userModuleElement.js b/OpenAuth.Mvc/BllScripts/userModuleElement.js
index 2a148d39..099c818c 100644
--- a/OpenAuth.Mvc/BllScripts/userModuleElement.js
+++ b/OpenAuth.Mvc/BllScripts/userModuleElement.js
@@ -15,7 +15,7 @@
 
 $(document).ready(function () {
     $.CurrentDialog.find("#btnAccess").on("click", function () {
-        var ids = list.getSelectedProperties('Id');
+        var ids = userMenuList.getSelectedProperties('Id');
         if (ids == null) return;
 
         $.post("/ModuleElementManager/AssignForUser",
@@ -23,18 +23,18 @@ $(document).ready(function () {
                 userId: $('#userId').val(),
                 menuIds: ids,
             }, function (json) {
-                list.reload();
+                userMenuList.reload();
             });
     });
     $.CurrentDialog.find("#btnDelAccess").on("click", function () {
-        var ids = list.getSelectedProperties('Id');
+        var ids = userMenuList.getSelectedProperties('Id');
         if (ids == null) return;
 
         $.post("/ModuleElementManager/CancelForUser",{
             userId: $('#userId').val(),
             menuIds: ids,
         }, function (json) {
-            list.reload();
+            userMenuList.reload();
         });
     });
 });
@@ -78,7 +78,7 @@ function UserMEGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function(id) {
         if (id != undefined) selectedId = id;
@@ -86,7 +86,7 @@ function UserMEGrid() {
     };
 };
 UserMEGrid.prototype = new Grid();
-var list = new UserMEGrid();
+var userMenuList = new UserMEGrid();
 
 var ztree = function () {
     var setting = {
@@ -111,6 +111,6 @@ var ztree = function () {
     });
 }();
 function zTreeOnClick(event, treeId, treeNode) {
-    list.reload(treeNode.Id);
+    userMenuList.reload(treeNode.Id);
 }
 //@@ sourceURL=userModuleElement.js
diff --git a/OpenAuth.Mvc/BllScripts/userRoleManager.js b/OpenAuth.Mvc/BllScripts/userRoleManager.js
index 56800756..99e80f75 100644
--- a/OpenAuth.Mvc/BllScripts/userRoleManager.js
+++ b/OpenAuth.Mvc/BllScripts/userRoleManager.js
@@ -77,7 +77,7 @@ function UserRolesList() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js
index cce5ece4..f240a0f0 100644
--- a/OpenAuth.Mvc/BllScripts/usermanager.js
+++ b/OpenAuth.Mvc/BllScripts/usermanager.js
@@ -54,7 +54,7 @@ function MainGrid() {
         paging: true,
         filterMult: false,
         showTfoot: false,
-        height: '100%'
+      
     });
     this.reload = function (id) {
         if (id != undefined) selectedId = id;
diff --git a/建表&初始化数据.sql b/建表&初始化数据.sql
index a5416e20..86ff7268 100644
Binary files a/建表&初始化数据.sql and b/建表&初始化数据.sql differ