1.0 beta版

1 完成进出库实例Stock;
2 全面实现组织数据分离,参考Stock实例;
3 全新的基于CodeSmith EF生成机制;
4 全面完成菜单授权;
5 增加Anonymous机制,可以灵活控制Action是否需要权限控制;
This commit is contained in:
yubaolee
2016-01-08 12:53:48 +08:00
parent 5317e07ae5
commit ab3fc27301
17 changed files with 139 additions and 132 deletions

View File

@@ -40,13 +40,7 @@
data-rule="required" size="20">
</td>
</tr>
<tr>
<td>
<label for="User" class="control-label x120"></label>
<input type="text" name="User" id="User" value="@Model.User"
data-rule="required" size="20">
</td>
</tr>
<tr>
<td>
<label for="Time" class="control-label x120">操作时间:</label>
@@ -59,9 +53,9 @@
@Html.HiddenFor(m =>m.OrgId)
@if (Model.Id == 0) //添加
{
//这个只用于显示使用,并不会进行提交处理,真正提交的是cascadeId
<label for="CascadeName" class="control-label x120">父节点流水号</label>
<input type="text" name="CascadeName" id="CascadeName"
//这个只用于显示使用,并不会进行提交处理,真正提交的是OrgId
<label for="OrgName" class="control-label x120">所属部门</label>
<input type="text" name="OrgName" id="OrgName"
data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="">
<ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
<script type="text/javascript">
@@ -95,7 +89,7 @@
onCheck: zTreeCheck
}
};
$.getJSON('CategoryManager/LoadForTree', function (json) {
$.getJSON('OrgManager/LoadForTree', function (json) {
var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
zTreeObj.expandAll(true);
});

View File

@@ -17,7 +17,6 @@
</div>
</div>
<script type="text/javascript">
var selectedId = 0;
$(document).ready(function () {
@@ -33,59 +32,54 @@
$('#@_gridId').datagrid({
showToolbar: false,
filterThead: false,
columns: [
{
columns: [
{
name: 'Id',
label: '数据ID',
width: 100
, hide: true
},
{
width: 100,
hide: true
},
{
name: 'Name',
label: '产品名称',
width: 100
},
{
width: 100
},
{
name: 'Number',
label: '产品数量',
width: 100
,type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
{
width: 100
},
{
name: 'Price',
label: '产品单价',
width: 100
},
{
width: 100
},
{
name: 'Status',
label: '出库/入库',
width: 100
,type: 'select',
width: 100
, type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
{
items: [{ '0': '入库' }, { '1': '出库' }],
},
{
name: 'User',
label: '',
width: 100
},
{
label: '操作人',
width: 100
},
{
name: 'Time',
label: '操作时间',
width: 100
, type: 'date',
width: 100
, type: 'date',
pattern: 'yyyy-MM-dd HH:mm:ss'
},
{
},
{
name: 'OrgId',
label: '组织ID',
width: 100
,type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
label: '所属部门',
width: 100,
hide: true
}
],
dataUrl: 'StockManager/Load?parentId=' + selectedId,
fullGrid: true,
@@ -105,7 +99,7 @@
function initZtree() {
var setting = {
view: {selectedMulti: false},
view: { selectedMulti: false },
data: {
key: {
name: 'Name',
@@ -118,9 +112,9 @@
rootPId: 'null'
}
},
callback: {onClick: zTreeOnClick}
callback: { onClick: zTreeOnClick }
};
$.getJSON('StockManager/LoadForTree', function (json) {
$.getJSON('OrgManager/LoadOrg', function (json) {
var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
zTreeObj.expandAll(true);
});
@@ -128,9 +122,9 @@
//删除
function delStock() {
var selected = getSelected('#@_gridId',2);
var selected = getSelected('#@_gridId', 2);
if (selected == null) return;
$.getJSON('StockManager/Delete?Id=' + selected, function (data) {
if (data.statusCode == "200")
loadDataGrid();
@@ -142,14 +136,14 @@
//自定义的编辑按钮
function editStock() {
var selected = getSelected('#@_gridId',2);
var selected = getSelected('#@_gridId', 2);
if (selected == null) return;
$(this).dialog({
id: 'editDialog',
url: '/StockManager/Add?id=' + selected,
title: '编辑',
onClose:function() {
onClose: function () {
refreshStockGrid();
}
});
@@ -158,7 +152,7 @@
function refreshStockGrid() {
$('#@_gridId').datagrid('refresh');
// loadDataGrid();
// loadDataGrid();
}
//@@ sourceURL=StockManagerIndex.js
</script>
</script>