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