Skip to content

W
warehouse
Commit c1cc6289 by zhanglt
Options

Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

parents 52009af7 fbd61e11
Showing with 212 additions and 150 deletions
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
...@@ -8,24 +8,28 @@ ...@@ -8,24 +8,28 @@
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>${fns:getConfig('productName')}</title> <title>${fns:getConfig('productName')}</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<link href="${ctxStatic}/common/css/jp-menu.css" rel="stylesheet" /> <link href="${ctxStatic}/common/css/jp-menu.css" rel="stylesheet"/>
<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script> <script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" /> <link id="theme-tab"
href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css"
<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%> rel="stylesheet"/>
<%@ include file="/webpage/include/layIM-init.jsp"%>
<style> <%@ include file="/webpage/include/systemInfoSocket-init.jsp" %>
.push-right #sidebar-nav{ <%@ include file="/webpage/include/layIM-init.jsp" %>
display:block; <style>
.push-right #sidebar-nav {
display: block;
} }
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: transparent !important; background-color: transparent !important;
} }
.navbar-inverse .navbar-toggle { .navbar-inverse .navbar-toggle {
border-color: transparent !important; border-color: transparent !important;
} }
</style> </style>
</head> </head>
...@@ -40,91 +44,96 @@ ...@@ -40,91 +44,96 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">JeePlus快速开发框架</a> <a class="navbar-brand J_menuItem" href="${ctx}/warehouse/goods/goods" data-index="0">仓储系统</a>
</div> </div>
</div> </div>
<div class="navbar-container container-fluid"> <div class="navbar-container container-fluid">
<div class="collapse navbar-collapse navbar-collapse-toolbar row" id="jpMenu"> <div class="collapse navbar-collapse navbar-collapse-toolbar row" id="jpMenu">
<ul id="o1" class="nav navbar-toolbar nav-tabs navbar-left" style="width: calc( 100% - 680px)" role="tablist"> <ul id="o1" class="nav navbar-toolbar nav-tabs navbar-left" style="width: calc( 100% - 680px)"
role="tablist">
<t:jpMenu menu="${fns:getTopMenu()}" position="top"></t:jpMenu> <t:jpMenu menu="${fns:getTopMenu()}" position="top"></t:jpMenu>
</ul> </ul>
<ul class="nav navbar-nav pull-right navbar-right"> <ul class="nav navbar-nav pull-right navbar-right">
<li> <li>
<a href="${ctx}/home" class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a> <a href="${ctx}/warehouse/goods/goods" class="J_menuItem"><i class="fa fa-home"
</li> style="font-size:14px;"></i></a>
<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>
<%-- <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"> <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">
<span><i class="fa fa-gears"></i></span> <span><i class="fa fa-gears"></i></span>
</a> </a>
<ul class="dropdown-menu pull-right animated fadeIn" role="menu" style="width:250px; padding-left: 10px;"> <ul class="dropdown-menu pull-right animated fadeIn" role="menu"
style="width:250px; padding-left: 10px;">
<li class="padder-h-xs"> <li class="padder-h-xs">
<div class="theme-icons"> <div class="theme-icons">
...@@ -153,7 +162,8 @@ ...@@ -153,7 +162,8 @@
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
</div> </div>
</label> </label>
<label data-theme="white_midnight-blue" class="ng-star-inserted" style="background: #2c3e50;"> <label data-theme="white_midnight-blue" class="ng-star-inserted"
style="background: #2c3e50;">
<div class="areas"> <div class="areas">
<span class="nav" style="background: rgb(255, 255, 255);"></span> <span class="nav" style="background: rgb(255, 255, 255);"></span>
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
...@@ -193,7 +203,8 @@ ...@@ -193,7 +203,8 @@
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
</div> </div>
</label> </label>
<label data-theme="black_midnight-blue" class="ng-star-inserted" style="background: #2c3e50;"> <label data-theme="black_midnight-blue" class="ng-star-inserted"
style="background: #2c3e50;">
<div class="areas"> <div class="areas">
<span class="nav" style="background: rgb(64, 64, 64);"></span> <span class="nav" style="background: rgb(64, 64, 64);"></span>
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
...@@ -213,28 +224,22 @@ ...@@ -213,28 +224,22 @@
</li> </li>
<li class="hidden-xs"> <li class="hidden-xs">
<a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i class="fa fa-arrows-alt"></i></a> <a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i
class="fa fa-arrows-alt"></i></a>
</li> </li>
<li class="dropdown admin-dropdown"> <li class="dropdown admin-dropdown">
<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">
<img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" class="topnav-img" style=" width: 30px; <img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"
class="topnav-img" style=" width: 30px;
margin-right: 5px; margin-right: 5px;
max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span> max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span>
</a> </a>
<ul class="dropdown-menu animated fadeIn" role="menu"> <ul class="dropdown-menu animated fadeIn" role="menu">
<li><a class="J_menuItem" href="${ctx}/sys/user/imageEdit">修改头像</a> <li><a class="J_menuItem" href="${ctx}/sys/user/imageEdit">修改头像</a></li>
</li> <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a></li>
<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a> <li><a href="${ctx}/logout">安全退出</a></li>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
</li>
<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
<li><a href="${ctx}/logout">安全退出</a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>
...@@ -243,7 +248,8 @@ ...@@ -243,7 +248,8 @@
<ul class="nav navbar-nav pull-right hidd"> <ul class="nav navbar-nav pull-right hidd">
<li class="dropdown admin-dropdown"> <li class="dropdown admin-dropdown">
<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">
<img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" class="topnav-img" style=" width: 30px; <img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"
class="topnav-img" style=" width: 30px;
margin-right: 5px; margin-right: 5px;
max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span> max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span>
</a> </a>
...@@ -267,7 +273,8 @@ ...@@ -267,7 +273,8 @@
<section id="col-left" class="nano"> <section id="col-left" class="nano">
<div id="col-left-inner" class="nano-content"> <div id="col-left-inner" class="nano-content">
<div id="user-left-box" class="clearfix hidden-sm hidden-xs"> <div id="user-left-box" class="clearfix hidden-sm hidden-xs">
<a href="#"><img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" /></a> <a href="#"><img
src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"/></a>
<div class="user-box"> <div class="user-box">
<span class="name"> <span class="name">
${fns:getUser().name} ${fns:getUser().name}
...@@ -278,7 +285,6 @@ ...@@ -278,7 +285,6 @@
</div> </div>
</div> </div>
<div class="collapse navbar-collapse navbar-ex1-collapse tab-content" id="sidebar-nav"> <div class="collapse navbar-collapse navbar-ex1-collapse tab-content" id="sidebar-nav">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
...@@ -288,12 +294,6 @@ ...@@ -288,12 +294,6 @@
</li> </li>
<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a> <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
</li> </li>
<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
</li>
<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
</li>
<li><a href="${ctx}/logout">安全退出</a> <li><a href="${ctx}/logout">安全退出</a>
</li> </li>
</ul> </ul>
...@@ -324,17 +324,21 @@ ...@@ -324,17 +324,21 @@
</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}/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>
</button> </button>
<a href="${ctx}/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a> <a href="${ctx}/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i>
退出</a>
</div> </div>
</div> </div>
<div class="J_mainContent" id="content-main" style="${cookie.tab.value!=false?'height:calc(100% - 40px)':'height:calc(100%)'}"> <div class="J_mainContent" id="content-main"
<iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctx}/home" frameborder="0" data-id="${ctx}/home" seamless></iframe> style="${cookie.tab.value!=false?'height:calc(100% - 40px)':'height:calc(100%)'}">
<iframe class="J_iframe" name="iframe0" width="100%" height="100%"
src="${ctx}/warehouse/goods/goods" frameborder="0" data-id="${ctx}/warehouse/goods/goods"
seamless></iframe>
</div> </div>
</div> </div>
...@@ -349,14 +353,12 @@ ...@@ -349,14 +353,12 @@
</section> </section>
<script> <script>
$(function(){ $(function () {
$.addtabs.drop(); $.addtabs.drop();
$('#showMenu').click(function() { $('#showMenu').click(function () {
$('body').toggleClass('push-right'); $('body').toggleClass('push-right');
}); });
$('#hideMenu').click(function () { $('#hideMenu').click(function () {
...@@ -369,17 +371,19 @@ ...@@ -369,17 +371,19 @@
$('#showTab').click(function () { $('#showTab').click(function () {
$('#showTab').parent().toggleClass("active") $('#showTab').parent().toggleClass("active")
$('#closeTab').parent().toggleClass("active") $('#closeTab').parent().toggleClass("active")
$("#breadcrumbs").attr("class","breadcrumbs"); $("#breadcrumbs").attr("class", "breadcrumbs");
$("#content-main").css("height","calc(100% - 40px)") $("#content-main").css("height", "calc(100% - 40px)")
$.get('${ctx}/tab/true?url='+window.top.location.href,function(result){ }); $.get('${ctx}/tab/true?url=' + window.top.location.href, function (result) {
});
}); });
$('#closeTab').click(function () { $('#closeTab').click(function () {
$('#showTab').parent().toggleClass("active") $('#showTab').parent().toggleClass("active")
$('#closeTab').parent().toggleClass("active") $('#closeTab').parent().toggleClass("active")
$("#breadcrumbs").attr("class","un-breadcrumbs"); $("#breadcrumbs").attr("class", "un-breadcrumbs");
$("#content-main").css("height","calc(100%)") $("#content-main").css("height", "calc(100%)")
$.get('${ctx}/tab/false',function(result){ }); $.get('${ctx}/tab/false', function (result) {
});
}); });
$(".theme-icons label").click(function () { $(".theme-icons label").click(function () {
...@@ -389,14 +393,16 @@ ...@@ -389,14 +393,16 @@
}) })
}); });
/** /**
*切换主题 *切换主题
*/ */
function changeStyle(){ function changeStyle() {
$.get('${ctx}/style/default',function(result){ $.get('${ctx}/style/default', function (result) {
window.location.reload(); window.location.reload();
}); });
} }
/** /**
* 切换颜色 * 切换颜色
* @param theme * @param theme
...@@ -404,50 +410,51 @@ ...@@ -404,50 +410,51 @@
function changeTheme(style_theme) { function changeTheme(style_theme) {
var style = style_theme.split("_")[0]; var style = style_theme.split("_")[0];
var theme = style_theme.split("_")[1]; var theme = style_theme.split("_")[1];
if(style == "black"){ if (style == "black") {
$("body").removeClass("theme-whbl"); $("body").removeClass("theme-whbl");
}else{ } else {
$("body").addClass("theme-whbl"); $("body").addClass("theme-whbl");
} }
var link = $('<link>') var link = $('<link>')
.appendTo('head') .appendTo('head')
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/common/css/app-'+theme+'.css'); .attr('href', '${ctxStatic}/common/css/app-' + theme + '.css');
var tabLink = $('<link>') var tabLink = $('<link>')
.appendTo('head') .appendTo('head')
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/plugin/js-menu/menuTab-'+theme+'.css'); .attr('href', '${ctxStatic}/plugin/js-menu/menuTab-' + theme + '.css');
var childrenLink= $('<link>').appendTo($(".J_iframe").contents().find("head")) var childrenLink = $('<link>').appendTo($(".J_iframe").contents().find("head"))
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/common/css/app-'+theme+'.css'); .attr('href', '${ctxStatic}/common/css/app-' + theme + '.css');
$.get('${ctx}/theme/'+style_theme,function(result){ $.get('${ctx}/theme/' + style_theme, function (result) {
setTimeout(function () { setTimeout(function () {
$('#theme').remove(); $('#theme').remove();
$('#theme-tab').remove(); $('#theme-tab').remove();
$(".J_iframe").contents().find("#theme").remove(); $(".J_iframe").contents().find("#theme").remove();
}, 500); }, 500);
link.attr("id","theme"); link.attr("id", "theme");
childrenLink.attr("id","theme"); childrenLink.attr("id", "theme");
tabLink.attr("id","theme-tab") tabLink.attr("id", "theme-tab")
}); });
} }
$(function ($) { $(function ($) {
$('#sidebar-nav a').on('click', function (e) { $('#sidebar-nav a').on('click', function (e) {
var _this = $(this); var _this = $(this);
$('#sidebar-nav a').each(function(){ $('#sidebar-nav a').each(function () {
if($(this) != _this){ if ($(this) != _this) {
if($(this).hasClass("active")){ if ($(this).hasClass("active")) {
$(this).removeClass("active"); $(this).removeClass("active");
} }
} }
}); });
if(!_this.hasClass("active")){ if (!_this.hasClass("active")) {
_this.addClass("active") _this.addClass("active")
_this.parent("li.open").find("a").first().addClass("active"); _this.parent("li.open").find("a").first().addClass("active");
} }
...@@ -464,8 +471,7 @@ ...@@ -464,8 +471,7 @@
$item.toggleClass('open'); $item.toggleClass('open');
if ($item.hasClass('open')) { if ($item.hasClass('open')) {
$item.children('.submenu').slideDown('fast'); $item.children('.submenu').slideDown('fast');
} } else {
else {
$item.children('.submenu').slideUp('fast'); $item.children('.submenu').slideUp('fast');
} }
if ($("#user-menu").parent().hasClass('open')) { if ($("#user-menu").parent().hasClass('open')) {
...@@ -473,13 +479,12 @@ ...@@ -473,13 +479,12 @@
$("#user-menu").parent().toggleClass('open'); $("#user-menu").parent().toggleClass('open');
} }
}); });
$('#user-link').on('click',function () { $('#user-link').on('click', function () {
var $item = $("#user-menu"); var $item = $("#user-menu");
$item.parent().toggleClass('open'); $item.parent().toggleClass('open');
if ($item.parent().hasClass('open')) { if ($item.parent().hasClass('open')) {
$item.slideDown('fast'); $item.slideDown('fast');
} } else {
else {
$item.slideUp('fast'); $item.slideUp('fast');
} }
$("#sidebar-nav .tab-pane").find('.open .submenu').slideUp('fast'); $("#sidebar-nav .tab-pane").find('.open .submenu').slideUp('fast');
......
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
...@@ -105,6 +105,13 @@ ...@@ -105,6 +105,13 @@
] ]
}) })
} }
/**
* 获取所有明细数据
* @returns {*|jQuery}
*/
function getTableData() {
return $(selector).bootstrapTable('getData');
}
function addDetail(selector){ function addDetail(selector){
var row = { var row = {
id: '', id: '',
...@@ -126,7 +133,7 @@ ...@@ -126,7 +133,7 @@
} }
function removeRow(index, rowId, rowDelFlag){ function removeRow(index, rowId, rowDelFlag){
if(rowId){ if(rowId){
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp
...@@ -99,6 +99,11 @@ ...@@ -99,6 +99,11 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写明细!');
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){
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
function removeRow(index, rowId, rowDelFlag) { function removeRow(index, rowId, rowDelFlag) {
if (rowId) { if (rowId) {
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
function removeRow(index, rowId, rowDelFlag) { function removeRow(index, rowId, rowDelFlag) {
if (rowId) { if (rowId) {
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossForm.jsp
...@@ -74,6 +74,11 @@ ...@@ -74,6 +74,11 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写明细!');
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){
......
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},
...@@ -116,7 +122,7 @@ ...@@ -116,7 +122,7 @@
field: '', field: '',
title: '操作', title: '操作',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var text = '删除'; var text = row.delFlag == 1 ? '撤销删除' : '删除';
var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">" + text + "</a>"] var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">" + text + "</a>"]
return result.join(''); return result.join('');
} }
...@@ -177,11 +183,18 @@ ...@@ -177,11 +183,18 @@
} }
function removeRow(index, rowId, rowDelFlag) { function removeRow(index, rowId, rowDelFlag) {
if (rowId && rowId != 'undefined') {
var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, {
delFlag: delFlag
})
} else {
$(selector).bootstrapTable("remove", { $(selector).bootstrapTable("remove", {
field: '$index', field: '$index',
values: [index] values: [index]
}) })
} }
}
function updateRow(index, row) { function updateRow(index, row) {
$(selector).bootstrapTable('updateRow', { $(selector).bootstrapTable('updateRow', {
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp
...@@ -117,6 +117,18 @@ ...@@ -117,6 +117,18 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写领用物资!');
return;
}
var hasReceiver = getTableData().every(function(item){
return item.receiver
})
if(!hasReceiver){
jp.warning('领用人必填!');
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){
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
function removeRow(index, rowId, rowDelFlag) { function removeRow(index, rowId, rowDelFlag) {
if (rowId) { if (rowId) {
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundForm.jsp
...@@ -82,6 +82,11 @@ ...@@ -82,6 +82,11 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写明细!');
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){
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
*/ */
function removeRow(index, rowId, rowDelFlag){ function removeRow(index, rowId, rowDelFlag){
if(rowId){ if(rowId){
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingForm.jsp
...@@ -85,6 +85,11 @@ ...@@ -85,6 +85,11 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写明细!');
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){
......
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
*/ */
function removeRow(index, rowId, rowDelFlag){ function removeRow(index, rowId, rowDelFlag){
if(rowId){ if(rowId){
var delFlag = rowDelFlag === 1 ? 0 : 1 var delFlag = rowDelFlag == 1 ? 0 : 1
updateRow(index, { updateRow(index, {
delFlag: delFlag delFlag: delFlag
}) })
......
src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
if(!isValidate){ if(!isValidate){
return false; return false;
}else{ }else{
var hasDetails = getTableData().length == 0;
if(hasDetails){
jp.warning('请填写明细!');
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