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

!54 销售统计报表添加销售总额和单据明细打印

Browse Source 
Merge pull request !54 from 天门溪水/master
This commit is contained in:
季圣华
2019-06-16 22:27:25 +08:00
committed by Gitee
parent 0d1deaa197 137c01ef64
commit ce8103c9d3
4 changed files with 106 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
erp_web/js/pages/materials/bill_detail.js
View File

@@ -7,12 +7,17 @@
var payTypeTitle = "";//收入 支出
var itemType = true; //隐藏当前列
var moneyType = true; //隐藏当前列
$(function() {
initSystemData_account(); //获取账户信息
initMProperty(); //初始化商品属性
initOutItemList(); //初始化支出项目
initialize();//初始化系统基础信息
});
//获取账户信息
function initSystemData_account(){
$.ajax({
@@ -95,38 +100,47 @@
if(listSubType == "采购入库") {
billType = "material";
$("#bill .purchase_in").show();
tableString = $(".purchase_in").html();
}
else if(listSubType == "采购退货出库") {
billType = "material";
$("#bill .purchase_back").show();
tableString = $(".purchase_back").html();
}
else if(listSubType == "销售出库") {
billType = "material";
$("#bill .sale_out").show();
tableString = $(".sale_out").html();
}
else if(listSubType == "销售退货入库") {
billType = "material";
$("#bill .sale_back").show();
tableString = $(".sale_back").html();
}
else if(listSubType == "零售出库") {
billType = "material";
$("#bill .retail_out").show();
tableString = $(".retail_out").html();
}
else if(listSubType == "零售退货入库") {
billType = "material";
$("#bill .retail_back").show();
tableString = $(".retail_back").html();
}
else if(listSubType == "其它入库") {
billType = "material";
$("#bill .other_in").show();
tableString = $(".other_in").html();
}
else if(listSubType == "其它出库") {
billType = "material";
$("#bill .other_out").show();
tableString = $(".other_out").html();
}
else if(listSubType == "调拨出库") {
billType = "material";
$("#bill .allocation_out").show();
tableString = $(".allocation_out").html();
}
else if(listSubType == "收入") {
billType = "account";
@@ -134,6 +148,7 @@
itemType = false; //显示当前列
moneyType = true; //隐藏当前列
$("#bill .item_in").show();
tableString = $(".item_in").html();
}
else if(listSubType == "支出") {
billType = "account";
@@ -141,6 +156,7 @@
itemType = false; //显示当前列
moneyType = true; //隐藏当前列
$("#bill .item_out").show();
tableString = $(".item_out").html();
}
else if(listSubType == "收款") {
billType = "account";
@@ -148,6 +164,7 @@
itemType = true; //隐藏当前列
moneyType = false; //显示当前列
$("#bill .money_in").show();
tableString = $(".money_in").html();
}
else if(listSubType == "付款") {
billType = "account";
@@ -155,6 +172,7 @@
itemType = true; //隐藏当前列
moneyType = false; //显示当前列
$("#bill .money_out").show();
tableString = $(".money_out").html();
}
else if(listSubType == "转账") {
billType = "account";
@@ -162,6 +180,7 @@
itemType = true; //隐藏当前列
moneyType = false; //显示当前列
$("#bill .giro").show();
tableString = $(".giro").html();
}
else if(listSubType == "收预付款") {
billType = "account";
@@ -169,8 +188,12 @@
itemType = true; //隐藏当前列
moneyType = false; //显示当前列
$("#bill .advance_in").show();
tableString = $(".advance_in").html();
}
//如果是进货、销售
if(billType == "material"){
$.ajax({
@@ -317,6 +340,57 @@
}
});
}
//打印table
$("#print_bill_detail").off("click").on("click",function(){
var tableString = "";//打印table
if(listSubType == "采购入库") {
tableString = $(".purchase_in").html();
}
else if(listSubType == "采购退货出库") {
tableString = $(".purchase_back").html();
}
else if(listSubType == "销售出库") {
tableString = $(".sale_out").html();
}
else if(listSubType == "销售退货入库") {
tableString = $(".sale_back").html();
}
else if(listSubType == "零售出库") {
tableString = $(".retail_out").html();
}
else if(listSubType == "零售退货入库") {
tableString = $(".retail_back").html();
}
else if(listSubType == "其它入库") {
tableString = $(".other_in").html();
}
else if(listSubType == "其它出库") {
tableString = $(".other_out").html();
}
else if(listSubType == "调拨出库") {
tableString = $(".allocation_out").html();
}
else if(listSubType == "收入") {
tableString = $(".item_in").html();
}
else if(listSubType == "支出") {
tableString = $(".item_out").html();
}
else if(listSubType == "收款") {
tableString = $(".money_in").html();
}
else if(listSubType == "付款") {
tableString = $(".money_out").html();
}
else if(listSubType == "转账") {
tableString = $(".giro").html();
}
else if(listSubType == "收预付款") {
tableString = $(".advance_in").html();
}
localStorage.setItem("tableString",tableString);
window.open("../../js/print/print_form.html","location:No;status:No;help:No;dialogWidth:800px;dialogHeight:600px;scroll:auto;");
});
}
//初始化表格数据-商品列表-查看状态
@@ -459,3 +533,6 @@
});
}
function print(){
alert(listSubType);
}

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

