From 7141a778182232e1771e0916ec6c8ce51ddb6c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 2 Jan 2019 21:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=93=E5=8D=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/print/print.js | 22 ++++++++++++------- erp_web/pages/reports/account_report.html | 3 +-- erp_web/pages/reports/buy_in_report.html | 3 +-- erp_web/pages/reports/customer_account.html | 3 +-- erp_web/pages/reports/in_detail.html | 3 +-- erp_web/pages/reports/in_material_count.html | 3 +-- .../pages/reports/in_out_stock_report.html | 3 +-- erp_web/pages/reports/out_detail.html | 3 +-- erp_web/pages/reports/out_material_count.html | 3 +-- erp_web/pages/reports/sale_out_report.html | 3 +-- erp_web/pages/reports/vendor_account.html | 3 +-- 11 files changed, 24 insertions(+), 28 deletions(-) diff --git a/erp_web/js/print/print.js b/erp_web/js/print/print.js index f52f822a..2da1d0d6 100644 --- a/erp_web/js/print/print.js +++ b/erp_web/js/print/print.js @@ -1,6 +1,6 @@ // strPrintName 打印任务名 // printDatagrid 要打印的datagrid -function CreateFormPage(strPrintName, printDatagrid, path) { +function CreateFormPage(strPrintName, printDatagrid) { var beginDate= $("#searchBeginTime").val(); var endDate= $("#searchEndTime").val(); var getMonth= $("#searchMonth").val(); @@ -10,16 +10,22 @@ function CreateFormPage(strPrintName, printDatagrid, path) { //加载公司信息 $.ajax({ type:"get", - url: path + "/systemConfig/findBy.action", + url: "/systemConfig/list", dataType: "json", + data: ({ + currentPage: 1, + pageSize: 100 + }), async: false, success: function (res) { - if(res && res.rows) { - var array = res.rows; - for(var i=0; i diff --git a/erp_web/pages/reports/buy_in_report.html b/erp_web/pages/reports/buy_in_report.html index d0e0efa6..1599f749 100644 --- a/erp_web/pages/reports/buy_in_report.html +++ b/erp_web/pages/reports/buy_in_report.html @@ -252,8 +252,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/customer_account.html b/erp_web/pages/reports/customer_account.html index cc0a7e51..f3966d01 100644 --- a/erp_web/pages/reports/customer_account.html +++ b/erp_web/pages/reports/customer_account.html @@ -344,8 +344,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index 7e713b2f..a151eec8 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -306,8 +306,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 50dc379c..4c0b91df 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -295,8 +295,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html index a8c006b9..07d351cf 100644 --- a/erp_web/pages/reports/in_out_stock_report.html +++ b/erp_web/pages/reports/in_out_stock_report.html @@ -411,8 +411,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index d39f35b9..da318011 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -306,8 +306,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index e1e7fcc7..5899db85 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -295,8 +295,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/sale_out_report.html b/erp_web/pages/reports/sale_out_report.html index e35e33e2..f58bed7f 100644 --- a/erp_web/pages/reports/sale_out_report.html +++ b/erp_web/pages/reports/sale_out_report.html @@ -255,8 +255,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); } diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html index 8764803c..c5cb9740 100644 --- a/erp_web/pages/reports/vendor_account.html +++ b/erp_web/pages/reports/vendor_account.html @@ -343,8 +343,7 @@ //报表打印 function print() { $("#printBtn").off("click").on("click", function () { - var path = "<%=path %>"; - CreateFormPage('打印报表', $('#tableData'), path); + CreateFormPage('打印报表', $('#tableData')); }); }