purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据显示，自适应

Browse Source
This commit is contained in:
季圣华
2019-09-14 10:43:17 +08:00
parent 9247e77398
commit edc5404dae
83 changed files with 1151 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erp_web/css/common.css
View File

@@ -23,6 +23,11 @@
padding-left: 20px;
}
#tablePanel #searchTable {
height: 40px;
padding: 5px;
}
.system-config {
padding: 5px;
font-size: 13px;

6
erp_web/css/jsherp.css
View File

@@ -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

6
erp_web/home.html
View File

@@ -33,7 +33,7 @@
<span class="info-box-icon bg-aqua"><i class="fa fa-shopping-bag"></i></span>
<div class="info-box-content">
<span class="info-box-text">今日累计销售</span>
<span id="todaySale" class="info-box-number">90元</span>
<span id="todaySale" class="info-box-number">0元</span>
</div>
</div>
</div>
@@ -42,7 +42,7 @@
<span class="info-box-icon bg-red"><i class="fa fa-shopping-cart"></i></span>
<div class="info-box-content">
<span class="info-box-text">本月累计销售</span>
<span id="thisMonthSale" class="info-box-number">410元</span>
<span id="thisMonthSale" class="info-box-number">0元</span>
</div>
</div>
</div>
@@ -52,7 +52,7 @@
<span class="info-box-icon bg-green"><i class="fa fa-shopping-basket"></i></span>
<div class="info-box-content">
<span class="info-box-text">本月累计进货</span>
<span id="thisMonthBuy" class="info-box-number">760元</span>
<span id="thisMonthBuy" class="info-box-number">0元</span>
</div>
</div>
</div>

3
erp_web/js/adminlte/css/skins/skin-blue-light2.css
View File

@@ -1,6 +1,3 @@
/*
* http://jeesite.com
*/
.main-header .navbar {
background-color: #1890ff;
}

3
erp_web/js/common/common.js
View File

@@ -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 () {

2
erp_web/js/common/des.js
View File

@@ -7,7 +7,7 @@
* $('#inputForm').submit(function(){
* $('#password').val(DesUtils.encode($('#password').val(), '1,2,3'));
* });
* @author ThinkGem
* @author jishenghua
*/
(function() {

9
erp_web/js/common/i18n/jsherp_zh_CN.js
View File

@@ -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 || {};

8
erp_web/js/common/jsherp.js
View File

@@ -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() {

2
erp_web/js/icheck/1.0/icheck.js
View File

@@ -80,7 +80,7 @@
disabledClass: _disabled,
indeterminateClass: _indeterminate,
// ThinkGem add default style.
// jishenghua add default style.
checkboxClass: 'icheckbox_minimal-grey',
radioClass: 'iradio_minimal-grey',

4
erp_web/js/jquery-plugins/jquery.inputmask.js
View File

@@ -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: ",",

2
erp_web/js/jquery-plugins/jquery.slimscroll.js
View File

@@ -460,7 +460,7 @@
}
}
hideBar(); // ThinkGem 初始化完成滚动条自动隐藏
hideBar(); // jishenghua 初始化完成滚动条自动隐藏
});

4
erp_web/js/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
View File

@@ -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){

2
erp_web/js/jquery/jquery-1.12.4.js vendored
View File

@@ -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;
}

26
erp_web/js/layer/3.1/layer.js
View File

