Skip to content

W
warehouse
Commit da2a05d8 by 胡懿
Options

Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

parents 5312fcd8 69d08014
Showing with 60 additions and 60 deletions
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
...@@ -53,36 +53,36 @@ ...@@ -53,36 +53,36 @@
</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>--%>
</div> <%-- </div>--%>
<!-- 表格 --> <!-- 表格 -->
<table id="ledgerTable" data-toolbar="#toolbar"></table> <table id="ledgerTable" data-toolbar="#toolbar"></table>
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required" title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required"
allowClear="true" notAllowSelectParent="true"/> allowClear="true" notAllowSelectParent="true"/>
</td> </td>
<td><font color="red">*</font>领用时间</td> <td>领用时间</td>
<td> <td>
<div class='input-group form_datetime' id='time'> <div class='input-group form_datetime' id='time'>
<input type='text' name="time" class="form-control " <input type='text' name="time" class="form-control "
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.jsp
...@@ -74,34 +74,34 @@ ...@@ -74,34 +74,34 @@
<!-- 工具栏 --> <!-- 工具栏 -->
<div id="toolbar"> <div id="toolbar">
<shiro:hasPermission name="warehouse:outbound:outbound:add"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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:outbound:outbound:edit"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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:outbound:outbound:del"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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:outbound:outbound:import"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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:outbound:outbound:export"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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:outbound:outbound:view"> <%-- <shiro:hasPermission name="warehouse:outbound:outbound: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>--%>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<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="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-2">
......
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