Skip to content

W
warehouse
Commit e2f196a8 by yyq1988
Options

物资领用增加出库功能

parent 5fecca16
Showing with 40 additions and 7 deletions
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js
...@@ -121,6 +121,16 @@ $(document).ready(function() { ...@@ -121,6 +121,16 @@ $(document).ready(function() {
} }
,{ ,{
field: 'status',
title: '出库状态',
sortable: true,
sortName: 'status',
formatter:function(value, row , index){
return jp.getDictLabel(${fns:toJson(fns:getDictList('wh_delivery_status'))}, value, "-");
}
}
,{
field: 'remarks', field: 'remarks',
title: '备注信息', title: '备注信息',
sortable: true, sortable: true,
...@@ -142,6 +152,7 @@ $(document).ready(function() { ...@@ -142,6 +152,7 @@ $(document).ready(function() {
'check-all.bs.table uncheck-all.bs.table', function () { 'check-all.bs.table uncheck-all.bs.table', function () {
$('#remove').prop('disabled', ! $('#materialRequisitionTable').bootstrapTable('getSelections').length); $('#remove').prop('disabled', ! $('#materialRequisitionTable').bootstrapTable('getSelections').length);
$('#view,#edit').prop('disabled', $('#materialRequisitionTable').bootstrapTable('getSelections').length!=1); $('#view,#edit').prop('disabled', $('#materialRequisitionTable').bootstrapTable('getSelections').length!=1);
$('#delivery').prop('disabled', !($('#materialRequisitionTable').bootstrapTable('getSelections').length==1 && $('#materialRequisitionTable').bootstrapTable('getSelections')[0].status == '1'));
}); });
$("#btnImport").click(function(){ $("#btnImport").click(function(){
...@@ -279,6 +290,19 @@ $(document).ready(function() { ...@@ -279,6 +290,19 @@ $(document).ready(function() {
})); }));
} }
/**
* 出库
*/
function onDelivery(){
jp.get('${ctx}/warehouse/materialrequisition/materialRequisition/delivery?id='+getIdSelections(), function (res){
if(res.success){
jp.success(res.msg);
refresh();
}else{
jp.error(res.msg);
}
})
}
</script> </script>
<script type="text/template" id="materialRequisitionChildrenTpl">//<!-- <script type="text/template" id="materialRequisitionChildrenTpl">//<!--
<div class="tabs-container"> <div class="tabs-container">
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.jsp
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
<title>物资领用管理</title> <title>物资领用管理</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<%@ include file="/webpage/include/bootstraptable.jsp"%> <%@ include file="/webpage/include/bootstraptable.jsp" %>
<%@include file="/webpage/include/treeview.jsp" %> <%@include file="/webpage/include/treeview.jsp" %>
<%@include file="materialRequisitionList.js" %> <%@include file="materialRequisitionList.js" %>
</head> </head>
<body> <body>
<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>
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialRequisition" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="materialRequisition"
class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label> <label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
...@@ -31,8 +32,10 @@ ...@@ -31,8 +32,10 @@
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px"> <div style="margin-top:26px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a> <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a> class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-refresh"></i> 重置</a>
</div> </div>
</div> </div>
</form:form> </form:form>
...@@ -69,6 +72,11 @@ ...@@ -69,6 +72,11 @@
<i class="fa fa-search-plus"></i> 查看 <i class="fa fa-search-plus"></i> 查看
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="warehouse:outbound:outbound:add">
<button id="delivery" class="btn btn-primary" disabled onclick="onDelivery()">
<i class="glyphicon glyphicon-plus"></i> 出库
</button>
</shiro:hasPermission>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
...@@ -89,6 +97,6 @@ ...@@ -89,6 +97,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ 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