@@ -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||''))
+ '</div>'
+ '<span class="layui-layer-setwin">'+ function(){
var closebtn = ismax && config.title ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a>' : ''; // ThinkGem 必须有标题的清空下才能最小化
var closebtn = ismax && config.title ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a>' : ''; // jishenghua 必须有标题的清空下才能最小化
closebtn += ismax ? '<a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
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] + '"></iframe>';
// 2017-5-13 ThinkGem 支持post方式提交iframe
// 2017-5-13 jishenghua 支持post方式提交iframe
config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'
+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times
+ '" onload="this.className=\'\';" class="layui-layer-load" frameborder="0"></iframe><form id="'
@@ -327,9 +327,9 @@ Class.pt.creat = function(){
config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
}).auto(times);
//config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]); // ThinkGem 不需要ie6
//config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]); // jishenghua 不需要ie6
// 2017-5-13 ThinkGem 支持post方式提交iframe
// 2017-5-13 jishenghua 支持post方式提交iframe
if (config.type == 2){
var form = that.layero.find('#' + doms[4] + '-form' + times), formData = config.contentFormData;
for(var key in formData || {}){
@@ -454,7 +454,7 @@ Class.pt.offset = function(){
that.offsetLeft = layero.css('left');
}
that.offsetTop = that.offsetTop>0?that.offsetTop:0; // 2017-5-8 ThinkGem Top值不小于0
that.offsetTop = that.offsetTop>0?that.offsetTop:0; // 2017-5-8 jishenghua Top值不小于0
layero.css({top: that.offsetTop, left: that.offsetLeft});
};
@@ -639,10 +639,10 @@ Class.pt.callback = function(){
if(index === 0){
if(config.yes){
var close = config.yes(that.index, layero);
close === false || layer.close(that.index); // 2017-3-31 ThinkGem 添加返回值如果是false则关闭窗口
close === false || layer.close(that.index); // 2017-3-31 jishenghua 添加返回值如果是false则关闭窗口
} else if(config['btn1']){
var close = config['btn1'](that.index, layero);
close === false || layer.close(that.index); // 2017-3-31 ThinkGem 添加返回值如果是false则关闭窗口
close === false || layer.close(that.index); // 2017-3-31 jishenghua 添加返回值如果是false则关闭窗口
} else {
layer.close(that.index);
}
@@ -755,7 +755,7 @@ ready.rescollbar = function(index){
window.layer = layer;
//获取当前对话框所在窗口的jQuery对象和Window对象 ThinkGem
//获取当前对话框所在窗口的jQuery对象和Window对象 jishenghua
layer.$ = layer.jQuery = jQuery;
layer.window = window;
@@ -786,7 +786,7 @@ layer.iframeSrc = function(index, url){
$('#'+ doms[0] + index).find('iframe').attr('src', url);
};
//返回当前layer的iframe对象的window对象 ThinkGem
//返回当前layer的iframe对象的window对象 jishenghua
layer.iframeWindow = function(index){
var ifr = $('#'+ doms[0] + index).find('iframe');
if (ifr.length > 0){

2
erp_web/js/layer/3.1/skin/default/layer.css
View File

@@ -180,7 +180,7 @@ html #layuicss-skinlayercss{display: none; position: absolute; width: 1989px;}
.layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
}
/* ThinkGem */
/* jishenghua */
.layui-layer-title {font-weight:bold;font-size:15px;background:#fff;height:45px;line-height:45px;}
.layui-layer-page .layui-layer-content {overflow-x:hidden;}
.layui-layer-page .layui-layer-content .form-file{padding-top:4px;}

2
erp_web/js/modules/msg/topMenuMsg.js
View File

@@ -1,6 +1,6 @@
/*!
* 消息推送实现
* @author ThinkGem
* @author jishenghua
*/
$(function () {
unreadMsg()

6
erp_web/js/modules/sys/sysIndex.css
View File

@@ -1,7 +1,7 @@
/*!
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* @author ThinkGem
* @version 2019-2-16
* Copyright (c) 2013-Now 华夏erp All rights reserved.
* @author jishenghua
* @version 2019-09-14
*/
.fixed .main-header {
position: relative;

6
erp_web/js/modules/sys/sysIndex.js
View File

@@ -1,10 +1,10 @@
if (self.frameElement && self.frameElement.tagName == "IFRAME") {
top.location.reload();
/*!
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* Copyright (c) 2013-Now 华夏erp All rights reserved.
*
* @author ThinkGem
* @version 2019-1-6
* @author jishenghua
* @version 2019-09-14
*/
}
+function (d) {

6
erp_web/js/modules/sys/sysLogin.css
View File

@@ -1,7 +1,7 @@
/*!
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* @author ThinkGem
* @version 2019-2-16
* Copyright (c) 2013-Now 华夏erp All rights reserved.
* @author jishenghua
* @version 2019-09-14
*/
.login-page {
background: #e3e7ec

8
erp_web/js/modules/sys/sysLogin.js
View File

@@ -1,8 +1,8 @@
/*!
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*
* @author ThinkGem
* @version 2019-1-6
* Copyright (c) 2013-Now 华夏erp All rights reserved.
*
* @author jishenghua
* @version 2019-09-14
*/
$("#username, #password").on("focus blur", function () {
var a = this;

6
erp_web/js/modules/sys/sysRegister.css
View File

@@ -1,7 +1,7 @@
/*!
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* @author ThinkGem
* @version 2019-2-16
* Copyright (c) 2013-Now 华夏erp All rights reserved.
* @author jishenghua
* @version 2019-09-14
*/
.register-page {
background: #e3e7ec

1
erp_web/js/pages/financial/financial_base.js
View File

@@ -277,6 +277,7 @@
return;
}
});
dgResize();
}
//初始化表格数据-明细列表-编辑状态

1
erp_web/js/pages/manage/supplier.js
View File

@@ -138,6 +138,7 @@
return;
}
});
dgResize();
showSupplierDetails(1,initPageSize);
}

5
erp_web/js/pages/materials/in_out.js
View File

@@ -561,6 +561,7 @@
return;
}
});
dgResize();
}
//查找库存的方法
@@ -1299,9 +1300,9 @@
} else {
sessionStorage.setItem("rowInfo", rowInfo); //将单据信息存入缓存中
if(listTitle == "采购订单列表") {
parent.addTab("订单转采购", "../materials/purchase_in_list.html?t=skip", "");
js.addTabPage(null, "订单转采购", "/pages/materials/purchase_in_list.html?t=skip");
} else if(listTitle == "销售订单列表") {
parent.addTab("订单转销售", "../materials/sale_out_list.html?t=skip", "");
js.addTabPage(null, "订单转销售", "/pages/materials/sale_out_list.html?t=skip");
}
}
}

