Skip to content

W
warehouse
Commit 8c7ba4c9 by 胡懿
Options

Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

parents aa540163 037e5c5e
Showing with 27 additions and 15 deletions
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
......@@ -51,11 +51,16 @@
align: 'center'
},
{
field: 'sum',
field: 'num',
title: '数量',
align: 'center'
},
{
field: 'sum',
title: '总价',
align: 'center'
},
{
title: '操作',
align: 'center',
formatter: function (){
......@@ -84,6 +89,13 @@
//可供选择的每页的行数（*）
pageList: [10, 25, 50, 100],
sidePagination: "server",
queryParams : function(params) {
var searchParam = $("#searchForm").serializeJSON();
searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
searchParam.pageSize = params.limit === undefined? -1 : params.limit;
searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+ params.order;
return searchParam;
},
columns: [
{checkbox:true},
{field: 'code', title: '物资编码'},
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
......@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp" %>
<html>
<head>
<title>物资类型管理</title>
<title>物资品名代码管理</title>
<meta name="decorator" content="ani"/>
<link rel="stylesheet" href="${ctxStatic}/common/css/form.css">
</head>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
......@@ -28,13 +28,12 @@
}
});
$materialTypeTreeTable.initParents('${parentIds}', "0");//在保存编辑时定位展开当前节点
});
function del(con,id){
jp.confirm('确认要删除物资类型吗？', function(){
jp.confirm('确认要删除物资品名代码吗？', function(){
jp.loading();
$.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){
if(data.success){
......@@ -50,16 +49,16 @@
}
function add(){//新增
jp.openSaveDialog("新增物资类型",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600');
jp.openSaveDialog("新增物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600');
}
function edit(id){//编辑
jp.openSaveDialog("编辑物资类型",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600');
jp.openSaveDialog("编辑物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600');
}
function view(id){//查看
jp.openViewDialog("查看物资类型",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600');
jp.openViewDialog("查看物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600');
}
function addChild(id){//添加下级机构
jp.openSaveDialog("添加下级物资类型",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600');
jp.openSaveDialog("添加下级物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600');
}
function refresh(){//刷新
var index = jp.loading("正在加载，请稍等...");
......@@ -111,7 +110,7 @@
<li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialtype:materialType:add">
<li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级物资类型</a></li>
<li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级物资品名代码</a></li>
</shiro:hasPermission>
</ul>
</div>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
......@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp"%>
<html>
<head>
<title>物资类型管理</title>
<title>物资品名代码管理</title>
<meta name="decorator" content="ani"/>
<%@include file="materialTypeList.js" %>
</head>
......@@ -11,7 +11,7 @@
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">物资类型列表 </h3>
<h3 class="panel-title">物资品名代码列表 </h3>
</div>
<div class="panel-body">
......@@ -32,7 +32,7 @@
<thead>
<tr>
<th>名称</th>
<th>物资类型编码</th>
<th>物资品名代码编码</th>
<th>备注信息</th>
<th>操作</th>
</tr>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesForm.jsp
......@@ -30,8 +30,8 @@
<tr>
<td><font color="red">*</font>仓库</td>
<td>
<sys:gridselect url="${ctx}/warehouse/warehouse/warehouse/data" id="warehouse" name="warehouse.id" value="${testCountry.warehouse.id}" labelName="warehouse.name" labelValue="${testCountry.warehouse.name}"
title="选择仓库" cssClass="form-control " fieldLabels="仓库名称|仓库编号" fieldKeys="name|code" searchLabels="仓库名称|仓库编号" searchKeys="name|code" ></sys:gridselect>
<sys:gridselect url="${ctx}/warehouse/warehouse/warehouse/data" id="warehouse" name="warehouse.id" value="${shelves.warehouse.id}" labelName="warehouse.name" labelValue="${shelves.warehouse.name}"
title="选择仓库" cssClass="form-control required" fieldLabels="仓库名称|仓库编号" fieldKeys="name|code" searchLabels="仓库名称|仓库编号" searchKeys="name|code" ></sys:gridselect>
</td>
<td>备注</td>
<td>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.js
......@@ -235,7 +235,7 @@ $(document).ready(function() {
if(id == undefined){
id = getIdSelections();
}
jp.go("${ctx}/warehouse/shelves/shelves/form/view?id=" + id);
jp.openViewDialog("查看货架","${ctx}/warehouse/shelves/shelves/form/view?id=" + id, '800', '600');
}
</script>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment