Skip to content

W
warehouse
Commit 892477f6 by anxiaohe
Options

搜索调整

parent f6bc673f
Showing with 554 additions and 492 deletions
src/main/webapp/webpage/modules/common/gridselect.jsp
...@@ -30,7 +30,6 @@ $(document).ready(function() { ...@@ -30,7 +30,6 @@ $(document).ready(function() {
//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据 //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
url: jp.unescapeHTML("${url}"), url: jp.unescapeHTML("${url}"),
responseHandler: function (res){ responseHandler: function (res){
debugger
if(res.rows){ if(res.rows){
res.rows = res.rows.filter(function(item){ res.rows = res.rows.filter(function(item){
return item !== null && typeof item !== "undefined" && item !== ""; return item !== null && typeof item !== "undefined" && item !== "";
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.js
...@@ -10,17 +10,17 @@ $(document).ready(function() { ...@@ -10,17 +10,17 @@ $(document).ready(function() {
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
...@@ -19,23 +19,25 @@ ...@@ -19,23 +19,25 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="goods" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="goods" 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 col-lg-3">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label> <label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="资料编号：">资料编号：</label>
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-9 col-md-8">
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group"> <div class="form-group">
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label> <label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12"> <div class="col-lg-10 col-md-8">
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;"> <div class='input-group date' id='beginTime' style="left: -10px;">
<input type='text' name="beginTime" class="form-control"/> <input type='text' name="beginTime" class="form-control"/>
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-1"> <div class="col-xs-12 col-sm-1">
...@@ -45,21 +47,23 @@ ...@@ -45,21 +47,23 @@
<div class='input-group date' id='endTime' style="left: -10px;"> <div class='input-group date' id='endTime' style="left: -10px;">
<input type='text' name="endTime" class="form-control"/> <input type='text' name="endTime" class="form-control"/>
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label> <label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="操作人：">操作人：</label>
<sys:userselect id="operator" name="operator.id" value="${goods.operator.id}" <div class="col-lg-9 col-md-8">
labelName="operator.name" labelValue="${goods.operator.name}" <sys:userselect id="operator" name="operator.id" value="${goods.operator.id}"
cssClass="form-control required"/> labelName="operator.name" labelValue="${goods.operator.name}"
cssClass="form-control required"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:26px"> <div style="">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-search"></i> 查询</a> class="fa fa-search"></i> 查询</a>
<a id="reset" 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
...@@ -87,14 +91,14 @@ ...@@ -87,14 +91,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:goods:goods:import">--%> <%-- <shiro:hasPermission name="warehouse:goods:goods:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%> <%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:goods:goods:export">--%> <%-- <shiro:hasPermission name="warehouse:goods:goods:export">--%>
<%-- <button id="export" class="btn btn-warning">--%> <%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%> <%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:goods:goods:view"> <shiro:hasPermission name="warehouse:goods:goods:view">
<button id="view" class="btn btn-default" disabled onclick="view()"> <button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看 <i class="fa fa-search-plus"></i> 查看
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
...@@ -33,32 +33,43 @@ ...@@ -33,32 +33,43 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="ledger" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="ledger" 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="物资名称：">物资名称：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8">
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
<sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name" labelValue="${ledger.type.name}" <div class="col-lg-8">
title="品名代码" url="/warehouse/materialtype/materialType/treeData" extId="${ledger.id}" cssClass="form-control " allowClear="true"/> <sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name" labelValue="${ledger.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</div>
</div> </div>
<%-- <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="model" htmlEscape="false" maxlength="64" class=" form-control"/>--%> <%-- <form:input path="model" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<%-- </div>--%> <%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="货架id集合：">货架id集合：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="货架id集合：">货架id集合：</label>
<form:input path="shelvesIds" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8">
<form:input path="shelvesIds" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="数量：">数量：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="数量：">数量：</label>
<form:input path="num" htmlEscape="false" class=" form-control"/> <div class="col-lg-8">
<form:input path="num" htmlEscape="false" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:26px"> <div style="margin-top:0px">
<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 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> <a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js
...@@ -9,17 +9,17 @@ $(document).ready(function() { ...@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.jsp
...@@ -18,46 +18,48 @@ ...@@ -18,46 +18,48 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialLoss" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="materialLoss" 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="盘亏单号：">盘亏单号：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="盘亏单号：">盘亏单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
</div> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group"> <div class="form-group">
<label class="label-item single-overflow pull-left" title="盘亏时间：">&nbsp;盘亏时间：</label> <label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="盘亏时间：">&nbsp;盘亏时间：</label>
<div class="col-xs-12"> <div class="col-lg-10 col-md-8 col-xs-12">
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;" > <div class='input-group date' id='beginTime' style="left: -10px;" >
<input type='text' name="beginTime" class="form-control" /> <input type='text' name="beginTime" class="form-control" />
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-1"> <div class="col-xs-12 col-sm-1">
~ ~
</div> </div>
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<div class='input-group date' id='endTime' style="left: -10px;" > <div class='input-group date' id='endTime' style="left: -10px;" >
<input type='text' name="endTime" class="form-control" /> <input type='text' name="endTime" class="form-control" />
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i 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 class="col-xs-12 col-sm-6 col-md-4"> </form:form>
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div> </div>
</div> </div>
...@@ -113,4 +115,4 @@ ...@@ -113,4 +115,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
...@@ -440,10 +440,16 @@ ...@@ -440,10 +440,16 @@
area: ['1200', '600'], area: ['1200', '600'],
content: $("#scanTpl").html(), content: $("#scanTpl").html(),
btn: ['确定', '关闭'], btn: ['确定', '关闭'],
success: function () { success: function (layer) {
// $("#scanResult").focus(); // $("#scanResult").focus();
scanStart(); scanStart();
renderScanTable(); renderScanTable();
setTimeout(function () {
var width = layer.width();
var height = layer.height();
layer.width(width + 1);
layer.height(height + 1);
})
}, },
yes: function (index, layero) { yes: function (index, layero) {
var selectTableData = getSelectScanTable(); var selectTableData = getSelectScanTable();
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.jsp
...@@ -18,20 +18,24 @@ ...@@ -18,20 +18,24 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialRequisition" <form:form id="searchForm" modelAttribute="materialRequisition"
class="form form-horizontal well clearfix"> 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="领用单号：">领用单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="操作人：">操作人：</label>
<form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
<form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:26px"> <div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-search"></i> 查询</a> class="fa fa-search"></i> 查询</a>
<a id="reset" 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
...@@ -99,4 +103,4 @@ ...@@ -99,4 +103,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
...@@ -117,17 +117,17 @@ ...@@ -117,17 +117,17 @@
// }) // })
// } // }
// }, // },
{ // {
field: 'receiver.name', // field: 'receiver.name',
title: '领用人', // title: '领用人',
align: 'center', // align: 'center',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
return Mustache.render($("#receiverTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), { // return Mustache.render($("#receiverTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, // row: row,
idx: index // idx: index
}) // })
} // }
}, // },
{ {
field: 'remarks', field: 'remarks',
title: '备注', title: '备注',
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.jsp
...@@ -18,57 +18,58 @@ ...@@ -18,57 +18,58 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="outbound" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="outbound" 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="出库单号：">出库单号：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="出库单号：">出库单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
</div> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<label class="label-item single-overflow pull-left" title="相关表单ID：">相关表单ID：</label> </div>
<form:input path="relationId" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
</div> <div class="form-group">
<div class="col-xs-12 col-sm-6 col-md-4"> <label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="出库时间：">&nbsp;出库时间：</label>
<div class="form-group"> <div class="col-lg-9 col-md-8">
<label class="label-item single-overflow pull-left" title="出库时间：">&nbsp;出库时间：</label> <div class="col-xs-12 col-sm-5">
<div class="col-xs-12"> <div class='input-group date' id='beginOutboundTime' style="left: -10px;" >
<div class="col-xs-12 col-sm-5"> <input type='text' name="beginOutboundTime" class="form-control" />
<div class='input-group date' id='beginOutboundTime' style="left: -10px;" > <span class="input-group-addon">
<input type='text' name="beginOutboundTime" class="form-control" /> <span class="glyphicon glyphicon-calendar"></span>
<span class="input-group-addon"> </span>
<span class="glyphicon glyphicon-calendar"></span> </div>
</span> </div>
</div> <div class="col-xs-12 col-sm-1">
</div> ~
<div class="col-xs-12 col-sm-1"> </div>
~ <div class="col-xs-12 col-sm-5">
</div> <div class='input-group date' id='endOutboundTime' style="left: -10px;" >
<div class="col-xs-12 col-sm-5"> <input type='text' name="endOutboundTime" class="form-control" />
<div class='input-group date' id='endOutboundTime' style="left: -10px;" > <span class="input-group-addon">
<input type='text' name="endOutboundTime" class="form-control" /> <span class="glyphicon glyphicon-calendar"></span>
<span class="input-group-addon"> </span>
<span class="glyphicon glyphicon-calendar"></span> </div>
</span> </div>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="出库分类：">出库分类：</label>
<div class="col-lg-8 col-md-8">
<form:select path="type" class="form-control m-b">
<form:option value="" label=""/>
<form:options items="${fns:getDictList('wh_delivery_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
</form:select>
</div> </div>
</div> </div>
</div>
<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> <div style="margin-top:0px">
<form:select path="type" class="form-control m-b"> <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
<form:option value="" label=""/> <a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
<form:options items="${fns:getDictList('wh_delivery_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/> </div>
</form:select>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </form:form>
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div> </div>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
...@@ -10,17 +10,17 @@ $(document).ready(function() { ...@@ -10,17 +10,17 @@ $(document).ready(function() {
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.jsp
...@@ -11,107 +11,109 @@ ...@@ -11,107 +11,109 @@
<%@include file="profitWarehousingList.js" %> <%@include file="profitWarehousingList.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>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="profitWarehousing" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="profitWarehousing" 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="盘盈入库单号：">盘盈入库单号：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="盘盈入库单号：">盘盈入库单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
</div> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<div class="form-group"> </div>
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="col-xs-12"> <div class="form-group">
<div class="col-xs-12 col-sm-5"> <label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class='input-group date' id='beginTime' style="left: -10px;" > <div class="col-xs-12 col-lg-10 col-md-8">
<input type='text' name="beginTime" class="form-control" /> <div class="col-xs-12 col-sm-5">
<span class="input-group-addon"> <div class='input-group date' id='beginTime' style="left: -10px;" >
<input type='text' name="beginTime" class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-1"> <div class="col-xs-12 col-sm-1">
~ ~
</div> </div>
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<div class='input-group date' id='endTime' style="left: -10px;" > <div class='input-group date' id='endTime' style="left: -10px;" >
<input type='text' name="endTime" class="form-control" /> <input type='text' name="endTime" class="form-control" />
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i 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>
</form:form>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4">
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="profitWarehousingTable" data-toolbar="#toolbar"></table>
<!-- context menu --> <!-- 工具栏 -->
<ul id="context-menu" class="dropdown-menu"> <div id="toolbar">
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:view"> <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:add">
<li data-item="view"><a>查看</a></li> <button id="add" class="btn btn-primary" onclick="add()">
</shiro:hasPermission> <i class="glyphicon glyphicon-plus"></i> 新建
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:edit"> </button>
<li data-item="edit"><a>编辑</a></li> </shiro:hasPermission>
</shiro:hasPermission> <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:edit">
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:del"> <button id="edit" class="btn btn-success" disabled onclick="edit()">
<li data-item="delete"><a>删除</a></li> <i class="glyphicon glyphicon-edit"></i> 修改
</shiro:hasPermission> </button>
<li data-item="action1"><a>取消</a></li> </shiro:hasPermission>
</ul> <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:del">
</div> <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
</div> <i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="profitWarehousingTable" data-toolbar="#toolbar"></table>
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
</div> </div>
</div>
</body> </body>
</html> </html>
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
...@@ -29,29 +29,39 @@ ...@@ -29,29 +29,39 @@
<div id="search-collapse" class="collapse show"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="qrCode" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="qrCode" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-2"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="物资编码：">物资编码：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资编码：">物资编码：</label>
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>
<div class="col-lg-8 col-md-8">
<form:input path="goodsInfo.name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
<div class="col-lg-8 col-md-8">
<sys:treeselect id="type" name="goodsInfo.type.id" value="${qrCode.goodsInfo.type.id}" labelName="goodsInfo.type.name" labelValue="${qrCode.goodsInfo.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="型号：">型号：</label>
<div class="col-lg-8 col-md-8">
<form:input path="goodsInfo.model" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="批次号：">批次号：</label>
<div class="col-lg-8 col-md-8">
<form:input path="goodsInfo.goods.batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-2"> <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2">
<label class="label-item single-overflow pull-left" title="物资编码：">物资名称：</label> <div style="margin-top:0px">
<form:input path="goodsInfo.name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
<sys:treeselect id="type" name="goodsInfo.type.id" value="${qrCode.goodsInfo.type.id}" labelName="goodsInfo.type.name" labelValue="${qrCode.goodsInfo.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="型号：">型号：</label>
<form:input path="goodsInfo.model" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label>
<form:input path="goodsInfo.goods.batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<div style="margin-top:26px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-search"></i> 查询</a> class="fa fa-search"></i> 查询</a>
<a id="reset" 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
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.js
...@@ -9,17 +9,17 @@ $(document).ready(function() { ...@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//最低显示2行 //最低显示2行
minimumCountColumns: 2, minimumCountColumns: 2,
//是否显示行间隔色 //是否显示行间隔色
...@@ -238,4 +238,4 @@ $(document).ready(function() { ...@@ -238,4 +238,4 @@ $(document).ready(function() {
jp.openViewDialog("查看货架","${ctx}/warehouse/shelves/shelves/form/view?id=" + id, '800', '600'); jp.openViewDialog("查看货架","${ctx}/warehouse/shelves/shelves/form/view?id=" + id, '800', '600');
} }
</script> </script>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.jsp
...@@ -10,77 +10,89 @@ ...@@ -10,77 +10,89 @@
<%@include file="shelvesList.js" %> <%@include file="shelvesList.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>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="shelves" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:shelves:shelves:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:shelves:shelves:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:shelves:shelves:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:shelves:shelves:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="shelvesTable" data-toolbar="#toolbar"></table>
<!-- context menu --> <!-- 搜索 -->
<ul id="context-menu" class="dropdown-menu"> <div id="search-collapse" class="collapse show">
<shiro:hasPermission name="warehouse:shelves:shelves:view"> <div class="accordion-inner">
<li data-item="view"><a>查看</a></li> <form:form id="searchForm" modelAttribute="shelves" class="form form-horizontal well clearfix">
</shiro:hasPermission> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<shiro:hasPermission name="warehouse:shelves:shelves:edit"> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="货架名称：">货架名称：</label>
<li data-item="edit"><a>编辑</a></li> <div class="col-lg-8 col-md-8">
</shiro:hasPermission> <form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
<shiro:hasPermission name="warehouse:shelves:shelves:del"> </div>
<li data-item="delete"><a>删除</a></li> </div>
</shiro:hasPermission> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<li data-item="action1"><a>取消</a></li> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="货架编号：">货架编号：</label>
</ul> <div class="col-lg-8 col-md-8">
</div> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i 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>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:shelves:shelves:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:shelves:shelves:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:shelves:shelves:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:shelves:shelves:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="shelvesTable" data-toolbar="#toolbar"></table>
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:shelves:shelves:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:shelves:shelves:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
</div> </div>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp
...@@ -178,12 +178,19 @@ ...@@ -178,12 +178,19 @@
} }
var brforeGoodsId = '';
function onSelectGoods(items){ function onSelectGoods(items){
if(Array.isArray(items)&&items.length>0){ if(Array.isArray(items)&&items.length>0){
var item = items[0]; var item = items[0];
if (brforeGoodsId !== $("#goodsId").val()) {
$("#detail_table").bootstrapTable('load', []);
}
$("#batchNum").val(item.batchNum); $("#batchNum").val(item.batchNum);
$("#goodsId").val(item.id); $("#goodsId").val(item.id);
$("#goodsName").val(item.batchNum); $("#goodsName").val(item.batchNum);
brforeGoodsId = item.id;
} }
} }
</script> </script>
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.js
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//显示详情按钮 //显示详情按钮
detailView: true, detailView: true,
//显示详细内容函数 //显示详细内容函数
...@@ -224,14 +224,14 @@ function deleteAll(){ ...@@ -224,14 +224,14 @@ function deleteAll(){
var ids = getIdSelections(); var ids = getIdSelections();
getDetails(ids, function (canDel) { getDetails(ids, function (canDel) {
if (canDel) { if (canDel) {
// jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){ jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){
// if(data.success){ if(data.success){
// $('#storageTable').bootstrapTable('refresh'); $('#storageTable').bootstrapTable('refresh');
// jp.success(data.msg); jp.success(data.msg);
// }else{ }else{
// jp.error(data.msg); jp.error(data.msg);
// } }
// }) })
} else { } else {
jp.warning('不可删除'); jp.warning('不可删除');
} }
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.jsp
...@@ -19,23 +19,27 @@ ...@@ -19,23 +19,27 @@
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="storage" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="storage" 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 col-lg-2">
<label class="label-item single-overflow pull-left" title="入库单：">入库单：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="入库单：">入库单：</label>
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="操作人：">操作人：</label>
<sys:userselect id="operator" name="operator.id" value="${storage.operator.id}" <div class="col-lg-8 col-md-8">
labelName="operator.name" labelValue="${storage.operator.name}" <sys:userselect id="operator" name="operator.id" value="${storage.operator.id}"
cssClass="form-control "/> labelName="operator.name" labelValue="${storage.operator.name}"
cssClass="form-control "/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group"> <div class="form-group">
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label> <label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12"> <div class="col-xs-12 col-lg-10">
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;"> <div class='input-group date' id='beginTime' style="left: -10px;">
<input type='text' name="beginTime" class="form-control"/> <input type='text' name="beginTime" class="form-control"/>
...@@ -58,12 +62,14 @@ ...@@ -58,12 +62,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label> <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="批次号：">批次号：</label>
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-8 col-md-8">
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:26px"> <div style="">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-search"></i> 查询</a> class="fa fa-search"></i> 查询</a>
<a id="reset" 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
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.js
...@@ -9,17 +9,17 @@ $(document).ready(function() { ...@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json", dataType: "json",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
//显示检索按钮 //显示检索按钮
showSearch: true, showSearch: false,
//显示刷新按钮 //显示刷新按钮
showRefresh: true, showRefresh: false,
//显示切换手机试图按钮 //显示切换手机试图按钮
showToggle: true, showToggle: false,
//显示 内容列下拉框 //显示 内容列下拉框
showColumns: true, showColumns: false,
//显示到处按钮 //显示到处按钮
showExport: true, showExport: false,
//显示切换分页按钮 //显示切换分页按钮
showPaginationSwitch: true, showPaginationSwitch: false,
//最低显示2行 //最低显示2行
minimumCountColumns: 2, minimumCountColumns: 2,
//是否显示行间隔色 //是否显示行间隔色
...@@ -233,4 +233,4 @@ $(document).ready(function() { ...@@ -233,4 +233,4 @@ $(document).ready(function() {
jp.openViewDialog("查看仓库","${ctx}/warehouse/warehouse/warehouse/form/view?id=" + id, '800', '600'); jp.openViewDialog("查看仓库","${ctx}/warehouse/warehouse/warehouse/form/view?id=" + id, '800', '600');
} }
</script> </script>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.jsp
...@@ -10,85 +10,89 @@ ...@@ -10,85 +10,89 @@
<%@include file="warehouseList.js" %> <%@include file="warehouseList.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>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse show">
<div class="accordion-inner"> <div class="accordion-inner">
<form:form id="searchForm" modelAttribute="warehouse" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="warehouse" 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 col-lg-3">
<label class="label-item single-overflow pull-left" title="仓库名称：">仓库名称：</label> <label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="仓库名称：">仓库名称：</label>
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/> <div class="col-lg-9 col-md-8">
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="仓库编号：">仓库编号：</label>
<div class="col-lg-9 col-md-8">
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i 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>
</form:form>
</div>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="仓库编号：">仓库编号：</label> <!-- 工具栏 -->
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/> <div id="toolbar">
<shiro:hasPermission name="warehouse:warehouse:warehouse:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:warehouse:warehouse:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:warehouse:warehouse:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:warehouse:warehouse:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:warehouse:warehouse:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:warehouse:warehouse:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4">
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:warehouse:warehouse:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:warehouse:warehouse:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:warehouse:warehouse:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:warehouse:warehouse:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:warehouse:warehouse:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:warehouse:warehouse:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="warehouseTable" data-toolbar="#toolbar"></table>
<!-- context menu --> <!-- 表格 -->
<ul id="context-menu" class="dropdown-menu"> <table id="warehouseTable" data-toolbar="#toolbar"></table>
<shiro:hasPermission name="warehouse:warehouse:warehouse:view">
<li data-item="view"><a>查看</a></li> <!-- context menu -->
</shiro:hasPermission> <ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:warehouse:warehouse:edit"> <shiro:hasPermission name="warehouse:warehouse:warehouse:view">
<li data-item="edit"><a>编辑</a></li> <li data-item="view"><a>查看</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="warehouse:warehouse:warehouse:del"> <shiro:hasPermission name="warehouse:warehouse:warehouse:edit">
<li data-item="delete"><a>删除</a></li> <li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<li data-item="action1"><a>取消</a></li> <shiro:hasPermission name="warehouse:warehouse:warehouse:del">
</ul> <li data-item="delete"><a>删除</a></li>
</div> </shiro:hasPermission>
</div> <li data-item="action1"><a>取消</a></li>
</ul>
</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