Skip to content

W
warehouse
Commit dd57d543 by yyq1988
Options

代码优化

parent 4d8575ab
Showing with 75 additions and 69 deletions
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
...@@ -58,75 +58,75 @@ ...@@ -58,75 +58,75 @@
<a href="${ctx}/warehouse/goods/goods" class="J_menuItem"><i class="fa fa-home" <a href="${ctx}/warehouse/goods/goods" class="J_menuItem"><i class="fa fa-home"
style="font-size:14px;"></i></a> style="font-size:14px;"></i></a>
</li> </li>
<li class="hidden-xs"> <%-- <li class="hidden-xs">--%>
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a> <%-- <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>--%>
<ul class="dropdown-menu"> <%-- <ul class="dropdown-menu">--%>
<li class="${cookie.tab.value!=false?'active':''}"> <%-- <li class="${cookie.tab.value!=false?'active':''}">--%>
<a id="showTab" href="#">开启tab</a> <%-- <a id="showTab" href="#">开启tab</a>--%>
</li> <%-- </li>--%>
<li class="${cookie.tab.value==false?'active':''}"> <%-- <li class="${cookie.tab.value==false?'active':''}">--%>
<a id="closeTab" href="#">关闭tab</a> <%-- <a id="closeTab" href="#">关闭tab</a>--%>
</li> <%-- </li>--%>
</ul> <%-- </ul>--%>
</li> <%-- </li>--%>
<li class="dropdown"> <%-- <li class="dropdown">--%>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <%-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
<i class="fa fa-envelope-o"></i> <%-- <i class="fa fa-envelope-o"></i>--%>
<span class="label label-info">${noReadCount }</span> <%-- <span class="label label-info">${noReadCount }</span>--%>
</a> <%-- </a>--%>
<ul class="dropdown-menu animated fadeIn"> <%-- <ul class="dropdown-menu animated fadeIn">--%>
<li class="messages-top text-center"> <%-- <li class="messages-top text-center">--%>
你有 ${noReadCount} 封未读邮件. <%-- 你有 ${noReadCount} 封未读邮件.--%>
</li> <%-- </li>--%>
<c:forEach items="${mailPage.list}" var="mailBox"> <%-- <c:forEach items="${mailPage.list}" var="mailBox">--%>
<li class="dropdown-messages"> <%-- <li class="dropdown-messages">--%>
<a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}"> <%-- <a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">--%>
<div class="message-sender"> <%-- <div class="message-sender">--%>
${mailBox.sender.name }<small <%-- ${mailBox.sender.name }<small--%>
class="pull-right">${fns:getTime(mailBox.sendtime)}前</small> <%-- class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>--%>
</div> <%-- </div>--%>
<div class="message-header"> <%-- <div class="message-header">--%>
${mailBox.mail.overview} <small class="pull-right"> <%-- ${mailBox.mail.overview} <small class="pull-right">--%>
<fmt:formatDate value="${mailBox.sendtime}" <%-- <fmt:formatDate value="${mailBox.sendtime}"--%>
pattern="yyyy-MM-dd HH:mm:ss"/></small> <%-- pattern="yyyy-MM-dd HH:mm:ss"/></small>--%>
</div> <%-- </div>--%>
</a> <%-- </a>--%>
</li> <%-- </li>--%>
</c:forEach> <%-- </c:forEach>--%>
<li class=" text-center"> <%-- <li class=" text-center">--%>
<a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc"> <%-- <a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc">--%>
<font color='gray'> <i class="fa fa-envelope"></i> 查看所有邮件</font> <%-- <font color='gray'> <i class="fa fa-envelope"></i> 查看所有邮件</font>--%>
</a> <%-- </a>--%>
</li> <%-- </li>--%>
</ul> <%-- </ul>--%>
</li> <%-- </li>--%>
<li class="dropdown"> <%-- <li class="dropdown">--%>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <%-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
<i class="fa fa-bell-o"></i> <%-- <i class="fa fa-bell-o"></i>--%>
<span class="label label-info">${count }</span> <%-- <span class="label label-info">${count }</span>--%>
</a> <%-- </a>--%>
<ul class="dropdown-menu animated fadeIn"> <%-- <ul class="dropdown-menu animated fadeIn">--%>
<li class="messages-top text-center"> <%-- <li class="messages-top text-center">--%>
你有 ${count } 条新通知. <%-- 你有 ${count } 条新通知.--%>
</li> <%-- </li>--%>
<c:forEach items="${page.list}" var="oaNotify"> <%-- <c:forEach items="${page.list}" var="oaNotify">--%>
<li class="dropdown-notifications"> <%-- <li class="dropdown-notifications">--%>
<a class="J_menuItem" href="${ctx}/oa/oaNotify/form?id=${oaNotify.id}&isSelf=true"> <%-- <a class="J_menuItem" href="${ctx}/oa/oaNotify/form?id=${oaNotify.id}&isSelf=true">--%>
<div class="notification"> <%-- <div class="notification">--%>
<i class="fa fa-bell-o"></i> ${fns:abbr(oaNotify.title,50)} <%-- <i class="fa fa-bell-o"></i> ${fns:abbr(oaNotify.title,50)}--%>
<span class="pull-right text-muted small">${fns:getTime(oaNotify.updateDate)}前</span> <%-- <span class="pull-right text-muted small">${fns:getTime(oaNotify.updateDate)}前</span>--%>
</div> <%-- </div>--%>
</a> <%-- </a>--%>
</li> <%-- </li>--%>
</c:forEach> <%-- </c:forEach>--%>
</ul> <%-- </ul>--%>
</li> <%-- </li>--%>
<li class="dropdown color-picker"> <li class="dropdown color-picker">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
function initTable() { function initTable() {
var data = ${fns:toJson(materialRequisition.materialRequisitionInfoList)}; var data = ${fns:toJson(materialRequisition.materialRequisitionInfoList)};
if(data.length){
data = data.map(function(item){
item.delFlag = 0;
return item;
})
}
$(selector).bootstrapTable({ $(selector).bootstrapTable({
data: data, data: data,
columns: [{checkbox: true}, columns: [{checkbox: true},
......
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