Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 125494c3 由 sunke
选项

扫码料架增加库位检查功能 

日志查询增加按操作人查询
1 个父辈 0dca3784
内嵌 并排
正在显示 4 个修改的文件 包含 19 行增加 和 27 行删除
myproject/src/main/java/com/myproject/webapp/controller/user/DataLogSearchController.java
...@@ -100,7 +100,7 @@ public class DataLogSearchController extends BaseSearchController { ...@@ -100,7 +100,7 @@ public class DataLogSearchController extends BaseSearchController {
addStrEqParam(request,criteria,"status"); addStrEqParam(request,criteria,"status");
addLikeParam(request,criteria,"sourceName"); addLikeParam(request,criteria,"sourceName");
addStrEqParam(request,criteria,"storageId"); addStrEqParam(request,criteria,"storageId");
addLikeParam(request,criteria,"operator");
query.addCriteria(criteria); query.addCriteria(criteria);
......
myproject/src/main/webapp/WEB-INF/pages/dataLog/dataLogSearch.jsp
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="col-md-2 col-xs-2"> <div class="col-md-2 col-xs-2">
<button class="btn purple" type="submit"><i class="fa fa-search"></i><fmt:message <button class="btn purple" type="submit"><i class="fa fa-search"></i><fmt:message
key="button.search"/></button> key="button.search"/></button>
<button class="btn" id="exitSystem" onclick="CloseWebPage()">AAAA</button> <%--<button class="btn" id="exitSystem" onclick="CloseWebPage()">AAAA</button>--%>
</div> </div>
</div> </div>
...@@ -121,7 +121,13 @@ ...@@ -121,7 +121,13 @@
</div> </div>
</div> </div>
<label class="control-label col-md-1 col-xs-2"><fmt:message key="dataLog.operator"/></label>
<div class="col-md-2 col-xs-4">
<div style="text-align:left" class="input-group">
<input type="text" name="operator" class="form-control" value="${operator}"/>
</div>
</div>
</div> </div>
</form:form> </form:form>
...@@ -200,9 +206,9 @@ ...@@ -200,9 +206,9 @@
function CloseWebPage() { // function CloseWebPage() {
window.open('', '_top'); window.top.close(); // window.open('', '_top'); window.top.close();
} // }
}); });
</script> </script>
......
myproject/src/main/webapp/WEB-INF/pages/storage/codeShelf.jsp
...@@ -50,12 +50,13 @@ ...@@ -50,12 +50,13 @@
<div class="actions"> <div class="actions">
<%--<button type="button" class="btn btn-fit-height default" onclick="checkAllPos();">--%> <button type="button" class="btn btn-fit-height default" onclick="checkAllPos();">
<%--<fmt:message key="shelf.btn.posCheck"/>--%> <fmt:message key="shelf.btn.posCheck"/>
<%--</button>--%> </button>
<%--<button type="button" class="btn btn-fit-height default" onclick="closeAllLights();">--%> <button type="button" class="btn btn-fit-height default" onclick="closeAllLights();">
<%--<fmt:message key="shelf.btn.closeAll"/>--%> <fmt:message key="shelf.btn.closeAll"/>
<%--</button>--%> </button>
<div class="btn-group"> <div class="btn-group">
<a href="" class="btn grey-steel btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true"> <a href="" class="btn grey-steel btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
...@@ -72,21 +73,6 @@ ...@@ -72,21 +73,6 @@
Q1 2014 Q1 2014
</a> </a>
</li> </li>
<li>
<a href="javascript:;" style="background-color: #FFFF00;">
Q2 2014
</a>
</li>
<li class="active">
<a href="javascript:;" style="background-color: #FF00FF;">
Q3 2014
</a>
</li>
<li>
<a href="javascript:;" style="background-color: #FFFF00;">
Q4 2014
</a>
</li>
</ul> </ul>
</div> </div>
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<div class="page-footer-inner"> <div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a> 2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div> </div>
<span class="right" style="color: #a3a3a3;">Version: 1.8.209</span> <span class="right" style="color: #a3a3a3;">Version: 1.12.210</span>
<div class="scroll-to-top"> <div class="scroll-to-top">
<i class="icon-arrow-up"></i> <i class="icon-arrow-up"></i>
</div> </div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!