8
erp_web/js/select2/4.0/select2.full.js vendored
View File

@@ -4461,7 +4461,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return CloseOnSelect;
});
// ThinkGem 默认为中文
// jishenghua 默认为中文
S2.define('select2/i18n/en',[],function () {
// English
return {
@@ -4884,7 +4884,7 @@ S2.define('select2/defaults',[
return selection.text;
},
theme: 'default',
width: '100%' // ThinkGem 宽度自适应 'resolve'
width: '100%' // jishenghua 宽度自适应 'resolve'
};
};
@@ -5310,7 +5310,7 @@ S2.define('select2/core',[
this.on('close', function () {
self.$container.removeClass('select2-container--open');
self.$selection.focus(); // ThinkGem 修正选择后焦点丢失
self.$selection.focus(); // jishenghua 修正选择后焦点丢失
});
this.on('enable', function () {
@@ -5374,7 +5374,7 @@ S2.define('select2/core',[
evt.preventDefault();
}
} else {
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // jishenghua 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
(key === KEYS.DOWN && evt.altKey)) {
self.open();

8
erp_web/js/select2/4.0/select2.js vendored
View File

@@ -4461,7 +4461,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return CloseOnSelect;
});
//ThinkGem 默认为中文
//jishenghua 默认为中文
S2.define('select2/i18n/en',[],function () {
// English
return {
@@ -4884,7 +4884,7 @@ S2.define('select2/defaults',[
return selection.text;
},
theme: 'default',
width: '100%' // ThinkGem 宽度自适应 'resolve'
width: '100%' // jishenghua 宽度自适应 'resolve'
};
};
@@ -5310,7 +5310,7 @@ S2.define('select2/core',[
this.on('close', function () {
self.$container.removeClass('select2-container--open');
self.$selection.focus(); // ThinkGem 修正选择后焦点丢失
self.$selection.focus(); // jishenghua 修正选择后焦点丢失
});
this.on('enable', function () {
@@ -5374,7 +5374,7 @@ S2.define('select2/core',[
evt.preventDefault();
}
} else {
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // jishenghua 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
(key === KEYS.DOWN && evt.altKey)) {
self.open();

164
erp_web/js/upbw/index.html
View File

@@ -1,40 +1,126 @@
<!DOCTYPE html>
<!-- saved from url=(0049)http://demo.jeesite.com/js/static/upbw/index.html -->
<html lang="zh-CN"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>请升级您的浏览器</title><meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="renderer" content="webkit"><!--<base target="_blank">--><base href="." target="_blank"><style type="text/css">
a{text-decoration:none;color:#0072c6;}a:hover{text-decoration:none;color:#004d8c;}
body{width:960px;margin:0 auto;padding:10px;font-size:14px;line-height:24px;color:#454545;font-family:'Microsoft YaHei UI','Microsoft YaHei',DengXian,SimSun,'Segoe UI',Tahoma,Helvetica,sans-serif;}
h1{font-size:30px;line-height:80px;font-weight:100;margin-bottom:10px;}
h2{font-size:20px;line-height:25px;font-weight:100;margin:10px 0;}
p{margin-bottom:10px;font-size:16px;}
hr{margin:20px 0;border:0;border-top:1px solid #dadada}
img{width:34px;height:34px;border:0;float:left;margin-right:10px;}
span{display:block;font-size:12px;line-height:12px;}
.browser{padding:10px 0;}
.browser li{width:180px;height:34px;line-height:22px;float:left;list-style:none;padding-left:25px}
.clean{clear:both;}
</style></head><body>
<h1>浏览器版本过低，是时候升级您的浏览器了</h1>
<p>您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8、IE9 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。</p>
<hr>
<h2>为什么会出现这个页面？</h2>
<p>如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是IE6/7/8，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请<strong style="color:#f00;">切换到极速模式</strong>下，如果还不行请升级至最新版浏览器。</p>
<hr>
<h2>请注意：微软（Microsoft）对 Windows XP 及 IE6、IE7、IE8、IE9 的支持已经结束</h2>
<p>自 2014 年 4 月 8 日起，微软（Microsoft）不再为 Windows XP 和 Internet Explorer 8 及以下版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 <a href="http://windows.microsoft.com/zh-cn/windows/end-support-help">Microsoft 关于 Windows XP 支持已经结束的说明</a> 。</p>
<hr>
<h2>您可以选择更先进的浏览器</h2>
<p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 <b id="url"><a href="http://demo.jeesite.com/js">http://demo.jeesite.com/js</a>&nbsp;</b>即可。</p>
<div class="browser"><ul>
<li><img src="./index_files/chrome360.jpg"><a href="http://chrome.360.cn/"> 360极速浏览器<span>360 Chrome</span></a></li>
<li><img src="./index_files/chrome.jpg"><a href="http://www.google.cn/intl/zh-CN/chrome/browser/desktop/index.html"> 谷歌浏览器<span>Google Chrome</span></a></li>
<li><img src="./index_files/firefox.jpg"><a href="http://www.firefox.com.cn/download/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
<li><img src="./index_files/ie.jpg"><a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie"> IE 11 浏览器<span>Internet Explorer</span></a></li>
</ul><div class="clean"></div></div>
<hr><br>
<script>
var url = location.href; url = url.substring(0, url.indexOf('/static/upbw'));
document.getElementById("url").innerHTML = '<a href="' + url + '">' + url + '</a>&nbsp;';
</script>
</body></html>
<html lang="zh-CN">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>请升级您的浏览器</title>
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="renderer" content="webkit"><!--<base target="_blank">-->
<base href="." target="_blank">
<style type="text/css">
a {
text-decoration: none;
color: #0072c6;
}
a:hover {
text-decoration: none;
color: #004d8c;
}
body {
width: 960px;
margin: 0 auto;
padding: 10px;
font-size: 14px;
line-height: 24px;
color: #454545;
font-family: 'Microsoft YaHei UI', 'Microsoft YaHei', DengXian, SimSun, 'Segoe UI', Tahoma, Helvetica, sans-serif;
}
h1 {
font-size: 30px;
line-height: 80px;
font-weight: 100;
margin-bottom: 10px;
}
h2 {
font-size: 20px;
line-height: 25px;
font-weight: 100;
margin: 10px 0;
}
p {
margin-bottom: 10px;
font-size: 16px;
}
hr {
margin: 20px 0;
border: 0;
border-top: 1px solid #dadada
}
img {
width: 34px;
height: 34px;
border: 0;
float: left;
margin-right: 10px;
}
span {
display: block;
font-size: 12px;
line-height: 12px;
}
.browser {
padding: 10px 0;
}
.browser li {
width: 180px;
height: 34px;
line-height: 22px;
float: left;
list-style: none;
padding-left: 25px
}
.clean {
clear: both;
}
</style>
</head>
<body>
<h1>浏览器版本过低，是时候升级您的浏览器了</h1>
<p>您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8、IE9 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。</p>
<hr>
<h2>为什么会出现这个页面？</h2>
<p>如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是IE6/7/8，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请<strong style="color:#f00;">切换到极速模式</strong>下，如果还不行请升级至最新版浏览器。
</p>
<hr>
<h2>请注意：微软（Microsoft）对 Windows XP 及 IE6、IE7、IE8、IE9 的支持已经结束</h2>
<p>自 2014 年 4 月 8 日起，微软（Microsoft）不再为 Windows XP 和 Internet Explorer 8
及以下版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 <a
href="http://windows.microsoft.com/zh-cn/windows/end-support-help">Microsoft 关于 Windows XP 支持已经结束的说明</a> 。
</p>
<hr>
<h2>您可以选择更先进的浏览器</h2>
<p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 <b id="url"><a href="https://www.huaxiaerp.com/">https://www.huaxiaerp.com/</a>&nbsp;</b>即可。
</p>
<div class="browser">
<ul>
<li><img src="./index_files/chrome360.jpg"><a href="http://chrome.360.cn/"> 360极速浏览器<span>360 Chrome</span></a>
</li>
<li><img src="./index_files/chrome.jpg"><a
href="http://www.google.cn/intl/zh-CN/chrome/browser/desktop/index.html">
谷歌浏览器<span>Google Chrome</span></a></li>
<li><img src="./index_files/firefox.jpg"><a href="http://www.firefox.com.cn/download/"> 火狐浏览器<span>Mozilla Firefox</span></a>
</li>
<li><img src="./index_files/ie.jpg"><a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie">
IE 11 浏览器<span>Internet Explorer</span></a></li>
</ul>
<div class="clean"></div>
</div>
<hr>
<br>
<script>
var url = location.href;
url = url.substring(0, url.indexOf('/static/upbw'));
document.getElementById("url").innerHTML = '<a href="' + url + '">' + url + '</a>&nbsp;';
</script>
</body>
</html>

2
erp_web/js/wdScrollTab/js/TabPanel.extend.js
View File

@@ -1,6 +1,6 @@
/*!
* 首页Tab页签通用方法
* @author ThinkGem
* @author jishenghua
* @version 2017-3-26
*/
(function (b) {

753
erp_web/js/wdScrollTab/js/TabPanel.js
View File

File diff suppressed because one or more lines are too long

10
erp_web/pages/financial/advance_in.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="收预付款列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="收预付款列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/financial/giro.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="转账单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="转账单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/financial/item_in.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="收入单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="收入单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/financial/item_out.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="支出单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="支出单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/financial/money_in.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="收款单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="收款单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/financial/money_out.html
View File

@@ -17,9 +17,8 @@
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="付款单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="付款单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/manage/account.html
View File

@@ -16,9 +16,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="结算账户" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -46,11 +45,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="结算账户" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -175,6 +169,7 @@
return;
}
});
dgResize();
showAccountDetails(1, initPageSize);
}

11
erp_web/pages/manage/app.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="应用列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名称：</td>
@@ -42,11 +41,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="应用列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -221,6 +215,7 @@
return;
}
});
dgResize();
showAppDetails(1, initPageSize);
}

10
erp_web/pages/manage/customer.html
View File

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="客户信息列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="客户信息列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"

11
erp_web/pages/manage/depot.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="仓库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>仓库名称：</td>
@@ -36,11 +35,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="仓库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -227,6 +221,7 @@
return;
}
});
dgResize();
showDepotDetails(1, initPageSize);
}

11
erp_web/pages/manage/functions.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="功能列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名称：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="功能列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -206,6 +200,7 @@
return;
}
});
dgResize();
showFunctionsDetails(1, initPageSize);
}

11
erp_web/pages/manage/inOutItem.html
View File

@@ -16,9 +16,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="收支项目" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="收支项目" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="inOutItemDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -174,6 +168,7 @@
return;
}
});
dgResize();
showInOutItemDetails(1, initPageSize);
}

