Skip to content

W
warehouse
Commit 892477f6 by anxiaohe
Options

搜索调整

parent f6bc673f
Showing with 271 additions and 203 deletions
src/main/webapp/webpage/modules/common/gridselect.jsp
......@@ -30,7 +30,6 @@ $(document).ready(function() {
//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
url: jp.unescapeHTML("${url}"),
responseHandler: function (res){
debugger
if(res.rows){
res.rows = res.rows.filter(function(item){
return item !== null && typeof item !== "undefined" && item !== "";
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.js
......@@ -10,17 +10,17 @@ $(document).ready(function() {
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
......@@ -19,17 +19,19 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="goods" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label>
<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="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group">
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12">
<label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class="col-lg-10 col-md-8">
<div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;">
<input type='text' name="beginTime" class="form-control"/>
......@@ -52,14 +54,16 @@
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label>
<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">
<sys:userselect id="operator" name="operator.id" value="${goods.operator.id}"
labelName="operator.name" labelValue="${goods.operator.name}"
cssClass="form-control required"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="">
<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
......@@ -87,14 +91,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:goods:goods:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:goods:goods:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:goods:goods:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:goods:goods:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:goods:goods:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
......@@ -9,17 +9,17 @@
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
......@@ -33,32 +33,43 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="ledger" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="物资名称：">物资名称：</label>
<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">
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
</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">
<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 class="col-xs-12 col-sm-6 col-md-4">--%>
<%-- <label class="label-item single-overflow pull-left" title="型号：">型号：</label>--%>
<%-- <form:input path="model" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="货架id集合：">货架id集合：</label>
<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="货架id集合：">货架id集合：</label>
<div class="col-lg-8">
<form:input path="shelvesIds" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="数量：">数量：</label>
</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">
<form:input path="num" htmlEscape="false" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
</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>
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js
......@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.jsp
......@@ -18,17 +18,19 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialLoss" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="盘亏单号：">盘亏单号：</label>
<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="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group">
<label class="label-item single-overflow pull-left" title="盘亏时间：">&nbsp;盘亏时间：</label>
<div class="col-xs-12">
<label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="盘亏时间：">&nbsp;盘亏时间：</label>
<div class="col-lg-10 col-md-8 col-xs-12">
<div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;" >
<input type='text' name="beginTime" class="form-control" />
......@@ -51,8 +53,8 @@
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
<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>
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
......@@ -440,10 +440,16 @@
area: ['1200', '600'],
content: $("#scanTpl").html(),
btn: ['确定', '关闭'],
success: function () {
success: function (layer) {
// $("#scanResult").focus();
scanStart();
renderScanTable();
setTimeout(function () {
var width = layer.width();
var height = layer.height();
layer.width(width + 1);
layer.height(height + 1);
})
},
yes: function (index, layero) {
var selectTableData = getSelectScanTable();
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js
......@@ -9,17 +9,17 @@
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.jsp
......@@ -18,20 +18,24 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialRequisition"
class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label>
<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="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label>
</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="operator" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
</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
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
......@@ -117,17 +117,17 @@
// })
// }
// },
{
field: 'receiver.name',
title: '领用人',
align: 'center',
formatter: function (value, row, index) {
return Mustache.render($("#receiverTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
}
},
// {
// field: 'receiver.name',
// title: '领用人',
// align: 'center',
// formatter: function (value, row, index) {
// return Mustache.render($("#receiverTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
// row: row,
// idx: index
// })
// }
// },
{
field: 'remarks',
title: '备注',
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js
......@@ -9,17 +9,17 @@
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.jsp
......@@ -18,21 +18,19 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="outbound" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="出库单号：">出库单号：</label>
<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="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="相关表单ID：">相关表单ID：</label>
<form:input path="relationId" htmlEscape="false" maxlength="64" class=" form-control"/>
</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">
<label class="label-item single-overflow pull-left" title="出库时间：">&nbsp;出库时间：</label>
<div class="col-xs-12">
<label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="出库时间：">&nbsp;出库时间：</label>
<div class="col-lg-9 col-md-8">
<div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginOutboundTime' style="left: -10px;" >
<input type='text' name="beginOutboundTime" class="form-control" />
......@@ -55,15 +53,18 @@
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="出库分类：">出库分类：</label>
<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 class="col-xs-12 col-sm-6 col-md-4">
<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="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
......@@ -10,17 +10,17 @@ $(document).ready(function() {
dataType: "json",
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,
//显示详细内容函数
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.jsp
......@@ -11,7 +11,7 @@
<%@include file="profitWarehousingList.js" %>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">盘盈入库单列表</h3>
......@@ -19,17 +19,19 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="profitWarehousing" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="盘盈入库单号：">盘盈入库单号：</label>
<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="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group">
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12">
<label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12 col-lg-10 col-md-8">
<div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;" >
<input type='text' name="beginTime" class="form-control" />
......@@ -52,8 +54,8 @@
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
<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>
......@@ -79,14 +81,14 @@
<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: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> 查看
......@@ -112,6 +114,6 @@
</ul>
</div>
</div>
</div>
</div>
</body>
</html>
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
......@@ -29,29 +29,39 @@
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="qrCode" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="物资编码：">物资编码：</label>
<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="code" 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>
</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 class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
</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 class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="型号：">型号：</label>
</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 class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label>
</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 class="col-xs-12 col-sm-6 col-md-2">
<div style="margin-top:26px">
</div>
<div class="col-xs-12 col-sm-6 col-md-2 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
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.js
......@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json",
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行
minimumCountColumns: 2,
//是否显示行间隔色
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.jsp
......@@ -10,7 +10,7 @@
<%@include file="shelvesList.js" %>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">货架信息列表</h3>
......@@ -18,11 +18,23 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<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">
<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="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">
<form:input path="number" 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>
......@@ -48,14 +60,14 @@
<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: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> 查看
......@@ -81,6 +93,6 @@
</ul>
</div>
</div>
</div>
</div>
</body>
</html>
src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp
......@@ -178,12 +178,19 @@
}
var brforeGoodsId = '';
function onSelectGoods(items){
if(Array.isArray(items)&&items.length>0){
var item = items[0];
if (brforeGoodsId !== $("#goodsId").val()) {
$("#detail_table").bootstrapTable('load', []);
}
$("#batchNum").val(item.batchNum);
$("#goodsId").val(item.id);
$("#goodsName").val(item.batchNum);
brforeGoodsId = item.id;
}
}
</script>
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.js
......@@ -9,17 +9,17 @@
dataType: "json",
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,
//显示详细内容函数
......@@ -224,14 +224,14 @@ function deleteAll(){
var ids = getIdSelections();
getDetails(ids, function (canDel) {
if (canDel) {
// jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){
// if(data.success){
// $('#storageTable').bootstrapTable('refresh');
// jp.success(data.msg);
// }else{
// jp.error(data.msg);
// }
// })
jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){
if(data.success){
$('#storageTable').bootstrapTable('refresh');
jp.success(data.msg);
}else{
jp.error(data.msg);
}
})
} else {
jp.warning('不可删除');
}
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.jsp
......@@ -19,23 +19,27 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="storage" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="入库单：">入库单：</label>
<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="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label>
</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:userselect id="operator" name="operator.id" value="${storage.operator.id}"
labelName="operator.name" labelValue="${storage.operator.name}"
cssClass="form-control "/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
<div class="form-group">
<label class="label-item single-overflow pull-left" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12">
<label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="时间：">&nbsp;时间：</label>
<div class="col-xs-12 col-lg-10">
<div class="col-xs-12 col-sm-5">
<div class='input-group date' id='beginTime' style="left: -10px;">
<input type='text' name="beginTime" class="form-control"/>
......@@ -58,12 +62,14 @@
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="批次号：">批次号：</label>
<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="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="">
<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
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.js
......@@ -9,17 +9,17 @@ $(document).ready(function() {
dataType: "json",
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行
minimumCountColumns: 2,
//是否显示行间隔色
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.jsp
......@@ -10,7 +10,7 @@
<%@include file="warehouseList.js" %>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">仓库信息列表</h3>
......@@ -18,19 +18,23 @@
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="warehouse" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="仓库名称：">仓库名称：</label>
<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="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="仓库编号：">仓库编号：</label>
</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 class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
</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>
......@@ -56,14 +60,14 @@
<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: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> 查看
......@@ -89,6 +93,6 @@
</ul>
</div>
</div>
</div>
</div>
</body>
</html>
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