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 30 additions and 18 deletions
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
...@@ -51,11 +51,16 @@ ...@@ -51,11 +51,16 @@
align: 'center' align: 'center'
}, },
{ {
field: 'sum', field: 'num',
title: '数量', title: '数量',
align: 'center' align: 'center'
}, },
{ {
field: 'sum',
title: '总价',
align: 'center'
},
{
title: '操作', title: '操作',
align: 'center', align: 'center',
formatter: function (){ formatter: function (){
...@@ -84,6 +89,13 @@ ...@@ -84,6 +89,13 @@
//可供选择的每页的行数（*） //可供选择的每页的行数（*）
pageList: [10, 25, 50, 100], pageList: [10, 25, 50, 100],
sidePagination: "server", 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: [ columns: [
{checkbox:true}, {checkbox:true},
{field: 'code', title: '物资编码'}, {field: 'code', title: '物资编码'},
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp" %> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
<title>物资类型管理</title> <title>物资品名代码管理</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<link rel="stylesheet" href="${ctxStatic}/common/css/form.css"> <link rel="stylesheet" href="${ctxStatic}/common/css/form.css">
</head> </head>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
expandLevel : 2, expandLevel : 2,
column:0, column:0,
checkbox: false, checkbox: false,
url:'${ctx}/warehouse/materialtype/materialType/getChildren?parentId=', url:'${ctx}/warehouse/materialtype/materialType/getChildren?parentId=',
callback:function(item) { callback:function(item) {
var treeTableTpl= $("#materialTypeTreeTableTpl").html(); var treeTableTpl= $("#materialTypeTreeTableTpl").html();
item.dict = {}; item.dict = {};
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
return result; return result;
}, },
beforeClick: function($materialTypeTreeTable, id) { beforeClick: function($materialTypeTreeTable, id) {
//异步获取数据 这里模拟替换处理 //异步获取数据 这里模拟替换处理
$materialTypeTreeTable.refreshPoint(id); $materialTypeTreeTable.refreshPoint(id);
}, },
beforeExpand : function($materialTypeTreeTable, id) { beforeExpand : function($materialTypeTreeTable, id) {
...@@ -27,14 +27,13 @@ ...@@ -27,14 +27,13 @@
beforeClose : function($materialTypeTreeTable, id) { beforeClose : function($materialTypeTreeTable, id) {
} }
}); });
$materialTypeTreeTable.initParents('${parentIds}', "0");//在保存编辑时定位展开当前节点 $materialTypeTreeTable.initParents('${parentIds}', "0");//在保存编辑时定位展开当前节点
}); });
function del(con,id){ function del(con,id){
jp.confirm('确认要删除物资类型吗？', function(){ jp.confirm('确认要删除物资品名代码吗？', function(){
jp.loading(); jp.loading();
$.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){ $.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){
if(data.success){ if(data.success){
...@@ -50,16 +49,16 @@ ...@@ -50,16 +49,16 @@
} }
function add(){//新增 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){//编辑 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){//查看 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){//添加下级机构 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(){//刷新 function refresh(){//刷新
var index = jp.loading("正在加载，请稍等..."); var index = jp.loading("正在加载，请稍等...");
...@@ -111,7 +110,7 @@ ...@@ -111,7 +110,7 @@
<li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li> <li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialtype:materialType:add"> <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> </shiro:hasPermission>
</ul> </ul>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp"%>
<html> <html>
<head> <head>
<title>物资类型管理</title> <title>物资品名代码管理</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<%@include file="materialTypeList.js" %> <%@include file="materialTypeList.js" %>
</head> </head>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">物资类型列表 </h3> <h3 class="panel-title">物资品名代码列表 </h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<thead> <thead>
<tr> <tr>
<th>名称</th> <th>名称</th>
<th>物资类型编码</th> <th>物资品名代码编码</th>
<th>备注信息</th> <th>备注信息</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesForm.jsp
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<tr> <tr>
<td><font color="red">*</font>仓库</td> <td><font color="red">*</font>仓库</td>
<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}" <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 " fieldLabels="仓库名称|仓库编号" fieldKeys="name|code" searchLabels="仓库名称|仓库编号" searchKeys="name|code" ></sys:gridselect> title="选择仓库" cssClass="form-control required" fieldLabels="仓库名称|仓库编号" fieldKeys="name|code" searchLabels="仓库名称|仓库编号" searchKeys="name|code" ></sys:gridselect>
</td> </td>
<td>备注</td> <td>备注</td>
<td> <td>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.js
...@@ -235,7 +235,7 @@ $(document).ready(function() { ...@@ -235,7 +235,7 @@ $(document).ready(function() {
if(id == undefined){ if(id == undefined){
id = getIdSelections(); 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> </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