11
erp_web/pages/manage/log.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;position: center;" title="查询窗口" iconCls="icon-search"
collapsible="true" closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="操作日志列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>操作模块：</td>
@@ -74,11 +73,6 @@
<td>&nbsp;</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="操作日志列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="height:340px;top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<script type="text/javascript">
@@ -132,6 +126,7 @@
return;
}
});
dgResize();
showLogDetails(1, initPageSize);
}

10
erp_web/pages/manage/member.html
View File

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="会员信息列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="会员信息列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="supplierDlg" class="easyui-dialog" style="width:600px;padding:10px 20px"

3
erp_web/pages/manage/organization.html
View File

@@ -20,8 +20,7 @@
</head>
<body>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="机构列表" iconCls="icon-list"
collapsible="true" closable="false">
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="机构列表" iconCls="icon-list">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF">
</table>
</div>

11
erp_web/pages/manage/role.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="角色列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>角色名称：</td>
@@ -39,11 +38,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="角色列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -155,6 +149,7 @@
return;
}
});
dgResize();
showRoleDetails(1, initPageSize);
}

11
erp_web/pages/manage/serialNumber.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="序列号列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>商品名称：</td>
@@ -38,11 +37,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="序列号列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
<input id="selectType" hidden="hidden" />
</div>
@@ -268,6 +262,7 @@
return;
}
});
dgResize();
showSerialNumberDetails(1, initPageSize);
}
//分页信息处理

