Skip to content

W
warehouse
Commit c4fcd9b4 by 胡懿
Options

Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

parents b02be173 8fcd8aa7
Showing with 20 additions and 11 deletions
src/main/webapp/static/common/js/jeeplus.js
...@@ -324,9 +324,9 @@ function delRow(obj, prefix){ ...@@ -324,9 +324,9 @@ function delRow(obj, prefix){
}, },
openStorageSelectDialog:function(params, yesFuc){ openStorageSelectDialog:function(params, yesFuc){
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|name|type.name|model"; var fieldKeys = "qrCode.code|name|type.name|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/sys/login/sysHome.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"/>
<style> <style>
......
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
</button> </button>
<nav class="page-tabs J_menuTabs"> <nav class="page-tabs J_menuTabs">
<div class="page-tabs-content"> <div class="page-tabs-content">
<a href="javascript:;" class="active J_menuTab" data-id="${ctx}/warehouse/goods/goods">首页</a> <a href="javascript:;" class="active J_menuTab" data-id="${ctx}/warehouse/goods/goods">货品管理</a>
</div> </div>
</nav> </nav>
<button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i> <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
...@@ -352,7 +352,6 @@ ...@@ -352,7 +352,6 @@
</section> </section>
<script> <script>
......
src/main/webapp/webpage/modules/sys/login/sysIndex.jsp
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
</button> </button>
<nav class="page-tabs J_menuTabs"> <nav class="page-tabs J_menuTabs">
<div class="page-tabs-content"> <div class="page-tabs-content">
<a href="javascript:;" class="active J_menuTab" data-id="${ctx}/home">首页</a> <a href="javascript:;" class="active J_menuTab" data-id="${ctx}/home">货品管理</a>
</div> </div>
</nav> </nav>
<button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i> <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
...@@ -73,7 +73,17 @@ ...@@ -73,7 +73,17 @@
$("#table").bootstrapTable({ $("#table").bootstrapTable({
method: 'get', method: 'get',
url: '${ctx}/warehouse/ledger/ledger/infoDate?batchNum='+ row.batchNum+'&ledger.id=${ledger.id}', url: '${ctx}/warehouse/ledger/ledger/infoDate?batchNum='+ row.batchNum+'&ledger.id=${ledger.id}',
page: true, //是否显示分页（*）
pagination: true,
//排序方式
sortOrder: "asc",
//初始化加载第一页，默认第一页
pageNumber:1,
//每页的记录行数（*）
pageSize: 10,
//可供选择的每页的行数（*）
pageList: [10, 25, 50, 100],
sidePagination: "server",
columns: [ columns: [
{checkbox:true}, {checkbox:true},
{field: 'code', title: '物资编码'}, {field: 'code', title: '物资编码'},
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp
...@@ -125,10 +125,10 @@ ...@@ -125,10 +125,10 @@
var hasReceiver = getTableData().every(function(item){ var hasReceiver = getTableData().every(function(item){
return item.receiver return item.receiver
}) })
if(!hasReceiver){ // if(!hasReceiver){
jp.warning('领用人必填!'); // jp.warning('领用人必填!');
return; // return;
} // }
jp.loading(); jp.loading();
jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){ jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
if(data.success){ if(data.success){
......
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