diff --git a/erp_web/css/common.css b/erp_web/css/common.css index 861c2e72..1460c498 100644 --- a/erp_web/css/common.css +++ b/erp_web/css/common.css @@ -23,6 +23,11 @@ padding-left: 20px; } +#tablePanel #searchTable { + height: 40px; + padding: 5px; +} + .system-config { padding: 5px; font-size: 13px; diff --git a/erp_web/css/jsherp.css b/erp_web/css/jsherp.css index a84b53ad..71202919 100644 --- a/erp_web/css/jsherp.css +++ b/erp_web/css/jsherp.css @@ -1,7 +1,7 @@ /*! - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - * @author ThinkGem - * @version 2019-7-10 + * Copyright (c) 2013-Now 华夏erp All rights reserved. + * @author jishenghua + * @version 2019-09-14 */ .nobg { background: none !important diff --git a/erp_web/home.html b/erp_web/home.html index 93a42def..adefe13a 100644 --- a/erp_web/home.html +++ b/erp_web/home.html @@ -33,7 +33,7 @@
今日累计销售 - 90元 + 0元
@@ -42,7 +42,7 @@
本月累计销售 - 410元 + 0元
@@ -52,7 +52,7 @@
本月累计进货 - 760元 + 0元
diff --git a/erp_web/js/adminlte/css/skins/skin-blue-light2.css b/erp_web/js/adminlte/css/skins/skin-blue-light2.css index 79449677..20a13319 100644 --- a/erp_web/js/adminlte/css/skins/skin-blue-light2.css +++ b/erp_web/js/adminlte/css/skins/skin-blue-light2.css @@ -1,6 +1,3 @@ -/* - * http://jeesite.com - */ .main-header .navbar { background-color: #1890ff; } diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js index 4374d6ac..154b7d89 100644 --- a/erp_web/js/common/common.js +++ b/erp_web/js/common/common.js @@ -47,9 +47,10 @@ } } function dgResize() { + var searchTabHeight = $('#searchTable').height(); $('#tableData').datagrid('resize', { width: $(window).width() - 6, - height: $(window).height() - 76 + height: $(window).height() - searchTabHeight -46 }); } $(window).resize(function () { diff --git a/erp_web/js/common/des.js b/erp_web/js/common/des.js index 080ab468..d1b60715 100644 --- a/erp_web/js/common/des.js +++ b/erp_web/js/common/des.js @@ -7,7 +7,7 @@ * $('#inputForm').submit(function(){ * $('#password').val(DesUtils.encode($('#password').val(), '1,2,3')); * }); - * @author ThinkGem + * @author jishenghua */ (function() { diff --git a/erp_web/js/common/i18n/jsherp_zh_CN.js b/erp_web/js/common/i18n/jsherp_zh_CN.js index 35abf076..fe272d2b 100644 --- a/erp_web/js/common/i18n/jsherp_zh_CN.js +++ b/erp_web/js/common/i18n/jsherp_zh_CN.js @@ -1,9 +1,8 @@ /*! - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - * - * 国际化文件 - * @author ThinkGem - * @version 2017-12-24 + * Copyright (c) 2013-Now 华夏erp All rights reserved. + * + * @author jishenghua + * @version 2019-09-14 */ (function (a) { window.js = window.js || {}; diff --git a/erp_web/js/common/jsherp.js b/erp_web/js/common/jsherp.js index f6083b14..5a23be20 100644 --- a/erp_web/js/common/jsherp.js +++ b/erp_web/js/common/jsherp.js @@ -1,12 +1,12 @@ /*! - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * Copyright (c) 2013-Now 华夏ERP All rights reserved. * * 通用公共JavaScript，注意：项目请不要修改公共CSS样式，若需要新增或调整，请在common.js中覆盖 - * @author ThinkGem - * @version 2019-7-10 + * @author jishenghua + * @version 2019-9-14 */ if (typeof jQuery === "undefined") { - throw new Error("JeeSite's JavaScript requires jQuery") + throw new Error("JSHERP's JavaScript requires jQuery") } (function($, window, undefined) { parent.$("iframe.ui-layout-content").each(function() { diff --git a/erp_web/js/icheck/1.0/icheck.js b/erp_web/js/icheck/1.0/icheck.js index 019016c4..73cf0762 100644 --- a/erp_web/js/icheck/1.0/icheck.js +++ b/erp_web/js/icheck/1.0/icheck.js @@ -80,7 +80,7 @@ disabledClass: _disabled, indeterminateClass: _indeterminate, - // ThinkGem add default style. + // jishenghua add default style. checkboxClass: 'icheckbox_minimal-grey', radioClass: 'iradio_minimal-grey', diff --git a/erp_web/js/jquery-plugins/jquery.inputmask.js b/erp_web/js/jquery-plugins/jquery.inputmask.js index 8bf19144..2cbc8d44 100644 --- a/erp_web/js/jquery-plugins/jquery.inputmask.js +++ b/erp_web/js/jquery-plugins/jquery.inputmask.js @@ -4,7 +4,7 @@ * Copyright (c) 2010 - 2015 Robin Herbots * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php) * Version: 3.2.3-5 -* @ThinkGem 新增money千分位格式别名，举例如下： +* @jishenghua 新增money千分位格式别名，举例如下： * $(".moneyMask").inputmask({alias:"money"}); // 金额数据格式（初始化完成表单后调用） * $('.moneyMask').inputmask('remove'); // 金额数据格式化恢复（表单提交之前调用） */ @@ -2426,7 +2426,7 @@ digitsOptional: !1, clearMaskOnLostFocus: !1 }, - // ThinkGem 2015-10-14 + // jishenghua 2015-10-14 money: { prefix: "", groupSeparator: ",", diff --git a/erp_web/js/jquery-plugins/jquery.slimscroll.js b/erp_web/js/jquery-plugins/jquery.slimscroll.js index 96680e65..10518f5d 100644 --- a/erp_web/js/jquery-plugins/jquery.slimscroll.js +++ b/erp_web/js/jquery-plugins/jquery.slimscroll.js @@ -460,7 +460,7 @@ } } - hideBar(); // ThinkGem 初始化完成滚动条自动隐藏 + hideBar(); // jishenghua 初始化完成滚动条自动隐藏 }); diff --git a/erp_web/js/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js b/erp_web/js/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js index 768e85b7..e7c26372 100644 --- a/erp_web/js/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js +++ b/erp_web/js/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js @@ -3820,13 +3820,13 @@ })(jQuery); /* - * 扩展方法 ThinkGem + * 扩展方法 jishenghua */ (function($){ $.extend(true, $.fn.zTree, { /** * 根据级别展开节点（如果级别设置为-1，则：如果有1个根节点，则展开一级节点，否则不展开） - * ThinkGem 2018-3-7 + * jishenghua 2018-3-7 */ expandNodeByLevel: function(tree, expandLevel){ if (!tree){ diff --git a/erp_web/js/jquery/jquery-1.12.4.js b/erp_web/js/jquery/jquery-1.12.4.js index 0f68f751..6a3e65c2 100644 --- a/erp_web/js/jquery/jquery-1.12.4.js +++ b/erp_web/js/jquery/jquery-1.12.4.js @@ -212,7 +212,7 @@ jQuery.extend = jQuery.fn.extend = function() { // Prevent never-ending loop // if ( target === copy ) { - if (name === "__proto__" || target === copy) { // 修复jQuery原型污染漏洞 ThinkGem + if (name === "__proto__" || target === copy) { // 修复jQuery原型污染漏洞 jishenghua continue; } diff --git a/erp_web/js/layer/3.1/layer.js b/erp_web/js/layer/3.1/layer.js index b8a2130e..e8ccee48 100644 --- a/erp_web/js/layer/3.1/layer.js +++ b/erp_web/js/layer/3.1/layer.js @@ -15,7 +15,7 @@ var isLayui = window.layui && layui.define, $, win, ready = { }(), config: {}, end: {}, minIndex: 0, minLeft: [], - //btn: [layer.i18n.btnOk, layer.i18n.btnCancel], // ThinkGem + //btn: [layer.i18n.btnOk, layer.i18n.btnCancel], // jishenghua //五种原始层模式 type: ['dialog', 'page', 'iframe', 'loading', 'tips'] @@ -24,7 +24,7 @@ var isLayui = window.layui && layui.define, $, win, ready = { //默认内置方法。 var layer = { v: '3.0.3', - i18n: { // ThinkGem 国际化支持 + i18n: { // jishenghua 国际化支持 btnOk: '确定', btnCancel: '取消', title: '信息', @@ -231,7 +231,7 @@ Class.pt.vessel = function(conType, callback){ + (config.type == 1 && conType ? '' : (config.content||'')) + '' + ''+ function(){ - var closebtn = ismax && config.title ? '' : ''; // ThinkGem 必须有标题的清空下才能最小化 + var closebtn = ismax && config.title ? '' : ''; // jishenghua 必须有标题的清空下才能最小化 closebtn += ismax ? '' : ''; config.closeBtn && (closebtn += ''); return closebtn; @@ -276,8 +276,8 @@ Class.pt.creat = function(){ switch(config.type){ case 0: - //config.btn = ('btn' in config) ? config.btn : ready.btn[0]; ThinkGem - config.btn = ('btn' in config) ? config.btn : layer.i18n.btnOk;// ThinkGem + //config.btn = ('btn' in config) ? config.btn : ready.btn[0]; jishenghua + config.btn = ('btn' in config) ? config.btn : layer.i18n.btnOk;// jishenghua layer.closeAll('dialog'); break; case 2: @@ -286,7 +286,7 @@ Class.pt.creat = function(){ // + doms[4] +''+ times +'" name="'+ doms[4] +''+ times // +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' // + config.content[0] + '">'; - // 2017-5-13 ThinkGem 支持post方式提交iframe + // 2017-5-13 jishenghua 支持post方式提交iframe config.content = '
- - -请升级您的浏览器 - -

浏览器版本过低，是时候升级您的浏览器了

-

您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8、IE9 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。

-
-

为什么会出现这个页面？

-

如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是IE6/7/8，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请切换到极速模式下，如果还不行请升级至最新版浏览器。

-
-

请注意：微软（Microsoft）对 Windows XP 及 IE6、IE7、IE8、IE9 的支持已经结束

-

自 2014 年 4 月 8 日起，微软（Microsoft）不再为 Windows XP 和 Internet Explorer 8 及以下版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 Microsoft 关于 Windows XP 支持已经结束的说明 。

-
-

您可以选择更先进的浏览器

-

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 http://demo.jeesite.com/js 即可。

-
-

- - \ No newline at end of file + + + + 请升级您的浏览器 + + + + + + +

浏览器版本过低，是时候升级您的浏览器了

+

您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8、IE9 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。

+
+

为什么会出现这个页面？

+

如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是IE6/7/8，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请切换到极速模式下，如果还不行请升级至最新版浏览器。 +

+
+

请注意：微软（Microsoft）对 Windows XP 及 IE6、IE7、IE8、IE9 的支持已经结束

+

自 2014 年 4 月 8 日起，微软（Microsoft）不再为 Windows XP 和 Internet Explorer 8 + 及以下版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 Microsoft 关于 Windows XP 支持已经结束的说明 。 +

+
+

您可以选择更先进的浏览器

+

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 https://www.huaxiaerp.com/ 即可。 +

+
+ +
+
+
+
+ + + \ No newline at end of file diff --git a/erp_web/js/wdScrollTab/js/TabPanel.extend.js b/erp_web/js/wdScrollTab/js/TabPanel.extend.js index 432b6f70..9e2dc320 100644 --- a/erp_web/js/wdScrollTab/js/TabPanel.extend.js +++ b/erp_web/js/wdScrollTab/js/TabPanel.extend.js @@ -1,6 +1,6 @@ /*! * 首页Tab页签通用方法 - * @author ThinkGem + * @author jishenghua * @version 2017-3-26 */ (function (b) { diff --git a/erp_web/js/wdScrollTab/js/TabPanel.js b/erp_web/js/wdScrollTab/js/TabPanel.js index d9701b87..11c1d9b2 100644 --- a/erp_web/js/wdScrollTab/js/TabPanel.js +++ b/erp_web/js/wdScrollTab/js/TabPanel.js @@ -1 +1,752 @@ -TabPanel=function(a,b){this.renderTo=a.renderTo||$(document.body);this.border=a.border||"none";this.render=typeof b!="undefined"?b:typeof this.renderTo=="string"?$("#"+this.renderTo):this.renderTo;this.widthResizable=a.widthResizable;this.heightResizable=a.heightResizable;this.autoResizable=a.autoResizable?true:false;this.width=a.width||"100%";this.height=a.height||"100%";this.items=a.items;this.active=a.active||0;this.tabs=[];this.scrolled=false;this.tabWidth=a.tabWidth||-1;this.fixNum=2;this.scrollFinish=true;this.maxLength=a.maxLength||20;this.maxzindex=0;this.init()};TabPanel.prototype={init:function(){var d=this;if(this.autoResizable){this.widthResizable=this.heightResizable=true;this.render.css("overflow","hidden");$(window).resize(function(){d.resize();window.setTimeout(function(){d.resize()},200)})}if(typeof this.width=="function"){this.render.width=this.width}else{this.render.width(this.width)}if(typeof this.height=="function"){this.render.height=this.height}else{this.render.height(this.height)}var e=this.border!="none"?2:0;this.tabpanel=$("
");this.tabpanel.addClass("tabpanel");this.tabpanel.width(this.render.width()-e);this.tabpanel.height(this.render.height()-e);this.render.append(this.tabpanel);this.tabpanel_tab_content=$("
");this.tabpanel_tab_content.addClass("tabpanel_tab_content");if(this.maxLength==1){this.tabpanel_tab_content.addClass("hide")}this.tabpanel_tab_content.appendTo(this.tabpanel);this.tabpanel_left_scroll=$("
");this.tabpanel_left_scroll.bind("click",function(){d.moveLeft()});this.tabpanel_left_scroll.addClass("tabpanel_left_scroll");this.tabpanel_left_scroll.addClass("display_none");this.tabpanel_left_scroll.bind("mouseover",function(){var f=$(this);f.addClass("tabpanel_scroll_over");f.bind("mouseout",function(){f.unbind("mouseout");f.removeClass("tabpanel_scroll_over")})});this.tabpanel_left_scroll.appendTo(this.tabpanel_tab_content);this.tabpanel_right_scroll=$("
");this.tabpanel_right_scroll.bind("click",function(){d.moveRight()});this.tabpanel_right_scroll.addClass("tabpanel_right_scroll");this.tabpanel_right_scroll.addClass("display_none");this.tabpanel_right_scroll.bind("mouseover",function(){var f=$(this);f.addClass("tabpanel_scroll_over");f.bind("mouseout",function(){f.unbind("mouseout");f.removeClass("tabpanel_scroll_over")})});this.tabpanel_right_scroll.appendTo(this.tabpanel_tab_content);this.tabpanel_move_content=$("
");this.tabpanel_move_content.addClass("tabpanel_move_content");this.tabpanel_move_content.appendTo(this.tabpanel_tab_content);this.tabpanel_mover=$("");this.tabpanel_mover.addClass("tabpanel_mover");this.tabpanel_mover.appendTo(this.tabpanel_move_content);this.tabpanel_tab_spacer=$("
");this.tabpanel_tab_spacer.addClass("tabpanel_tab_spacer");this.tabpanel_tab_spacer.appendTo(this.tabpanel_tab_content);this.tabpanel_content=$("
");this.tabpanel_content.addClass("tabpanel_content");this.tabpanel_content.appendTo(this.tabpanel);var a=this.tabpanel.width();var c=this.tabpanel.height();if(this.border=="none"){this.tabpanel.css("border","none")}this.tabpanel_tab_content.width(a);this.tabpanel_content.width(a);this.tabpanel_content.height(c-this.tabpanel_tab_content.get(0).offsetHeight);this.update();for(var b=0;b=0){this.show(this.active,false)}},moveLeft:function(){if(this.scrollFinish){this.disableScroll();this.scrollFinish=false;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:this.tabWidth,maxMove:this.maxMove,onFinish:this.useableScroll}));this.run()}},moveRight:function(){if(this.scrollFinish){this.disableScroll();this.scrollFinish=false;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:this.tabWidth*-1,maxMove:this.maxMove,onFinish:this.useableScroll}));this.run()}},moveToLeft:function(){if(this.scrolled&&this.scrollFinish){this.disableScroll();this.scrollFinish=false;var a=parseInt(this.tabpanel_mover.css("marginLeft"))*-1;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:a,maxMove:this.maxMove,interval:20,step:(a/10)<10?10:a/10,onFinish:this.useableScroll}));this.run()}},moveToRight:function(){if(this.scrolled&&this.scrollFinish){this.disableScroll();this.scrollFinish=false;var d=parseInt(this.tabpanel_mover.css("marginLeft"))*-1;var c=this.tabpanel_mover.children().length*this.tabWidth;var a=this.tabpanel_move_content.width();var b=(c-a-d+this.fixNum)*-1;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:b,maxMove:this.maxMove,step:(b*-1/10)<10?10:b*-1/10,onFinish:this.useableScroll}));this.run()}},moveToSee:function(a){if(this.scrolled){var c=this.tabWidth*a;var b=parseInt(this.tabpanel_mover.css("marginLeft"));var d;if(b<=0){d=(b+c)*-1;if(((d+b)*-1)>=this.maxMove){this.moveToRight()}else{this.disableScroll();this.scrollFinish=false;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:d,maxMove:this.maxMove,step:(d/10)<10?10:d/10,onFinish:this.useableScroll}));this.run()}}else{d=(c-b)*-1;if((d*-1)>=this.maxMove){this.moveToRight()}else{this.disableScroll();this.scrollFinish=false;Fader.apply(this,new Array({element:this.tabpanel_mover,style:"marginLeft",num:d,maxMove:this.maxMove,onFinish:this.useableScroll}));this.run()}}}},disableScroll:function(){this.tabpanel_left_scroll.addClass("tabpanel_left_scroll_disabled");this.tabpanel_left_scroll.attr("disabled",true);this.tabpanel_right_scroll.addClass("tabpanel_right_scroll_disabled");this.tabpanel_right_scroll.attr("disabled",true)},useableScroll:function(){var a=this;if(this.scrolled){if(parseInt(a.tabpanel_mover.css("marginLeft"))==0){a.tabpanel_left_scroll.addClass("tabpanel_left_scroll_disabled");a.tabpanel_left_scroll.attr("disabled",true);a.tabpanel_right_scroll.removeClass("tabpanel_right_scroll_disabled");a.tabpanel_right_scroll.removeAttr("disabled")}else{if(parseInt(a.tabpanel_mover.css("marginLeft"))*-1==a.maxMove){a.tabpanel_left_scroll.removeClass("tabpanel_left_scroll_disabled");a.tabpanel_left_scroll.removeAttr("disabled",true);a.tabpanel_right_scroll.addClass("tabpanel_right_scroll_disabled");a.tabpanel_right_scroll.attr("disabled")}else{a.tabpanel_left_scroll.removeClass("tabpanel_left_scroll_disabled");a.tabpanel_left_scroll.removeAttr("disabled",true);a.tabpanel_right_scroll.removeClass("tabpanel_right_scroll_disabled");a.tabpanel_right_scroll.removeAttr("disabled")}}}a.scrollFinish=true},update:function(){var a=this.tabpanel_tab_content.width();if(this.scrolled){a-=(this.tabpanel_left_scroll.width()+this.tabpanel_right_scroll.width())}this.tabpanel_move_content.width(a);this.maxMove=(this.tabpanel_mover.children().length*this.tabWidth)-a+this.fixNum},showScroll:function(){var a=this.tabpanel_mover.children().length*this.tabWidth;var b=this.tabpanel_tab_content.width();if(a>b&&!this.scrolled){this.tabpanel_move_content.addClass("tabpanel_move_content_scroll");this.tabpanel_left_scroll.removeClass("display_none");this.tabpanel_right_scroll.removeClass("display_none");this.scrolled=true}else{if(a0){this.show(c.id,false);if(c.refresh==true){$("#"+c.id+" .refresher").click()}}else{if(this.scrollFinish){var e=this;if(this.maxLength!=-1&&this.maxLength<=this.tabs.length){for(var f=0;f");d.attr("id",c.id);d.attr("unselectable","on");d.attr("style","-moz-user-select:none;");d.attr("onselectstart","return false;");d.appendTo(this.tabpanel_mover);if(this.tabWidth==-1){this.tabWidth=d.outerWidth(true)}var j=$("
");j.html(c.title);j.appendTo(d);var g=c.closable==false?0:5;if(c.icon){j.addClass("icon_title");j.css("background-image",'url("'+c.icon+'")')}else{j.addClass("title")}var b=$("
");b.addClass("refresher");b.appendTo(d);var k=$("
");k.addClass("closer");k.attr("title",TabPanel.i18n.close);k.appendTo(d);var h=$("
");h.addClass("html_content");if(navigator.userAgent.match(/iPad|iPhone/i)){h.addClass("iframe-ios")}h.appendTo(this.tabpanel_content);var a=this.tabpanel_mover.children().index(this.tabpanel_mover.find(".active")[0]);if(a<0){a=0}if(this.tabs.length>a){c.preTabId=this.tabs[a].id}else{c.preTabId=""}c.tab=d;c.title=j;c.refresher=b;c.closer=k;c.content=h;c.disable=c.disable==undefined?false:c.disable;c.closable=c.closable==undefined?true:c.closable;if(c.closable==false){k.addClass("display_none")}if(c.disabled==true){d.attr("disabled",true);j.addClass("disabled")}this.tabs.push(c);d.bind("click",function(i){return function(){e.show(i,false)}}(this.tabs.length-1));b.bind("click",function(i){return function(){e.refresh(i)}}(this.tabs.length-1));k.bind("click",function(i){return function(){e.kill(i)}}(this.tabs.length-1));if(c.closable){d.bind("dblclick",function(i){return function(){e.kill(i)}}(this.tabs.length-1))}if(!c.lazyload){this.show(this.tabs.length-1,c.notExecuteMoveSee)}this.showScroll();this.update();if(!c.lazyload&&!c.notExecuteMoveSee){this.moveToRight()}$("#"+c.id).RightMenu(c.id+"-rightmenu",{menuList:[{menuName:TabPanel.i18n.refreshTab,menuClass:"",clickEvent:"$('#"+c.id+" .refresher').click();"},{menuName:TabPanel.i18n.closeOther,menuClass:"",clickEvent:"$('#"+c.id+"').click();$('#"+$(e.render).attr("id")+" .tabpanel_tab_content li:not(.active) .closer:not(.display_none)').click();"},{menuName:TabPanel.i18n.closeLeft,menuClass:"",clickEvent:"$('#"+c.id+"').click();$('#"+$(e.render).attr("id")+" .tabpanel_tab_content li:lt('+$('#"+$(e.render).attr("id")+" .tabpanel_tab_content li.active').index()+') .closer:not(.display_none)').click();"},{menuName:TabPanel.i18n.closeRight,menuClass:"",clickEvent:"$('#"+c.id+"').click();$('#"+$(e.render).attr("id")+" .tabpanel_tab_content li:gt('+$('#"+$(e.render).attr("id")+" .tabpanel_tab_content li.active').index()+') .closer:not(.display_none)').click();"}]})}}},getTabPosision:function(a){if(typeof a=="string"){for(var b=0;b0){for(var a=0;a0){for(var a=0;a=this.tabs.length){a=0}$(".html_content").css("visibility","hidden");this.tabs[a].content.css("visibility","visible");this.tabs[a].content.css("z-index",++this.maxzindex);if(this.tabs[a].tab.hasClass("active")){if(!b){this.moveToSee(a)}}else{if(this.tabs[a].content.html()==""){this.tabs[a].content.html(this.tabs[a].html)}this.tabpanel_mover.find(".active").removeClass("active");this.tabs[a].tab.addClass("active");if(!b){this.moveToSee(a)}}}},kill:function(a,d){var f=this;a=this.getTabPosision(a);if(typeof this.tabs[a].onPreClose=="function"){if(this.tabs[a].onPreClose(a)==false){return}}var c=this.tabs[a].preTabId;if($("#"+c).length<=0&&this.tabs[a-1]){c=this.tabs[a-1].id}this.tabs[a].closer.remove();this.tabs[a].title.remove();this.tabs[a].tab.remove();this.tabs[a].content.remove();$("#"+this.tabs[a].id+"-rightmenu").remove();this.tabs.splice(a,1);for(var e=0;ea){return this.tabs[a]}else{return null}},resize:function(){var a=this.border=="none"?0:2;if(this.widthResizable){this.width=this.render.width();this.tabpanel.width(this.width-a);this.tabpanel_tab_content.width(this.width-a);this.tabpanel_content.width(this.width-a)}if(this.heightResizable){this.height=this.render.height();this.tabpanel.height(this.height-a);this.tabpanel_content.height(this.height-this.tabpanel_tab_content.get(0).offsetHeight)}this.showScroll();this.useableScroll();this.update()},setRenderWH:function(a){if(a){if(a.width!=undefined){this.render.width(a.width)}if(a.height!=undefined){this.render.height(a.height)}this.resize()}}};TabPanel.i18n={closeTab:"关闭页签",refreshTab:"刷新页签",closeOther:"关闭其他",closeLeft:"关闭左侧",closeRight:"关闭右侧"};Fader=function(a){this.element=a.element;this.elementID=a.elementID;this.style=a.style;this.num=a.num;this.maxMove=a.maxMove;this.finishNum="string";this.interval=a.interval||10;this.step=a.step||20;this.onFinish=a.onFinish;this.isFinish=false;this.timer=null;this.method=this.num>=0;this.c=this.elementID?$("#"+this.elementID):this.element;this.run=function(){clearInterval(this.timer);this.fade();if(this.isFinish){this.onFinish&&this.onFinish()}else{var b=this;this.timer=setInterval(function(){b.run()},this.interval)}};this.fade=function(){if(this.finishNum=="string"){this.finishNum=(parseInt(this.c.css(this.style))||0)+this.num}var b=parseInt(this.c.css(this.style))||0;if(this.finishNum>b&&this.method){b+=this.step;if(b>=0){this.finishNum=b=0}}else{if(this.finishNum=this.maxMove){this.finishNum=b=this.maxMove*-1}}}if(this.finishNum<=b&&this.method||this.finishNum>=b&&!this.method){this.c.css(this.style,this.finishNum+"px");this.isFinish=true;this.finishNum="string"}else{this.c.css(this.style,b+"px")}}};Math.uuid=(function(){var a="0123456789abcdefghijklmnopqrstuvwxyz".split("");return function(c,d){var h=a,e=[],g=Math.random;d=d||h.length;if(c){for(var i=0;i
    ';for(var c=0;c'+b.menuList[c].menuName+""}d+="
";$("body").append(d);var a=$("#"+g),e;a.find("li").bind("mouseover",function(){$(this).addClass("RM_mouseover")}).bind("mouseout",function(){$(this).removeClass("RM_mouseover")}).bind("click",function(){window.clearTimeout(e);a.hide()});a.hover(function(){window.clearTimeout(e)},function(){window.clearTimeout(e);e=window.setTimeout(function(){a.hide()},500)})}return this.each(function(){this.oncontextmenu=function(){$(".div_RightMenu").hide();var n=$("body").width(),m=$("html").height(),l=$("body").height(),i=$("#"+g).width(),k=$("#"+g).height(),j=(m>l)?m:l;if(j
"); + this.tabpanel.addClass("tabpanel"); + this.tabpanel.width(this.render.width() - e); + this.tabpanel.height(this.render.height() - e); + this.render.append(this.tabpanel); + this.tabpanel_tab_content = $("
"); + this.tabpanel_tab_content.addClass("tabpanel_tab_content"); + if (this.maxLength == 1) { + this.tabpanel_tab_content.addClass("hide") + } + this.tabpanel_tab_content.appendTo(this.tabpanel); + this.tabpanel_left_scroll = $("
"); + this.tabpanel_left_scroll.bind("click", function () { + d.moveLeft() + }); + this.tabpanel_left_scroll.addClass("tabpanel_left_scroll"); + this.tabpanel_left_scroll.addClass("display_none"); + this.tabpanel_left_scroll.bind("mouseover", function () { + var f = $(this); + f.addClass("tabpanel_scroll_over"); + f.bind("mouseout", function () { + f.unbind("mouseout"); + f.removeClass("tabpanel_scroll_over") + }) + }); + this.tabpanel_left_scroll.appendTo(this.tabpanel_tab_content); + this.tabpanel_right_scroll = $("
"); + this.tabpanel_right_scroll.bind("click", function () { + d.moveRight() + }); + this.tabpanel_right_scroll.addClass("tabpanel_right_scroll"); + this.tabpanel_right_scroll.addClass("display_none"); + this.tabpanel_right_scroll.bind("mouseover", function () { + var f = $(this); + f.addClass("tabpanel_scroll_over"); + f.bind("mouseout", function () { + f.unbind("mouseout"); + f.removeClass("tabpanel_scroll_over") + }) + }); + this.tabpanel_right_scroll.appendTo(this.tabpanel_tab_content); + this.tabpanel_move_content = $("
"); + this.tabpanel_move_content.addClass("tabpanel_move_content"); + this.tabpanel_move_content.appendTo(this.tabpanel_tab_content); + this.tabpanel_mover = $("
    "); + this.tabpanel_mover.addClass("tabpanel_mover"); + this.tabpanel_mover.appendTo(this.tabpanel_move_content); + this.tabpanel_tab_spacer = $("
    "); + this.tabpanel_tab_spacer.addClass("tabpanel_tab_spacer"); + this.tabpanel_tab_spacer.appendTo(this.tabpanel_tab_content); + this.tabpanel_content = $("
    "); + this.tabpanel_content.addClass("tabpanel_content"); + this.tabpanel_content.appendTo(this.tabpanel); + var a = this.tabpanel.width(); + var c = this.tabpanel.height(); + if (this.border == "none") { + this.tabpanel.css("border", "none") + } + this.tabpanel_tab_content.width(a); + this.tabpanel_content.width(a); + this.tabpanel_content.height(c - this.tabpanel_tab_content.get(0).offsetHeight); + this.update(); + for (var b = 0; b < this.items.length; b++) { + this.items[b].notExecuteMoveSee = true; + this.addTab(this.items[b]) + } + if (this.active >= 0) { + this.show(this.active, false) + } + }, moveLeft: function () { + if (this.scrollFinish) { + this.disableScroll(); + this.scrollFinish = false; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: this.tabWidth, + maxMove: this.maxMove, + onFinish: this.useableScroll + })); + this.run() + } + }, moveRight: function () { + if (this.scrollFinish) { + this.disableScroll(); + this.scrollFinish = false; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: this.tabWidth * -1, + maxMove: this.maxMove, + onFinish: this.useableScroll + })); + this.run() + } + }, moveToLeft: function () { + if (this.scrolled && this.scrollFinish) { + this.disableScroll(); + this.scrollFinish = false; + var a = parseInt(this.tabpanel_mover.css("marginLeft")) * -1; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: a, + maxMove: this.maxMove, + interval: 20, + step: (a / 10) < 10 ? 10 : a / 10, + onFinish: this.useableScroll + })); + this.run() + } + }, moveToRight: function () { + if (this.scrolled && this.scrollFinish) { + this.disableScroll(); + this.scrollFinish = false; + var d = parseInt(this.tabpanel_mover.css("marginLeft")) * -1; + var c = this.tabpanel_mover.children().length * this.tabWidth; + var a = this.tabpanel_move_content.width(); + var b = (c - a - d + this.fixNum) * -1; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: b, + maxMove: this.maxMove, + step: (b * -1 / 10) < 10 ? 10 : b * -1 / 10, + onFinish: this.useableScroll + })); + this.run() + } + }, moveToSee: function (a) { + if (this.scrolled) { + var c = this.tabWidth * a; + var b = parseInt(this.tabpanel_mover.css("marginLeft")); + var d; + if (b <= 0) { + d = (b + c) * -1; + if (((d + b) * -1) >= this.maxMove) { + this.moveToRight() + } else { + this.disableScroll(); + this.scrollFinish = false; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: d, + maxMove: this.maxMove, + step: (d / 10) < 10 ? 10 : d / 10, + onFinish: this.useableScroll + })); + this.run() + } + } else { + d = (c - b) * -1; + if ((d * -1) >= this.maxMove) { + this.moveToRight() + } else { + this.disableScroll(); + this.scrollFinish = false; + Fader.apply(this, new Array({ + element: this.tabpanel_mover, + style: "marginLeft", + num: d, + maxMove: this.maxMove, + onFinish: this.useableScroll + })); + this.run() + } + } + } + }, disableScroll: function () { + this.tabpanel_left_scroll.addClass("tabpanel_left_scroll_disabled"); + this.tabpanel_left_scroll.attr("disabled", true); + this.tabpanel_right_scroll.addClass("tabpanel_right_scroll_disabled"); + this.tabpanel_right_scroll.attr("disabled", true) + }, useableScroll: function () { + var a = this; + if (this.scrolled) { + if (parseInt(a.tabpanel_mover.css("marginLeft")) == 0) { + a.tabpanel_left_scroll.addClass("tabpanel_left_scroll_disabled"); + a.tabpanel_left_scroll.attr("disabled", true); + a.tabpanel_right_scroll.removeClass("tabpanel_right_scroll_disabled"); + a.tabpanel_right_scroll.removeAttr("disabled") + } else { + if (parseInt(a.tabpanel_mover.css("marginLeft")) * -1 == a.maxMove) { + a.tabpanel_left_scroll.removeClass("tabpanel_left_scroll_disabled"); + a.tabpanel_left_scroll.removeAttr("disabled", true); + a.tabpanel_right_scroll.addClass("tabpanel_right_scroll_disabled"); + a.tabpanel_right_scroll.attr("disabled") + } else { + a.tabpanel_left_scroll.removeClass("tabpanel_left_scroll_disabled"); + a.tabpanel_left_scroll.removeAttr("disabled", true); + a.tabpanel_right_scroll.removeClass("tabpanel_right_scroll_disabled"); + a.tabpanel_right_scroll.removeAttr("disabled") + } + } + } + a.scrollFinish = true + }, update: function () { + var a = this.tabpanel_tab_content.width(); + if (this.scrolled) { + a -= (this.tabpanel_left_scroll.width() + this.tabpanel_right_scroll.width()) + } + this.tabpanel_move_content.width(a); + this.maxMove = (this.tabpanel_mover.children().length * this.tabWidth) - a + this.fixNum + }, showScroll: function () { + var a = this.tabpanel_mover.children().length * this.tabWidth; + var b = this.tabpanel_tab_content.width(); + if (a > b && !this.scrolled) { + this.tabpanel_move_content.addClass("tabpanel_move_content_scroll"); + this.tabpanel_left_scroll.removeClass("display_none"); + this.tabpanel_right_scroll.removeClass("display_none"); + this.scrolled = true + } else { + if (a < b && this.scrolled) { + this.moveToLeft(); + this.tabpanel_move_content.removeClass("tabpanel_move_content_scroll"); + this.tabpanel_left_scroll.addClass("display_none"); + this.tabpanel_right_scroll.addClass("display_none"); + this.scrolled = false; + this.scrollFinish = true + } + } + }, addTab: function (c) { + c.id = c.id || Math.uuid(); + if ($("#" + c.id).length > 0) { + this.show(c.id, false); + if (c.refresh == true) { + $("#" + c.id + " .refresher").click() + } + } else { + if (this.scrollFinish) { + var e = this; + if (this.maxLength != -1 && this.maxLength <= this.tabs.length) { + for (var f = 0; f < this.tabs.length; f++) { + if (this.tabs[f].closable) { + e.kill(f, true); + break + } + } + } + var d = $("
  • "); + d.attr("id", c.id); + d.attr("unselectable", "on"); + d.attr("style", "-moz-user-select:none;"); + d.attr("onselectstart", "return false;"); + d.appendTo(this.tabpanel_mover); + if (this.tabWidth == -1) { + this.tabWidth = d.outerWidth(true) + } + var j = $("
    "); + j.html(c.title); + j.appendTo(d); + var g = c.closable == false ? 0 : 5; + if (c.icon) { + j.addClass("icon_title"); + j.css("background-image", 'url("' + c.icon + '")') + } else { + j.addClass("title") + } + var b = $("
    "); + b.addClass("refresher"); + b.appendTo(d); + var k = $("
    "); + k.addClass("closer"); + k.attr("title", TabPanel.i18n.close); + k.appendTo(d); + var h = $("
    "); + h.addClass("html_content"); + if (navigator.userAgent.match(/iPad|iPhone/i)) { + h.addClass("iframe-ios") + } + h.appendTo(this.tabpanel_content); + var a = this.tabpanel_mover.children().index(this.tabpanel_mover.find(".active")[0]); + if (a < 0) { + a = 0 + } + if (this.tabs.length > a) { + c.preTabId = this.tabs[a].id + } else { + c.preTabId = "" + } + c.tab = d; + c.title = j; + c.refresher = b; + c.closer = k; + c.content = h; + c.disable = c.disable == undefined ? false : c.disable; + c.closable = c.closable == undefined ? true : c.closable; + if (c.closable == false) { + k.addClass("display_none") + } + if (c.disabled == true) { + d.attr("disabled", true); + j.addClass("disabled") + } + this.tabs.push(c); + d.bind("click", function (i) { + return function () { + e.show(i, false) + } + }(this.tabs.length - 1)); + b.bind("click", function (i) { + return function () { + e.refresh(i) + } + }(this.tabs.length - 1)); + k.bind("click", function (i) { + return function () { + e.kill(i) + } + }(this.tabs.length - 1)); + if (c.closable) { + d.bind("dblclick", function (i) { + return function () { + e.kill(i) + } + }(this.tabs.length - 1)) + } + if (!c.lazyload) { + this.show(this.tabs.length - 1, c.notExecuteMoveSee) + } + this.showScroll(); + this.update(); + if (!c.lazyload && !c.notExecuteMoveSee) { + this.moveToRight() + } + $("#" + c.id).RightMenu(c.id + "-rightmenu", { + menuList: [{ + menuName: TabPanel.i18n.refreshTab, + menuClass: "", + clickEvent: "$('#" + c.id + " .refresher').click();" + }, { + menuName: TabPanel.i18n.closeOther, + menuClass: "", + clickEvent: "$('#" + c.id + "').click();$('#" + $(e.render).attr("id") + " .tabpanel_tab_content li:not(.active) .closer:not(.display_none)').click();" + }, { + menuName: TabPanel.i18n.closeLeft, + menuClass: "", + clickEvent: "$('#" + c.id + "').click();$('#" + $(e.render).attr("id") + " .tabpanel_tab_content li:lt('+$('#" + $(e.render).attr("id") + " .tabpanel_tab_content li.active').index()+') .closer:not(.display_none)').click();" + }, { + menuName: TabPanel.i18n.closeRight, + menuClass: "", + clickEvent: "$('#" + c.id + "').click();$('#" + $(e.render).attr("id") + " .tabpanel_tab_content li:gt('+$('#" + $(e.render).attr("id") + " .tabpanel_tab_content li.active').index()+') .closer:not(.display_none)').click();" + }] + }) + } + } + }, getTabPosision: function (a) { + if (typeof a == "string") { + for (var b = 0; b < this.tabs.length; b++) { + if (a == this.tabs[b].id) { + a = b; + break + } + } + } + return a + }, refresh: function (a) { + a = this.getTabPosision(a); + if (typeof a == "string") { + return false + } else { + this.tabs[a].tab.removeClass("active"); + this.tabs[a].content.html(""); + this.show(a) + } + }, iterateFlush: function (c) { + if (c.window.frames.length > 0) { + for (var a = 0; a < c.window.frames.length; a++) { + this.iterateFlush(c.window.frames[a]) + } + } else { + if (c.document.forms.length > 0) { + for (var a = 0; a < c.document.forms.length; a++) { + try { + c.document.forms[a].submit() + } catch (b) { + c.location.reload() + } + } + } else { + c.location.reload() + } + } + }, show: function (a, b) { + if (this.tabs.length < 1) { + return false + } + a = this.getTabPosision(a); + if (typeof a == "string") { + a = 0 + } + if (this.scrollFinish) { + if (a >= this.tabs.length) { + a = 0 + } + $(".html_content").css("visibility", "hidden"); + this.tabs[a].content.css("visibility", "visible"); + this.tabs[a].content.css("z-index", ++this.maxzindex); + if (this.tabs[a].tab.hasClass("active")) { + if (!b) { + this.moveToSee(a) + } + } else { + if (this.tabs[a].content.html() == "") { + this.tabs[a].content.html(this.tabs[a].html) + } + this.tabpanel_mover.find(".active").removeClass("active"); + this.tabs[a].tab.addClass("active"); + if (!b) { + this.moveToSee(a) + } + } + } + }, kill: function (a, d) { + var f = this; + a = this.getTabPosision(a); + if (typeof this.tabs[a].onPreClose == "function") { + if (this.tabs[a].onPreClose(a) == false) { + return + } + } + var c = this.tabs[a].preTabId; + if ($("#" + c).length <= 0 && this.tabs[a - 1]) { + c = this.tabs[a - 1].id + } + this.tabs[a].closer.remove(); + this.tabs[a].title.remove(); + this.tabs[a].tab.remove(); + this.tabs[a].content.remove(); + $("#" + this.tabs[a].id + "-rightmenu").remove(); + this.tabs.splice(a, 1); + for (var e = 0; e < this.tabs.length; e++) { + this.tabs[e].tab.unbind("click"); + this.tabs[e].tab.bind("click", function (g) { + return function () { + f.show(g, false) + } + }(e)); + this.tabs[e].refresher.unbind("click"); + this.tabs[e].refresher.bind("click", function (g) { + return function () { + f.refresh(g) + } + }(e)); + this.tabs[e].closer.unbind("click"); + this.tabs[e].closer.bind("click", function (g) { + return function () { + f.kill(g) + } + }(e)); + if (this.tabs[e].closable) { + this.tabs[e].tab.unbind("dblclick"); + this.tabs[e].tab.bind("dblclick", function (g) { + return function () { + f.kill(g) + } + }(e)) + } + } + if (d != true) { + var b = this; + setTimeout(function () { + b.update(); + b.showScroll(); + b.show(c, false) + }, 500) + } + }, getTabsCount: function () { + return this.tabs.length + }, setTitle: function (a, b) { + a = this.getTabPosision(a); + if (a < this.tabs.length) { + this.tabs[a].title.text(b) + } + }, getTitle: function (a) { + a = this.getTabPosision(a); + return this.tabs[a].title.text() + }, setContent: function (a, b) { + a = this.getTabPosision(a); + if (a < this.tabs.length) { + this.tabs[a].content.html(b) + } + }, getContent: function (a) { + a = this.getTabPosision(a); + return this.tabs[a].content.html() + }, setDisable: function (a, b) { + a = this.getTabPosision(a); + if (a < this.tabs.length) { + this.tabs[a].disable = b; + if (b) { + this.tabs[a].tab.attr("disabled", true); + this.tabs[a].title.addClass("disabled") + } else { + this.tabs[a].tab.removeAttr("disabled"); + this.tabs[a].title.removeClass("disabled") + } + } + }, getDisable: function (a) { + a = this.getTabPosision(a); + return this.tabs[a].disable + }, setClosable: function (a, b) { + a = this.getTabPosision(a); + if (a < this.tabs.length) { + this.tabs[a].closable = b; + if (b) { + this.tabs[a].closer.addClass("display_none") + } else { + this.tabs[a].closer.addClass("closer"); + this.tabs[a].closer.removeClass("display_none") + } + } + }, getClosable: function (a) { + a = this.getTabPosision(a); + return this.tabs[a].closable + }, getActiveIndex: function () { + return this.tabpanel_mover.children().index(this.tabpanel_mover.find(".active")[0]) + }, getActiveTab: function () { + var a = this.tabpanel_mover.children().index(this.tabpanel_mover.find(".active")[0]); + if (this.tabs.length > a) { + return this.tabs[a] + } else { + return null + } + }, resize: function () { + var a = this.border == "none" ? 0 : 2; + if (this.widthResizable) { + this.width = this.render.width(); + this.tabpanel.width(this.width - a); + this.tabpanel_tab_content.width(this.width - a); + this.tabpanel_content.width(this.width - a) + } + if (this.heightResizable) { + this.height = this.render.height(); + this.tabpanel.height(this.height - a); + this.tabpanel_content.height(this.height - this.tabpanel_tab_content.get(0).offsetHeight) + } + this.showScroll(); + this.useableScroll(); + this.update() + }, setRenderWH: function (a) { + if (a) { + if (a.width != undefined) { + this.render.width(a.width) + } + if (a.height != undefined) { + this.render.height(a.height) + } + this.resize() + } + } +}; +TabPanel.i18n = {closeTab: "关闭页签", refreshTab: "刷新页签", closeOther: "关闭其他", closeLeft: "关闭左侧", closeRight: "关闭右侧"}; +Fader = function (a) { + this.element = a.element; + this.elementID = a.elementID; + this.style = a.style; + this.num = a.num; + this.maxMove = a.maxMove; + this.finishNum = "string"; + this.interval = a.interval || 10; + this.step = a.step || 20; + this.onFinish = a.onFinish; + this.isFinish = false; + this.timer = null; + this.method = this.num >= 0; + this.c = this.elementID ? $("#" + this.elementID) : this.element; + this.run = function () { + clearInterval(this.timer); + this.fade(); + if (this.isFinish) { + this.onFinish && this.onFinish() + } else { + var b = this; + this.timer = setInterval(function () { + b.run() + }, this.interval) + } + }; + this.fade = function () { + if (this.finishNum == "string") { + this.finishNum = (parseInt(this.c.css(this.style)) || 0) + this.num + } + var b = parseInt(this.c.css(this.style)) || 0; + if (this.finishNum > b && this.method) { + b += this.step; + if (b >= 0) { + this.finishNum = b = 0 + } + } else { + if (this.finishNum < b && !this.method) { + b -= this.step; + if (b * -1 >= this.maxMove) { + this.finishNum = b = this.maxMove * -1 + } + } + } + if (this.finishNum <= b && this.method || this.finishNum >= b && !this.method) { + this.c.css(this.style, this.finishNum + "px"); + this.isFinish = true; + this.finishNum = "string" + } else { + this.c.css(this.style, b + "px") + } + } +}; +Math.uuid = (function () { + var a = "0123456789abcdefghijklmnopqrstuvwxyz".split(""); + return function (c, d) { + var h = a, e = [], g = Math.random; + d = d || h.length; + if (c) { + for (var i = 0; i < c; i++) { + e[i] = h[0 | g() * d] + } + } else { + var b = 0, f; + e[8] = e[13] = e[18] = e[23] = "-"; + e[14] = "4"; + for (i = 0; i < 36; i++) { + if (!e[i]) { + f = 0 | g() * 16; + e[i] = h[(i == 19) ? (f & 3) | 8 : f & 15] + } + } + } + return e.join("").replace(/-/ig, "").substring(0, 10) + } +})(); +$.fn.tabPanel = function (b, f, h, g, e, d) { + var c; + var a = this.each(function () { + var k = $(this); + var j = k.data("tabPanel"); + var i = typeof b === "object" && b; + if (!j) { + k.data("tabPanel", (j = new TabPanel(i, k))) + } + if (typeof b === "string" && typeof j[b] === "function") { + if (f instanceof Array) { + c = j[b].apply(j, f, h, g, e, d) + } else { + c = j[b](f, h, g, e, d) + } + } + }); + return (c === undefined) ? a : c +}; +var pos_mx = 0, pos_my = 0; +$(function () { + document.oncontextmenu = function () { + return false + }; + document.onmousemove = function (b) { + ev = b || window.event; + var a; + if (ev.pageX || ev.pageY) { + a = {x: ev.pageX, y: ev.pageY} + } else { + a = {x: ev.clientX, y: ev.clientY + $(document).scrollTop()} + } + pos_mx = a.x; + pos_my = a.y + } +}); +$.fn.RightMenu = function (g, b) { + b = $.extend({menuList: []}, b); + var f = b.menuList.length; + if (!$("#" + g)[0]) { + var d = '
      '; + for (var c = 0; c < f; c++) { + d += '
    • ' + b.menuList[c].menuName + "
      • " + } + d += "
    "; + $("body").append(d); + var a = $("#" + g), e; + a.find("li").bind("mouseover", function () { + $(this).addClass("RM_mouseover") + }).bind("mouseout", function () { + $(this).removeClass("RM_mouseover") + }).bind("click", function () { + window.clearTimeout(e); + a.hide() + }); + a.hover(function () { + window.clearTimeout(e) + }, function () { + window.clearTimeout(e); + e = window.setTimeout(function () { + a.hide() + }, 500) + }) + } + return this.each(function () { + this.oncontextmenu = function () { + $(".div_RightMenu").hide(); + var n = $("body").width(), m = $("html").height(), l = $("body").height(), i = $("#" + g).width(), + k = $("#" + g).height(), j = (m > l) ? m : l; + if (j < k + pos_my) { + pos_my = j - k + } + if (n < i + pos_mx) { + pos_mx = n - i + } + $("#" + g).hide().css({top: pos_my, left: pos_mx}).show() + } + }) +}; \ No newline at end of file diff --git a/erp_web/pages/financial/advance_in.html b/erp_web/pages/financial/advance_in.html index 6ff0ef3d..05e97781 100644 --- a/erp_web/pages/financial/advance_in.html +++ b/erp_web/pages/financial/advance_in.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/financial/giro.html b/erp_web/pages/financial/giro.html index 6a8ac837..8a134d84 100644 --- a/erp_web/pages/financial/giro.html +++ b/erp_web/pages/financial/giro.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/financial/item_in.html b/erp_web/pages/financial/item_in.html index 7fd17163..bf9f4522 100644 --- a/erp_web/pages/financial/item_in.html +++ b/erp_web/pages/financial/item_in.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/financial/item_out.html b/erp_web/pages/financial/item_out.html index 2f925f90..ae433360 100644 --- a/erp_web/pages/financial/item_out.html +++ b/erp_web/pages/financial/item_out.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/financial/money_in.html b/erp_web/pages/financial/money_in.html index 34937410..1a484101 100644 --- a/erp_web/pages/financial/money_in.html +++ b/erp_web/pages/financial/money_in.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/financial/money_out.html b/erp_web/pages/financial/money_out.html index f822f145..d5760891 100644 --- a/erp_web/pages/financial/money_out.html +++ b/erp_web/pages/financial/money_out.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html index 92ce970e..c600be36 100644 --- a/erp_web/pages/manage/account.html +++ b/erp_web/pages/manage/account.html @@ -16,9 +16,8 @@ - -
    + +
    @@ -46,11 +45,6 @@
    名    称：
    -
    - - -
    - -
    + +
    @@ -42,11 +41,6 @@
    名称：
    -
    - - -
    @@ -221,6 +215,7 @@ return; } }); + dgResize(); showAppDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html index 4448e41b..870332c1 100644 --- a/erp_web/pages/manage/customer.html +++ b/erp_web/pages/manage/customer.html @@ -16,9 +16,8 @@ - -
    + +
    @@ -47,11 +46,6 @@
    名    称：
    -
    - - -
    - -
    + +
    @@ -36,11 +35,6 @@
    仓库名称：
    -
    - - -
    @@ -227,6 +221,7 @@ return; } }); + dgResize(); showDepotDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html index d0592cbe..23a5b007 100644 --- a/erp_web/pages/manage/functions.html +++ b/erp_web/pages/manage/functions.html @@ -15,9 +15,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    名称：
    -
    - - -
    @@ -206,6 +200,7 @@ return; } }); + dgResize(); showFunctionsDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html index ce2b1bbe..87c1e9ba 100644 --- a/erp_web/pages/manage/inOutItem.html +++ b/erp_web/pages/manage/inOutItem.html @@ -16,9 +16,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    名    称：
    -
    - - -
    - -
    + +
    @@ -74,11 +73,6 @@
    操作模块： 
    -
    - - -
    - -
    + +
    @@ -47,11 +46,6 @@
    名    称：
    -
    - - -
    -
    +
    diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html index e2a933f3..3eb5629f 100644 --- a/erp_web/pages/manage/role.html +++ b/erp_web/pages/manage/role.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -39,11 +38,6 @@
    角色名称：
    -
    - - -
    @@ -155,6 +149,7 @@ return; } }); + dgResize(); showRoleDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index ac6aed20..b5f0c249 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -38,11 +37,6 @@
    商品名称：
    -
    - - -
    @@ -268,6 +262,7 @@ return; } }); + dgResize(); showSerialNumberDetails(1, initPageSize); } //分页信息处理 diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html index 505590c6..d20b21bd 100644 --- a/erp_web/pages/manage/systemConfig.html +++ b/erp_web/pages/manage/systemConfig.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -31,14 +30,9 @@ +
    公司名称：  查询   -
    -
    - - -
    @@ -173,6 +167,7 @@ return; } }); + dgResize(); showSystemConfigDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/unit.html b/erp_web/pages/manage/unit.html index c36b433a..7e726a83 100644 --- a/erp_web/pages/manage/unit.html +++ b/erp_web/pages/manage/unit.html @@ -15,9 +15,8 @@ - -
    + +
    @@ -31,11 +30,6 @@
    计量单位：
    -
    - - -
    @@ -149,6 +143,7 @@ return; } }); + dgResize(); showUnitDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html index bfa5c097..217d2ce0 100644 --- a/erp_web/pages/manage/user.html +++ b/erp_web/pages/manage/user.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -45,11 +44,6 @@
    登录名称：
    -
    - - -
    @@ -232,6 +226,7 @@ return; } }); + dgResize(); showUserDetails(1, initPageSize); } diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html index 33937461..a4dc328b 100644 --- a/erp_web/pages/manage/vendor.html +++ b/erp_web/pages/manage/vendor.html @@ -16,9 +16,8 @@ - -
    + +
    @@ -47,11 +46,6 @@
    名    称：
    -
    - - -
    - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html index 50279e15..8c04ddad 100644 --- a/erp_web/pages/materials/assemble_list.html +++ b/erp_web/pages/materials/assemble_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html index 9698fe2f..a338f472 100644 --- a/erp_web/pages/materials/disassemble_list.html +++ b/erp_web/pages/materials/disassemble_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html index 17b7ad80..816b1726 100644 --- a/erp_web/pages/materials/material.html +++ b/erp_web/pages/materials/material.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -46,11 +45,6 @@
    类别：
    -
    - - -
    @@ -644,6 +638,7 @@ return; } }); + dgResize(); showMaterialDetails(1, initPageSize); } diff --git a/erp_web/pages/materials/materialProperty.html b/erp_web/pages/materials/materialProperty.html index 822bd89b..e2225ac7 100644 --- a/erp_web/pages/materials/materialProperty.html +++ b/erp_web/pages/materials/materialProperty.html @@ -15,9 +15,8 @@ - -
    + +
    @@ -31,11 +30,6 @@
    名称：
    -
    - - -
    @@ -143,6 +137,7 @@ return; } }); + dgResize(); showMaterialPropertyDetails(1, initPageSize); } diff --git a/erp_web/pages/materials/material_forselect.html b/erp_web/pages/materials/material_forselect.html index 56f58fbc..2535e1c6 100644 --- a/erp_web/pages/materials/material_forselect.html +++ b/erp_web/pages/materials/material_forselect.html @@ -17,9 +17,9 @@ - -
    + +
    @@ -38,11 +38,6 @@
    品名：
    -
    - - -
    @@ -118,6 +113,7 @@ $("#forSelectMaterialDlg").dialog('close'); } }); + dgResize(); showMaterialDetails(1, initPageSize); } diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html index 6f8bca4d..f246f6f3 100644 --- a/erp_web/pages/materials/other_in_list.html +++ b/erp_web/pages/materials/other_in_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html index 0ec3bdc0..132b0f4a 100644 --- a/erp_web/pages/materials/other_out_list.html +++ b/erp_web/pages/materials/other_out_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/person.html b/erp_web/pages/materials/person.html index f0025ab9..da0b4515 100644 --- a/erp_web/pages/materials/person.html +++ b/erp_web/pages/materials/person.html @@ -15,9 +15,8 @@ - -
    + +
    @@ -42,11 +41,6 @@
    姓名：
    -
    - - -
    @@ -159,6 +153,7 @@ return; } }); + dgResize(); showPersonDetails(1, initPageSize); } diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html index c65719bf..d7074476 100644 --- a/erp_web/pages/materials/purchase_back_list.html +++ b/erp_web/pages/materials/purchase_back_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html index 204efe7a..b777b6b6 100644 --- a/erp_web/pages/materials/purchase_in_list.html +++ b/erp_web/pages/materials/purchase_in_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html index b32081dd..235335cc 100644 --- a/erp_web/pages/materials/purchase_orders_list.html +++ b/erp_web/pages/materials/purchase_orders_list.html @@ -16,13 +16,13 @@ + - -
    + +
    @@ -50,11 +50,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html index eddc1676..ce6286f0 100644 --- a/erp_web/pages/materials/retail_back_list.html +++ b/erp_web/pages/materials/retail_back_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html index e8f8fe1e..8cb5c40a 100644 --- a/erp_web/pages/materials/retail_out_list.html +++ b/erp_web/pages/materials/retail_out_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html index 7b9e92c2..0f83aea4 100644 --- a/erp_web/pages/materials/sale_back_list.html +++ b/erp_web/pages/materials/sale_back_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html index 4c9ad3fb..16c3b817 100644 --- a/erp_web/pages/materials/sale_orders_list.html +++ b/erp_web/pages/materials/sale_orders_list.html @@ -16,13 +16,13 @@ + - -
    + +
    @@ -50,11 +50,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html index bb681810..c8e5a872 100644 --- a/erp_web/pages/materials/sale_out_list.html +++ b/erp_web/pages/materials/sale_out_list.html @@ -20,9 +20,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    单据编号：
    -
    - - -
    diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html index 481d8692..796ab693 100644 --- a/erp_web/pages/reports/account_report.html +++ b/erp_web/pages/reports/account_report.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -45,11 +44,6 @@
    名称：
    -
    - - -
    @@ -111,6 +105,7 @@ return; } }); + dgResize(); showAccountDetails(1, initPageSize); } diff --git a/erp_web/pages/reports/buy_in_report.html b/erp_web/pages/reports/buy_in_report.html index b55b08f7..dd84919a 100644 --- a/erp_web/pages/reports/buy_in_report.html +++ b/erp_web/pages/reports/buy_in_report.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -36,11 +35,6 @@
    月份：
    -
    - - -
    @@ -131,6 +125,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/customer_account.html b/erp_web/pages/reports/customer_account.html index 83f9868b..a3a5b98f 100644 --- a/erp_web/pages/reports/customer_account.html +++ b/erp_web/pages/reports/customer_account.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -51,11 +50,6 @@
    客户：
    -
    - - -
    @@ -124,6 +118,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index ebcb5fcd..16c9ed81 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -51,11 +50,6 @@
    供应商：
    -
    - - -
    @@ -213,6 +207,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 2529e282..af963e68 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    供应商：
    -
    - - -
    @@ -202,6 +196,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html index 8ac4ba3d..97b1da3b 100644 --- a/erp_web/pages/reports/in_out_stock_report.html +++ b/erp_web/pages/reports/in_out_stock_report.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -43,11 +42,6 @@
    仓库：
    -
    - - -
    @@ -231,6 +225,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 4bb1de4e..fadba6dc 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -51,11 +50,6 @@
    客户：
    -
    - - -
    @@ -213,6 +207,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index 7fc61c1c..7005c76e 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -50,11 +49,6 @@
    客户：
    -
    - - -
    @@ -202,6 +196,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/sale_out_report.html b/erp_web/pages/reports/sale_out_report.html index 1dca9ab7..65a13402 100644 --- a/erp_web/pages/reports/sale_out_report.html +++ b/erp_web/pages/reports/sale_out_report.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -37,11 +36,6 @@
    月份：当前销售总额：0  注：此处包含零售+批发销售
    -
    - - -
    @@ -135,6 +129,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/stock_warning_report.html b/erp_web/pages/reports/stock_warning_report.html index d6cce0dd..0cad3a5b 100644 --- a/erp_web/pages/reports/stock_warning_report.html +++ b/erp_web/pages/reports/stock_warning_report.html @@ -17,9 +17,8 @@ - -
    + +
    @@ -38,11 +37,6 @@
    仓库：
    -
    - - -
    @@ -224,6 +218,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html index d944caa7..e2f6061a 100644 --- a/erp_web/pages/reports/vendor_account.html +++ b/erp_web/pages/reports/vendor_account.html @@ -18,9 +18,8 @@ - -
    + +
    @@ -51,11 +50,6 @@
    供应商：
    -
    - - -
    @@ -123,6 +117,7 @@ return; } }); + dgResize(); } //初始化键盘enter事件 diff --git a/erp_web/register.html b/erp_web/register.html index 92a8658a..65cf02ea 100644 --- a/erp_web/register.html +++ b/erp_web/register.html @@ -4,9 +4,7 @@ - - diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index a3026661..e5365893 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -14,6 +14,7 @@ import com.jsh.erp.service.log.LogService; import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.ErpInfo; import com.jsh.erp.utils.StringUtil; +import com.jsh.erp.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -30,6 +31,7 @@ import java.util.List; import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.Tools.getNow3; /** * @author ji-sheng-hua 752*718*920 @@ -457,4 +459,39 @@ public class DepotHeadController { depotHeadService.batchDeleteDepotHeadAndDetail(ids); return result; } + + /** + * 统计今日销售额、本月销售额、本月进货额 + * @param request + * @return + */ + @GetMapping(value = "/getBuyAndSaleStatistics") + public BaseResponseInfo getBuyAndSaleStatistics(HttpServletRequest request) { + BaseResponseInfo res = new BaseResponseInfo(); + Map map = new HashMap(); + try { + String today = Tools.getNow() + " 00:00:00"; + String firstDay = Tools.getCurrentMonth() + "-01 00:00:00"; + BigDecimal todaySale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + 1, today, getNow3()); //今日销售出库 + BigDecimal todayRetailSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + 0, today, getNow3()); //今日零售出库 + BigDecimal monthSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + 1,firstDay, getNow3()); //本月销售出库 + BigDecimal monthRetailSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + 0,firstDay, getNow3()); //本月零售出库 + BigDecimal monthBuy = depotHeadService.getBuyAndSaleStatistics("入库", "采购", + 1, firstDay, getNow3()); //本月采购入库 + map.put("todaySale", todaySale.add(todayRetailSale)); + map.put("thisMonthSale", monthSale.add(monthRetailSale)); + map.put("thisMonthBuy", monthBuy); + res.code = 200; + res.data = map; + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; + } + return res; + } } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 10b5e348..7db0e036 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -126,4 +126,11 @@ public interface DepotHeadMapperEx { List getDepotHeadListByHandsPersonIds(@Param("handsPersonIds") String[] handsPersonIds); List getDepotHeadListByDepotIds(@Param("depotIds") String[] depotIds); + + BigDecimal getBuyAndSaleStatistics( + @Param("type") String type, + @Param("subType") String subType, + @Param("hasSupplier") Integer hasSupplier, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime); } diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index d4e99b22..2ba3d90e 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -631,4 +631,8 @@ public class DepotHeadService { } return result; } + + public BigDecimal getBuyAndSaleStatistics(String type, String subType, Integer hasSupplier, String beginTime, String endTime) { + return depotHeadMapperEx.getBuyAndSaleStatistics(type, subType, hasSupplier, beginTime, endTime); + } } diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 47056c19..c5f5bf5b 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -510,4 +510,29 @@ and ifnull(delete_Flag,'0') !='1' + \ No newline at end of file