13
erp_web/pages/manage/systemConfig.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="系统配置" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>公司名称：</td>
@@ -31,14 +30,9 @@
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
</td>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="系统配置" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -173,6 +167,7 @@
return;
}
});
dgResize();
showSystemConfigDetails(1, initPageSize);
}

11
erp_web/pages/manage/unit.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="计量单位列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>计量单位：</td>
@@ -31,11 +30,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="计量单位列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -149,6 +143,7 @@
return;
}
});
dgResize();
showUnitDetails(1, initPageSize);
}

11
erp_web/pages/manage/user.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="用户列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>登录名称：</td>
@@ -45,11 +44,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="用户列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -232,6 +226,7 @@
return;
}
});
dgResize();
showUserDetails(1, initPageSize);
}

10
erp_web/pages/manage/vendor.html
View File

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="供应商信息列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="供应商信息列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"

10
erp_web/pages/materials/allocation_out_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="调拨出库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="调拨出库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/assemble_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="组装单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="组装单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/disassemble_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="拆卸单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="拆卸单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/materials/material.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>类别：</td>
@@ -46,11 +45,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -644,6 +638,7 @@
return;
}
});
dgResize();
showMaterialDetails(1, initPageSize);
}

11
erp_web/pages/materials/materialProperty.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="商品属性列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名称：</td>
@@ -31,11 +30,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="商品属性列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -143,6 +137,7 @@
return;
}
});
dgResize();
showMaterialPropertyDetails(1, initPageSize);
}

