浏览代码

Minor issue when generating the pdf for the reports having html format (#3478)

version-14
Manas Solanki 8 年前
committed by Nabin Hait
父节点
当前提交
b6cb70d232
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. +7
    -3
      frappe/public/js/frappe/views/reports/query_report.js

+ 7
- 3
frappe/public/js/frappe/views/reports/query_report.js 查看文件

@@ -217,12 +217,17 @@ frappe.views.QueryReport = Class.extend({

var orientation = this.print_settings.orientation;
var landscape = orientation == "Landscape" ? true: false
var columns = this.grid.getColumns();
if(this.html_format) {
var content = frappe.render(this.html_format,
{data: frappe.slickgrid_tools.get_filtered_items(this.dataView), filters:this.get_values(), report:this});
var content = frappe.render(this.html_format, {
data: frappe.slickgrid_tools.get_filtered_items(this.dataView),
filters:this.get_values(),
report:this
});

//Render Report in HTML
var html = frappe.render_template("print_template", {
columns:columns,
content:content,
title:__(this.report_name),
base_url: base_url,
@@ -236,7 +241,6 @@ frappe.views.QueryReport = Class.extend({
.get_view_data(this.columns, this.dataView)
.map(row => row[0]).filter(idx => idx !== 'Sr No');

var columns = this.grid.getColumns();
var data = this.grid.getData().getItems();
data = data.filter(d => visible_idx.includes(d._id));



正在加载...
取消
保存