Skip to content

W
warehouse
Commit f1c0149b by zhanglt
Options

Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

parents aa821799 8826ddad
Showing with 522 additions and 349 deletions
src/main/webapp/static/common/js/jeeplus.js
...@@ -327,7 +327,7 @@ function delRow(obj, prefix){ ...@@ -327,7 +327,7 @@ function delRow(obj, prefix){
var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+params.batchNum+"&qrCode.state="+params.state; var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+params.batchNum+"&qrCode.state="+params.state;
var fieldLabels = "物资编码|品名|代码|单价|单位|数量|总价|型号"; var fieldLabels = "物资编码|品名|代码|单价|单位|数量|总价|型号";
var fieldKeys = "qrCode.code|type.name|type.code|type.amount|type.unit|num|infoSum|model"; var fieldKeys = "qrCode.code|type.name|type.code|type.amount|type.unit|num|infoSum|model";
var searchLabels = "品名代码|型号"; var searchLabels = "品名|型号";
var searchKeys = "goodsInfo.type|goodsInfo.model"; var searchKeys = "goodsInfo.type|goodsInfo.model";
top.layer.open({ top.layer.open({
type: 2, type: 2,
......
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/sys/login/sysIndex-jp.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
rel="stylesheet"/> rel="stylesheet"/>
<%@ include file="/webpage/include/systemInfoSocket-init.jsp" %> <%@ include file="/webpage/include/systemInfoSocket-init.jsp" %>
<%@ include file="/webpage/include/layIM-init.jsp" %> <%-- <%@ include file="/webpage/include/layIM-init.jsp" %>--%>
<style> <style>
.push-right #sidebar-nav { .push-right #sidebar-nav {
display: block; display: block;
......
src/main/webapp/webpage/modules/sys/login/sysIndex.jsp
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script> <script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" /> <link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%> <%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
<%@ include file="/webpage/include/layIM-init.jsp"%> <%-- <%@ include file="/webpage/include/layIM-init.jsp"%>--%>
</head> </head>
<body class=""> <body class="">
......
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
...@@ -314,9 +314,20 @@ ...@@ -314,9 +314,20 @@
<input id="goodsInfoList{{idx}}_name" name="goodsInfoList[{{idx}}].name" type="text" value="{{row.name}}" onchange="onInputChange('{{idx}}', this, 'name')" class="form-control required"/> <input id="goodsInfoList{{idx}}_name" name="goodsInfoList[{{idx}}].name" type="text" value="{{row.name}}" onchange="onInputChange('{{idx}}', this, 'name')" class="form-control required"/>
</script> </script>
<script id="typeNameTpl" type="text/html">//<!-- <script id="typeNameTpl" type="text/html">
<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" {{#row.canUse}}
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//--> //<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
{{^row.canUse}}
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" disabled="disabled"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
</script> </script>
<script id="typeCodeTpl" type="text/html"> <script id="typeCodeTpl" type="text/html">
<input id="goodsInfoList{{idx}}_typeCode" name="goodsInfoList[{{idx}}].type.code" type="text" value="{{row.type.code}}" readonly class="form-control required"/> <input id="goodsInfoList{{idx}}_typeCode" name="goodsInfoList[{{idx}}].type.code" type="text" value="{{row.type.code}}" readonly class="form-control required"/>
...@@ -351,5 +362,13 @@ ...@@ -351,5 +362,13 @@
<input id="goodsInfoList{{idx}}_infoSum" name="goodsInfoList[{{idx}}].infoSum" type="text" value="{{row.infoSum}}" readonly onchange="onInputChange('{{idx}}', this, 'infoSum')" class="form-control required"/> <input id="goodsInfoList{{idx}}_infoSum" name="goodsInfoList[{{idx}}].infoSum" type="text" value="{{row.infoSum}}" readonly onchange="onInputChange('{{idx}}', this, 'infoSum')" class="form-control required"/>
</script> </script>
<script id="remarksTpl" type="text/html"> <script id="remarksTpl" type="text/html">
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2" onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea> {{#row.canUse}}
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2"
onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
{{/row.canUse}}
{{^row.canUse}}
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2" readonly
onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
{{/row.canUse}}
</script> </script>
src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp
...@@ -37,13 +37,17 @@ ...@@ -37,13 +37,17 @@
</td> </td>
<td><font color="red">*</font>时间</td> <td><font color="red">*</font>时间</td>
<td> <td>
<div class='input-group form_datetime' id='time'> <div class='input-group form_datetime' id='time_canEdit'>
<input type='text' name="time" class="form-control required" <input type='text' name="time" class="form-control required"
value="<fmt:formatDate value="${goods.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/> value="<fmt:formatDate value="${goods.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
<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 class="input-group" id='time_canNotEdit' style="display: none">
<input type='text' id="time" name="time" class="form-control required" disabled readonly
value="<fmt:formatDate value="${goods.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -96,6 +100,19 @@ ...@@ -96,6 +100,19 @@
if ("${mode}" !== 'add') { if ("${mode}" !== 'add') {
$("#remarks").val(jp.escapeHtml($("#remarks").val())); $("#remarks").val(jp.escapeHtml($("#remarks").val()));
var list = ${fns:toJson(goods.goodsInfoList)};
var canEdit = !list.some(function (item) {
return item.qrCode && Number(item.qrCode.state) > 0
});
if (!canEdit) {
$("#batchNum").attr('readonly', true);
$("#time_canEdit").hide();
$("#time_canEdit input").attr('disabled', true);
$("#time_canNotEdit").show();
$("#time_canNotEdit input").attr('disabled', false);
}
} }
}); });
function save() { function save() {
......
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,
//显示详细内容函数 //显示详细内容函数
...@@ -212,10 +212,13 @@ function getIdSelections() { ...@@ -212,10 +212,13 @@ function getIdSelections() {
} }
function deleteAll(){ function deleteAll(){
jp.confirm('确认要删除该货品模块记录吗？', function(){ jp.confirm('确认要删除该货品模块记录吗？', function(){
jp.loading(); jp.loading();
jp.get("${ctx}/warehouse/goods/goods/deleteAll?ids=" + getIdSelections(), function(data){ const ids = getIdSelections();
getDetails(ids, function (canDel) {
if (canDel) {
jp.get("${ctx}/warehouse/goods/goods/deleteAll?ids=" + ids, function(data){
if(data.success){ if(data.success){
$('#goodsTable').bootstrapTable('refresh'); $('#goodsTable').bootstrapTable('refresh');
jp.success(data.msg); jp.success(data.msg);
...@@ -223,10 +226,42 @@ function deleteAll(){ ...@@ -223,10 +226,42 @@ function deleteAll(){
jp.error(data.msg); jp.error(data.msg);
} }
}) })
} else {
jp.warning('有已入库的明细数据，不可删除');
}
});
}) })
} }
function getDetails (ids, callback) {
var l = ids.length;
var canDel = true;
var i = 0;
getDetail$(i);
function getDetail$ (index) {
if (!canDel || index === l) {
callback && callback(canDel);
return
}
var id = ids[index];
$.get("${ctx}/warehouse/goods/goods/detail?id="+id, function (result) {
var list = result.goodsInfoList;
canDel = list.every(function (el) {
return el.qrCode ? Number(el.qrCode.state) === 0 : true;
});
console.log(canDel)
i++;
getDetail$(i);
});
}
}
//刷新列表 //刷新列表
function refresh(){ function refresh(){
$('#goodsTable').bootstrapTable('refresh'); $('#goodsTable').bootstrapTable('refresh');
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
...@@ -19,17 +19,19 @@ ...@@ -19,17 +19,19 @@
<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>
<div class="col-lg-9 col-md-8">
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </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"> <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"/>
...@@ -52,14 +54,16 @@ ...@@ -52,14 +54,16 @@
</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>
<div class="col-lg-9 col-md-8">
<sys:userselect id="operator" name="operator.id" value="${goods.operator.id}" <sys:userselect id="operator" name="operator.id" value="${goods.operator.id}"
labelName="operator.name" labelValue="${goods.operator.name}" labelName="operator.name" labelValue="${goods.operator.name}"
cssClass="form-control required"/> cssClass="form-control required"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<div style="margin-top:26px"> <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 <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/ledgerDetail.jsp
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
}, },
{ {
field: 'code', field: 'code',
title: '入库单' title: '物资编码'
}, },
{ {
field: 'batchNum', field: 'batchNum',
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
<td> <td>
<sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name" <sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name"
labelValue="${ledger.type.name}" labelValue="${ledger.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" title="品名" url="/warehouse/materialtype/materialType/treeData"
extId="${ledger.id}" cssClass="form-control " allowClear="true"/> extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</td> </td>
<td>品名代码</td> <td>品名</td>
<td> <td>
<%-- <sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name"--%> <%-- <sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name"--%>
<%-- labelValue="${ledger.type.name}"--%> <%-- labelValue="${ledger.type.name}"--%>
<%-- title="品名代码" url="/warehouse/materialtype/materialType/treeData"--%> <%-- title="品名" url="/warehouse/materialtype/materialType/treeData"--%>
<%-- extId="${ledger.id}" cssClass="form-control " allowClear="true"/>--%> <%-- extId="${ledger.id}" cssClass="form-control " allowClear="true"/>--%>
<form:input path="type.code" htmlEscape="false" class="form-control "/> <form:input path="type.code" htmlEscape="false" class="form-control "/>
</td> </td>
......
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
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</style> </style>
</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>
...@@ -33,32 +33,30 @@ ...@@ -33,32 +33,30 @@
<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">--%>
</div> <%-- <form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
<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 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>--%>
<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 class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<form:input path="shelvesIds" htmlEscape="false" maxlength="64" class=" form-control"/> <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="num" htmlEscape="false" 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">--%>
<div style="margin-top:26px"> <%-- <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>--%>
<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="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>
...@@ -66,37 +64,36 @@ ...@@ -66,37 +64,36 @@
</form:form> </form:form>
</div> </div>
</div> </div>
<!-- 工具栏 --> <!-- 工具栏 -->
<div id="toolbar"> <div id="toolbar">
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:add">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger:add">--%>
<%-- <button id="add" class="btn btn-primary" onclick="add()">--%> <%-- <button id="add" class="btn btn-primary" onclick="add()">--%>
<%-- <i class="glyphicon glyphicon-plus"></i> 新建--%> <%-- <i class="glyphicon glyphicon-plus"></i> 新建--%>
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:edit">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger:edit">--%>
<%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%> <%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
<%-- <i class="glyphicon glyphicon-edit"></i> 修改--%> <%-- <i class="glyphicon glyphicon-edit"></i> 修改--%>
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:del">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger:del">--%>
<%-- <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%> <%-- <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%>
<%-- <i class="glyphicon glyphicon-remove"></i> 删除--%> <%-- <i class="glyphicon glyphicon-remove"></i> 删除--%>
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:import">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger: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:ledger:ledger:export">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger: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:ledger:ledger:view">--%> <%-- <shiro:hasPermission name="warehouse:ledger:ledger: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> 查看--%>
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
<button class="btn btn-default" onclick="viewScanData()"> <button class="btn btn-default" onclick="viewScanData()">
<i class="fa fa-search-plus"></i> 查看二维码数据 <i class="fa fa-search-plus"></i> 查看二维码数据
</button> </button>
...@@ -132,7 +129,7 @@ ...@@ -132,7 +129,7 @@
<form:form id="scan-searchForm" class="form form-horizontal well clearfix"> <form:form id="scan-searchForm" 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="code" htmlEscape="false" class=" form-control"/>--%> <%-- <form:input path="code" htmlEscape="false" class=" form-control"/>--%>
<input type="text" id="scan-code" class="form-control" onfocus="scanIptGetFocusStop()" onblur="scanIptGetFocusStart()" /> <input type="text" id="scan-code" class="form-control" onfocus="scanIptGetFocusStop()" onblur="scanIptGetFocusStart()" />
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4">
...@@ -158,7 +155,7 @@ ...@@ -158,7 +155,7 @@
<label class="col-sm-2 control-label">品名：</label> <label class="col-sm-2 control-label">品名：</label>
<div class="col-sm-10 control-label text-left"> <div class="col-sm-10 control-label text-left">
//<!--<sys:treeselect id="type" name="typeId" //<!--<sys:treeselect id="type" name="typeId"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true"/>//--> cssClass="form-control required" allowClear="true" allowSearch="true"/>//-->
</div> </div>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
title: '选择物资台账明细', title: '选择物资台账明细',
isMultiSelect: true, isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode", url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|品名|品名代码|型号|批次号|单价|数量|单位", fieldLabels: "物资编码|品名|品名|型号|批次号|单价|数量|单位",
fieldKeys: "code|type.name|type.code|model|batchNum|amount|num|type.unit", fieldKeys: "code|type.name|type.code|model|batchNum|amount|num|type.unit",
searchLabels: "物资编码", searchLabels: "物资编码",
searchKeys: "code", searchKeys: "code",
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!-- <script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}" <sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//--> title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script> </script>
<script id="ledgerInfoTypeCodeTpl" type="text/html"> <script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode" <input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
......
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
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<%@include file="materialLossList.js" %> <%@include file="materialLossList.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>
...@@ -18,41 +18,43 @@ ...@@ -18,41 +18,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="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>
<div class="col-lg-8 col-md-8">
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="form-group">
<label class="label-item single-overflow pull-left" title="盘亏时间：">&nbsp;盘亏时间：</label>
<div class="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" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div> </div>
</div> <%-- <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">--%>
<div class="col-xs-12 col-sm-1"> <%-- <div class="form-group">--%>
~ <%-- <label class="label-item single-overflow col-md-4 col-lg-2 control-label" title="盘亏时间：">&nbsp;盘亏时间：</label>--%>
</div> <%-- <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='endTime' style="left: -10px;" > <%-- <div class='input-group date' id='beginTime' style="left: -10px;" >--%>
<input type='text' name="endTime" 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> <%-- <div class="col-xs-12 col-sm-1">--%>
</div> <%-- ~--%>
</div> <%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4"> <%-- <div class="col-xs-12 col-sm-5">--%>
<div style="margin-top:26px"> <%-- <div class='input-group date' id='endTime' style="left: -10px;" >--%>
<%-- <input type='text' name="endTime" class="form-control" />--%>
<%-- <span class="input-group-addon">--%>
<%-- <span class="glyphicon glyphicon-calendar"></span>--%>
<%-- </span>--%>
<%-- </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="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>
...@@ -78,14 +80,14 @@ ...@@ -78,14 +80,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:materialloss:materialLoss:import">--%> <%-- <shiro:hasPermission name="warehouse:materialloss:materialLoss: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:materialloss:materialLoss:export">--%> <%-- <shiro:hasPermission name="warehouse:materialloss:materialLoss: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:materialloss:materialLoss:view"> <shiro:hasPermission name="warehouse:materialloss:materialLoss: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> 查看
...@@ -111,6 +113,6 @@ ...@@ -111,6 +113,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
...@@ -440,10 +440,15 @@ ...@@ -440,10 +440,15 @@
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.find('.layui-layer-content').height(height - 97);
})
}, },
yes: function (index, layero) { yes: function (index, layero) {
var selectTableData = getSelectScanTable(); var selectTableData = getSelectScanTable();
...@@ -623,7 +628,7 @@ ...@@ -623,7 +628,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!-- <script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialRequisitionInfoList{{idx}}_ledgerInfoType" name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialRequisitionInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}" <sys:treeselect id="materialRequisitionInfoList{{idx}}_ledgerInfoType" name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialRequisitionInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//--> title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script> </script>
<script id="ledgerInfoTypeCodeTpl" type="text/html"> <script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeCode" <input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeCode"
......
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,27 @@ ...@@ -18,20 +18,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="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>
<div class="col-lg-8 col-md-8">
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</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="operator" 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">
<div style="margin-top:26px"> <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"/>--%>
<sys:userselect id="operator" name="operator.id" value="${materialRequisition.operator.id}"
labelName="operator.name" labelValue="${materialRequisition.operator.name}"
cssClass="form-control required"/>
</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 <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/materialtype/materialTypeForm.jsp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp" %> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
<title>物资品名代码管理</title> <title>物资品名管理</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<link rel="stylesheet" href="${ctxStatic}/common/css/form.css"> <link rel="stylesheet" href="${ctxStatic}/common/css/form.css">
</head> </head>
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
class="form-horizontal"> class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<form:hidden path="parentIds" /> <form:hidden path="parentIds" />
<h3 class="text-center">物资品名代码表</h3> <h3 class="text-center">物资品名表</h3>
<table class="table table-bordered main-table"> <table class="table table-bordered main-table">
<tr> <tr>
<td><font color="red">*</font>名称</td> <td><font color="red">*</font>品名</td>
<td> <td>
<form:input path="name" htmlEscape="false" <form:input path="name" htmlEscape="false"
class="form-control required"/> class="form-control required"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td><font color="red">*</font>编码</td> <td><font color="red">*</font>代码</td>
<td> <td>
<form:input path="code" htmlEscape="false" <form:input path="code" htmlEscape="false"
class="form-control required"/> class="form-control required"/>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
}); });
function del(con,id){ function del(con,id){
jp.confirm('确认要删除物资品名代码吗？', function(){ jp.confirm('确认要删除品名代码吗？', function(){
jp.loading(); jp.loading();
$.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){ $.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){
if(data.success){ if(data.success){
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
} }
function add(){//新增 function add(){//新增
jp.openSaveDialog("新增物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600'); jp.openSaveDialog("新增品名代码",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600');
} }
function edit(id){//编辑 function edit(id){//编辑
jp.openSaveDialog("编辑物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600'); jp.openSaveDialog("编辑品名代码",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600');
} }
function view(id){//查看 function view(id){//查看
jp.openViewDialog("查看物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600'); jp.openViewDialog("查看品名代码",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600');
} }
function addChild(id){//添加下级机构 function addChild(id){//添加下级机构
jp.openSaveDialog("添加下级物资品名代码",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600'); jp.openSaveDialog("添加下级品名代码",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600');
} }
function refresh(){//刷新 function refresh(){//刷新
var index = jp.loading("正在加载，请稍等..."); var index = jp.loading("正在加载，请稍等...");
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li> <li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialtype:materialType:add"> <shiro:hasPermission name="warehouse:materialtype:materialType:add">
<li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级物资品名代码</a></li> <li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级品名代码</a></li>
</shiro:hasPermission> </shiro:hasPermission>
</ul> </ul>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp"%>
<html> <html>
<head> <head>
<title>物资品名代码管理</title> <title>品名代码管理</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<%@include file="materialTypeList.js" %> <%@include file="materialTypeList.js" %>
</head> </head>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">物资品名代码列表 </h3> <h3 class="panel-title">品名代码列表 </h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<table id="materialTypeTreeTable" class="table table-hover"> <table id="materialTypeTreeTable" class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>名称</th> <th>品名</th>
<th>物资品名代码编码</th> <th>代码</th>
<th>单价</th> <th>单价</th>
<th>单位</th> <th>单位</th>
<th>备注信息</th> <th>备注信息</th>
......
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: '备注',
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
title: '选择物资台账明细', title: '选择物资台账明细',
isMultiSelect: true, isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode", url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|物资名称|品名代码|型号|批次号|单价", fieldLabels: "物资编码|物资名称|品名|型号|批次号|单价",
fieldKeys: "code|name|type.name|model|batchNum|amount", fieldKeys: "code|name|type.name|model|batchNum|amount",
searchLabels: "物资编码", searchLabels: "物资编码",
searchKeys: "code", searchKeys: "code",
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!-- <script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="outboundInfoList{{idx}}_ledgerInfoType" name="outboundInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="outboundInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}" <sys:treeselect id="outboundInfoList{{idx}}_ledgerInfoType" name="outboundInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="outboundInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//--> title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script> </script>
<script id="ledgerInfoTypeCodeTpl" type="text/html"> <script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoTypeCode" <input id="outboundInfoList{{idx}}_ledgerInfoTypeCode"
......
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,21 +18,19 @@ ...@@ -18,21 +18,19 @@
<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>
<div class="col-lg-8 col-md-8">
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </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>
<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-3 control-label" title="出库时间：">&nbsp;出库时间：</label>
<div class="col-xs-12"> <div class="col-lg-9 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='beginOutboundTime' style="left: -10px;" > <div class='input-group date' id='beginOutboundTime' style="left: -10px;" >
<input type='text' name="beginOutboundTime" class="form-control" /> <input type='text' name="beginOutboundTime" class="form-control" />
...@@ -55,15 +53,18 @@ ...@@ -55,15 +53,18 @@
</div> </div>
</div> </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:select path="type" class="form-control m-b">
<form:option value="" label=""/> <form:option value="" label=""/>
<form:options items="${fns:getDictList('wh_delivery_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/> <form:options items="${fns:getDictList('wh_delivery_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
</form:select> </form:select>
</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">
<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/profitwarehousing/profitWarehousingDetail.jsp
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
formatter: function (value,row,index){ formatter: function (value,row,index){
if(value === '2'){ if(value === '2'){
return '已入库' return '已入库'
}else{ } else if (value === '3') {
return '已出库';
} else {
return '未入库' return '未入库'
} }
} }
...@@ -528,11 +530,11 @@ ...@@ -528,11 +530,11 @@
<script id="typeTpl" type="text/html">//<!-- <script id="typeTpl" type="text/html">//<!--
{{#row.readonly}} {{#row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}" <sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" /> title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" />
{{/row.readonly}} {{/row.readonly}}
{{^row.readonly}} {{^row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}" <sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" /> title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />
{{/row.readonly}}//--> {{/row.readonly}}//-->
</script> </script>
<script id="typeCodeTpl" type="text/html"> <script id="typeCodeTpl" type="text/html">
......
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,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<%@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>
...@@ -19,17 +19,19 @@ ...@@ -19,17 +19,19 @@
<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>
<div class="col-lg-8 col-md-8">
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </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"> <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 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" />
...@@ -52,8 +54,8 @@ ...@@ -52,8 +54,8 @@
</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">
<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>
...@@ -79,14 +81,14 @@ ...@@ -79,14 +81,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing:import">--%> <%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing: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:profitwarehousing:profitWarehousing:export">--%> <%-- <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing: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:profitwarehousing:profitWarehousing:view"> <shiro:hasPermission name="warehouse:profitwarehousing:profitWarehousing: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> 查看
...@@ -112,6 +114,6 @@ ...@@ -112,6 +114,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeForm.jsp
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</head> </head>
<body> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
...@@ -33,12 +33,13 @@ ...@@ -33,12 +33,13 @@
<div class="panel-body"> <div class="panel-body">
<form:form id="inputForm" modelAttribute="qrCode" action="${ctx}/warehouse/qrcode/qrCode/save" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="qrCode" action="${ctx}/warehouse/qrcode/qrCode/save" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<div class="form-group"> <form:hidden path="goodsInfo.id"/>
<label class="col-sm-2 control-label">货品明细外键：</label> <%-- <div class="form-group">--%>
<div class="col-sm-10"> <%-- <label class="col-sm-2 control-label">货品明细外键：</label>--%>
<form:input path="goodsInfo.id" htmlEscape="false" class="form-control "/> <%-- <div class="col-sm-10">--%>
</div> <%-- <form:input path="goodsInfo.id" htmlEscape="false" class="form-control "/>--%>
</div> <%-- </div>--%>
<%-- </div>--%>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">物资编码：</label> <label class="col-sm-2 control-label">物资编码：</label>
<div class="col-sm-10"> <div class="col-sm-10">
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.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,
//最低显示2行 //最低显示2行
minimumCountColumns: 2, minimumCountColumns: 2,
//是否显示行间隔色 //是否显示行间隔色
...@@ -95,14 +95,16 @@ $(document).ready(function() { ...@@ -95,14 +95,16 @@ $(document).ready(function() {
title: '物资编码', title: '物资编码',
sortable: true, sortable: true,
sortName: 'code' sortName: 'code'
},{ },
field: 'goodsInfo.name', // {
title: '物资名称', // field: 'goodsInfo.name',
sortable: true, // title: '物资名称',
sortName: 'goodsInfo.name' // sortable: true,
},{ // sortName: 'goodsInfo.name'
// },
{
field: 'goodsInfo.type.name', field: 'goodsInfo.type.name',
title: '品名代码', title: '品名',
sortable: true, sortable: true,
sortName: 'goodsInfo.type.name' sortName: 'goodsInfo.type.name'
},{ },{
......
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>
<div class="col-lg-8 col-md-8">
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </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.name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<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>--%>
<%-- <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}" <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" /> 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-2"> </div>
<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="goodsInfo.model" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="goodsInfo.model" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-2"> </div>
<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="goodsInfo.goods.batchNum" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="goodsInfo.goods.batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-2"> </div>
<div style="margin-top:26px"> <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 <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
...@@ -64,16 +74,16 @@ ...@@ -64,16 +74,16 @@
<!-- 工具栏 --> <!-- 工具栏 -->
<div id="toolbar"> <div id="toolbar">
<shiro:hasPermission name="warehouse:qrcode:qrCode:add"> <%-- <shiro:hasPermission name="warehouse:qrcode:qrCode:add">--%>
<button id="add" class="btn btn-primary" onclick="add()"> <%-- <button id="add" class="btn btn-primary" onclick="add()">--%>
<i class="glyphicon glyphicon-plus"></i> 新建 <%-- <i class="glyphicon glyphicon-plus"></i> 新建--%>
</button> <%-- </button>--%>
</shiro:hasPermission> <%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:qrcode:qrCode:edit"> <%-- <shiro:hasPermission name="warehouse:qrcode:qrCode:edit">--%>
<button id="edit" class="btn btn-success" disabled onclick="edit()"> <%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
<i class="glyphicon glyphicon-edit"></i> 修改 <%-- <i class="glyphicon glyphicon-edit"></i> 修改--%>
</button> <%-- </button>--%>
</shiro:hasPermission> <%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:qrcode:qrCode:del"> <shiro:hasPermission name="warehouse:qrcode:qrCode:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()"> <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
...@@ -87,11 +97,11 @@ ...@@ -87,11 +97,11 @@
<%-- <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:qrcode:qrCode:view"> <%-- <shiro:hasPermission name="warehouse:qrcode:qrCode: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> 查看--%>
</button> <%-- </button>--%>
</shiro:hasPermission> <%-- </shiro:hasPermission>--%>
<%-- <button id="printAll" class="btn btn-primary" disabled onclick="onPrint()">--%> <%-- <button id="printAll" class="btn btn-primary" disabled onclick="onPrint()">--%>
<%-- <i class="fa fa-search-plus"></i> 批量打印--%> <%-- <i class="fa fa-search-plus"></i> 批量打印--%>
<%-- </button>--%> <%-- </button>--%>
......
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,
//是否显示行间隔色 //是否显示行间隔色
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.jsp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<%@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>
...@@ -18,11 +18,23 @@ ...@@ -18,11 +18,23 @@
<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="shelves" class="form form-horizontal well clearfix"> <form:form id="searchForm" modelAttribute="shelves" 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">
<div style="margin-top:26px"> <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="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>
...@@ -48,14 +60,14 @@ ...@@ -48,14 +60,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:shelves:shelves:import">--%> <%-- <shiro:hasPermission name="warehouse:shelves:shelves: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:shelves:shelves:export">--%> <%-- <shiro:hasPermission name="warehouse:shelves:shelves: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:shelves:shelves:view"> <shiro:hasPermission name="warehouse:shelves:shelves: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> 查看
...@@ -81,6 +93,6 @@ ...@@ -81,6 +93,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
...@@ -447,10 +447,14 @@ ...@@ -447,10 +447,14 @@
area: ['1200', '600'], area: ['1200', '600'],
// content: $("#scanResultTpl").html(), // content: $("#scanResultTpl").html(),
content: $("#scanTpl").html(), content: $("#scanTpl").html(),
success: function () { success: function (layer$) {
// $("#scanResult").focus(); // $("#scanResult").focus();
scanStart(); scanStart();
renderScanTable(); renderScanTable();
setTimeout(function () {
var height = layer$.height();
layer$.find('.layui-layer-content').height(height - 97);
})
}, },
yes: function (index, layero) { yes: function (index, layero) {
var selectTableData = getSelectScanTable(); var selectTableData = getSelectScanTable();
...@@ -620,13 +624,13 @@ ...@@ -620,13 +624,13 @@
{{#row.readonly}} {{#row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" <sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" disabled="disabled" allowClear="false" allowSearch="true" callback="onSelectType" /> cssClass="form-control required" disabled="disabled" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}} {{/row.readonly}}
{{^row.readonly}} {{^row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" <sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="false" allowSearch="true" callback="onSelectType" /> cssClass="form-control required" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}} {{/row.readonly}}
//--> //-->
...@@ -636,7 +640,7 @@ ...@@ -636,7 +640,7 @@
</script> </script>
<script id="typeTpl" type="text/html">//<!-- <script id="typeTpl" type="text/html">//<!--
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_type" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="storageInfoList{{idx}}.type.name" labelValue="{{row.type.name}}" <sys:treeselectNotNameProperty id="storageInfoList{{idx}}_type" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="storageInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//--> title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
</script> </script>
<script id="amountTpl" type="text/html"> <script id="amountTpl" type="text/html">
<input id="storageInfoList{{idx}}_amount" name="storageInfoList[{{idx}}].amount" type="text" value="{{row.amount}}" readonly onchange="onInputChange('{{idx}}', this, 'amount')" class="form-control required"/> <input id="storageInfoList{{idx}}_amount" name="storageInfoList[{{idx}}].amount" type="text" value="{{row.amount}}" readonly onchange="onInputChange('{{idx}}', this, 'amount')" class="form-control required"/>
......
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,
//显示详细内容函数 //显示详细内容函数
...@@ -221,6 +221,9 @@ function deleteAll(){ ...@@ -221,6 +221,9 @@ function deleteAll(){
jp.confirm('确认要删除该入库信息记录吗？', function(){ jp.confirm('确认要删除该入库信息记录吗？', function(){
jp.loading(); jp.loading();
var ids = getIdSelections();
getDetails(ids, function (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');
...@@ -229,10 +232,44 @@ function deleteAll(){ ...@@ -229,10 +232,44 @@ function deleteAll(){
jp.error(data.msg); jp.error(data.msg);
} }
}) })
} else {
jp.warning('有已入库的明细数据，不可删除');
}
});
}) })
} }
function getDetails (ids, callback) {
var l = ids.length;
var canDel = true;
var i = 0;
getDetail$(i);
function getDetail$ (index) {
if (!canDel || index === l) {
callback && callback(canDel);
return
}
var id = ids[index];
$.get("${ctx}/warehouse/storage/storage/detail?id="+id, function (result) {
var list = result.storageInfoList;
canDel = list.every(function (el) {
return el.qrCode ? Number(el.qrCode.state) < 2 : true;
});
i++;
getDetail$(i);
});
}
}
//刷新列表 //刷新列表
function refresh(){ function refresh(){
$('#storageTable').bootstrapTable('refresh'); $('#storageTable').bootstrapTable('refresh');
......
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>
<div class="col-lg-8 col-md-8">
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<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">
<sys:userselect id="operator" name="operator.id" value="${storage.operator.id}" <sys:userselect id="operator" name="operator.id" value="${storage.operator.id}"
labelName="operator.name" labelValue="${storage.operator.name}" labelName="operator.name" labelValue="${storage.operator.name}"
cssClass="form-control "/> cssClass="form-control "/>
</div> </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"> <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>
<div class="col-lg-8 col-md-8">
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<div style="margin-top:26px"> <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 <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/storage/storageStatistic.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
data: [], data: [],
columns:[ columns:[
{field: 'name', title: '名称', align: 'center'}, {field: 'name', title: '名称', align: 'center'},
{field: 'type.name', title: '品名代码',align: 'center'}, {field: 'type.name', title: '品名',align: 'center'},
{field: 'model', title: '型号',align: 'center'}, {field: 'model', title: '型号',align: 'center'},
{field: 'warehouseNames', title: '仓库',align: 'center'}, {field: 'warehouseNames', title: '仓库',align: 'center'},
{field: 'shelvesNames', title: '货架',align: 'center'}, {field: 'shelvesNames', title: '货架',align: 'center'},
......
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,
//是否显示行间隔色 //是否显示行间隔色
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.jsp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<%@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>
...@@ -18,19 +18,23 @@ ...@@ -18,19 +18,23 @@
<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>
<div class="col-lg-9 col-md-8">
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<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="code" htmlEscape="false" maxlength="64" class=" form-control"/> <form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-4"> </div>
<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="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>
...@@ -56,14 +60,14 @@ ...@@ -56,14 +60,14 @@
<i class="glyphicon glyphicon-remove"></i> 删除 <i class="glyphicon glyphicon-remove"></i> 删除
</button> </button>
</shiro:hasPermission> </shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:warehouse:warehouse:import">--%> <%-- <shiro:hasPermission name="warehouse:warehouse:warehouse: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:warehouse:warehouse:export">--%> <%-- <shiro:hasPermission name="warehouse:warehouse:warehouse: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:warehouse:warehouse:view"> <shiro:hasPermission name="warehouse:warehouse:warehouse: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> 查看
...@@ -89,6 +93,6 @@ ...@@ -89,6 +93,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </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