12
erp_web/pages/materials/material_forselect.html
View File

@@ -17,9 +17,9 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchForSelectPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tableForSelectPanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="searchForSelectTable">
<tr>
<td>品名：</td>
@@ -38,11 +38,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tableForSelectPanel" class="easyui-panel" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableForSelectData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -118,6 +113,7 @@
$("#forSelectMaterialDlg").dialog('close');
}
});
dgResize();
showMaterialDetails(1, initPageSize);
}

10
erp_web/pages/materials/other_in_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="其它入库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="其它入库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/other_out_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="其它出库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="其它出库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/materials/person.html
View File

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="经手人列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>姓名：</td>
@@ -42,11 +41,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="经手人列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -159,6 +153,7 @@
return;
}
});
dgResize();
showPersonDetails(1, initPageSize);
}

10
erp_web/pages/materials/purchase_back_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="采购退货列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="采购退货列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/purchase_in_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="采购入库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="采购入库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/materials/purchase_orders_list.html
View File

@@ -16,13 +16,13 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="采购订单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="采购订单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/retail_back_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="零售退货列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="零售退货列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/retail_out_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="零售出库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="零售出库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/sale_back_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="销售退货列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售退货列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/materials/sale_orders_list.html
View File

@@ -16,13 +16,13 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="销售订单列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售订单列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