@@ -15,6 +15,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/bill_detail.js"></script>
</head>
<body>
<div id="bill" class="easyui-panel" style="padding:10px;height:500px;" title="单据明细" iconCls="icon-list"
@@ -24,7 +25,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td style="width:60px;height:50px;">会员卡号：</td>
<td style="width:80px;height:50px;">会员卡号：</td>
<td style="padding:5px;width:200px;">
<span class="OrganIdShow"></span>
</td>
@@ -93,7 +94,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td style="width:60px;height:50px;">会员卡号：</td>
<td style="width:80px;height:50px;">会员卡号：</td>
<td style="padding:5px;width:200px;">
<span class="OrganIdShow"></span>
</td>
@@ -304,7 +305,7 @@
</table>
</div>
<!--销售出库-->
<div class="sale_out" style="width:1100px;padding:10px 20px;top:20px"
<div class="sale_out" style="width:1100px;padding:10px 20px;top:20px" id="depotHeadDlgShow"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
@@ -379,6 +380,7 @@
</tr>
</table>
</div>
<!--销售退货-->
<div class="sale_back" style="width:1100px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
@@ -823,5 +825,8 @@
</table>
</div>
</div>
<div id="dlg-buttons-show">
<a href="javascript:void(0)" id="print_bill_detail" class="easyui-linkbutton" iconCls="icon-ok">打印</a>
</div>
</body>
</html>

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

@@ -34,7 +34,7 @@
&nbsp;&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-print" id="printBtn">打印</a>
</td>
<td><span class="tip">注：此处包含零售+批发销售</span></td>
<td>当前销售总额：<span class="first-total">0</span>&nbsp;&nbsp;<span class="tip">注：此处包含零售+批发销售</span></td>
</tr>
</table>
</div>
@@ -110,14 +110,16 @@
pageSize: 10,
pageList: [10, 50, 100],
columns: [[
{title: '名称', field: 'MaterialName', width: 60},
{title: '型号', field: 'MaterialModel', width: 80},
{title: '扩展信息', field: 'MaterialOther', width: 150},
{title: '单位', field: 'MaterialUnit', width: 80},
{title: '销售数量', field: 'OutSum', width: 60},
{title: '销售金额', field: 'OutSumPrice', width: 60},
{title: '退货数量', field: 'InSum', width: 60},
{title: '退货金额', field: 'InSumPrice', width: 60}
{title: '名称', field: 'MaterialName', width: 60, align: "center"},
{title: '型号', field: 'MaterialModel', width: 80, align: "center"},
{title: '扩展信息', field: 'MaterialOther', width: 150, align: "center"},
{title: '单位', field: 'MaterialUnit', width: 80, align: "center"},
{title: '销售数量', field: 'OutSum', width: 60, align: "center"},
{title: '销售金额', field: 'OutSumPrice', width: 60, align: "center"},
{title: '退货数量', field: 'InSum', width: 60, align: "center"},
{title: '退货金额', field: 'InSumPrice', width: 60, align: "center"},
{title: '实际销售金额', field: 'OutInSumPrice', width: 80, align: "center"}
]],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
@@ -219,6 +221,13 @@
if (res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows);
}
var total = 0;
res.data.rows.forEach(function(value, index, array){
//执行某些操作
total += value.OutInSumPrice;
})
$(".first-total").text(total); //当前总余额
},
//此处添加错误处理
error: function () {
@@ -260,4 +269,4 @@
}
</script>
</body>
</html>
</html>