10
erp_web/pages/materials/sale_out_list.html
View File

@@ -20,9 +20,8 @@
<script src="/js/pages/materials/in_out.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px; top:300px;" title="销售出库列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>单据编号：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售出库列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>

11
erp_web/pages/reports/account_report.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="结算账户列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名称：</td>
@@ -45,11 +44,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="结算账户列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -111,6 +105,7 @@
return;
}
});
dgResize();
showAccountDetails(1, initPageSize);
}

11
erp_web/pages/reports/buy_in_report.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="进货统计列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>月份：</td>
@@ -36,11 +35,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="进货统计列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -131,6 +125,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/customer_account.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="客户对账列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>客户：</td>
@@ -51,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="客户对账列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -124,6 +118,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/in_detail.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="入库明细列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>供应商：</td>
@@ -51,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="入库明细列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -213,6 +207,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/in_material_count.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="入库汇总列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>供应商：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="入库汇总列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -202,6 +196,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="库存状况列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>仓库：</td>
@@ -43,11 +42,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="库存状况列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -231,6 +225,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/out_detail.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="出库明细列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>客户：</td>
@@ -51,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="出库明细列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -213,6 +207,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/out_material_count.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="出库汇总列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>客户：</td>
@@ -50,11 +49,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="出库汇总列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -202,6 +196,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/sale_out_report.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="销售统计列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>月份：</td>
@@ -37,11 +36,6 @@
<td>当前销售总额：<span class="first-total">0</span>&nbsp;&nbsp;<span class="tip">注：此处包含零售+批发销售</span></td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="销售统计列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -135,6 +129,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/stock_warning_report.html
View File

@@ -17,9 +17,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="库存预警列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>仓库：</td>
@@ -38,11 +37,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="库存预警列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -224,6 +218,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

11
erp_web/pages/reports/vendor_account.html
View File

@@ -18,9 +18,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false">
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="供应商对账列表" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>供应商：</td>
@@ -51,11 +50,6 @@
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="供应商对账列表" iconCls="icon-list"
collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -123,6 +117,7 @@
return;
}
});
dgResize();
}
//初始化键盘enter事件

2
erp_web/register.html
View File

@@ -4,9 +4,7 @@
<meta charset="utf-8">
<meta content="webkit" name="renderer"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="PoweredByJeeSiteV4.0"/>
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
<meta name="description" content="PoweredByJeeSiteV4.0"/>
<meta content="no-cache" http-equiv="Pragma"/>
<meta http-equiv="Expires" content="0"/>
<meta content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>

37
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -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<String, Object> map = new HashMap<String, Object>();
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;
}
}

7
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -126,4 +126,11 @@ public interface DepotHeadMapperEx {
List<DepotHead> getDepotHeadListByHandsPersonIds(@Param("handsPersonIds") String[] handsPersonIds);
List<DepotHead> 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);
}

4
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -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);
}
}

25
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -510,4 +510,29 @@
and ifnull(delete_Flag,'0') !='1'
</select>
<select id="getBuyAndSaleStatistics" resultType="java.math.BigDecimal">
SELECT
ifnull(sum(DiscountLastMoney),0)
FROM jsh_depothead
WHERE 1=1
<if test="type != null">
and Type='${type}'
</if>
<if test="subType != null">
and SubType='${subType}'
</if>
<if test="hasSupplier == 1">
and OrganId is not null
</if>
<if test="hasSupplier == 0">
and OrganId is null
</if>
<if test="beginTime != null">
and OperTime >= '${beginTime}'
</if>
<if test="endTime != null">
and OperTime &lt;= '${endTime}'
</if>
and ifnull(delete_Flag,'0') !='1'
</select>
</mapper>