From 81f110b6049ee44d82c697a93d0eb4a558f4df50 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 26 三月 2024 14:49:04 +0800
Subject: [PATCH] 销售出库明细报表：导出功能因为只显示单据第一行的主表信息而导致部分内容空白问题解决
---
WebTM/views/应收管理/报表分析/Kf_SellOutEntryReport.html | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
index d1235ec..1e07488 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
@@ -200,6 +200,7 @@
//瀵煎嚭鍔熻兘鑾峰彇鏁版嵁
var option_Bak = {};
var option1_Bak = {};
+ var sWhere_Bak = "";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -326,6 +327,28 @@
, limit: 50
, limits: [50, 500, 5000, 50000]
};
+
+ option_Bak = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 50000]
+ };
+
+ option1_Bak = {
+ elem: '#mainTable1'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 50000]
+ };
}
//#endregion
//#endregion
@@ -375,11 +398,6 @@
//鑾峰彇琛�2鏁版嵁
option1.cols = [col];
option1.data = data1.data[1];
-
- //鑾峰彇瀵煎嚭鏁版嵁
- option_Bak = option;
- option1_Bak = option1;
-
//璁剧疆琛�1锛氬垪琛ㄥ悓涓�涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭紱鍚堣鏁版嵁
//璁剧疆鏁版嵁锛氬０鏄庤绠楀悎璁＄殑鍙橀噺
@@ -560,6 +578,9 @@
sWhere += getSWhereByHUser();
get_Display(sWhere);
+
+ sWhere_Bak = sWhere;
+
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -920,22 +941,69 @@
return sheet;
}
function exportAll() {
- //鑾峰彇sheet
- let sheet1 = oneTable(option_Bak);
- let sheet2 = twoTable(option1_Bak);
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutEntryReport/list',
+ type: "GET",
+ data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = ["浠舵暟", "绫虫暟", "閲戦"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, templet: "<div>{{d." + data[i].name + " ==null ?'':fixed(d." + data[i].name + ")}}</div>" });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
- //鍒涘缓excel鏂囨。
- const wb = XLSX.utils.book_new();
- XLSX.utils.book_append_sheet(wb, sheet1, "娑ょ憾");
- XLSX.utils.book_append_sheet(wb, sheet2, "缇婃瘺");
- const workbookBlob = workbook2blob(wb);
+ //璁剧疆琛�1瀵煎嚭鏁版嵁
+ option_Bak.cols = [col];
+ option_Bak.data = data1.data[0];
- // 瀵煎嚭鏈�鍚庣殑鎬昏〃
- var ExcelName = "閿�鍞嚭搴撴槑缁嗘姤琛�" + Format(new Date(), "yyyy-MM-dd") + ".xlsx";
- openDownloadDialog(workbookBlob, ExcelName);
+ //鑾峰彇琛�2瀵煎嚭鏁版嵁
+ option1_Bak.cols = [col];
+ option1_Bak.data = data1.data[1];
+ //鑾峰彇sheet
+ let sheet1 = oneTable(option_Bak);
+ let sheet2 = twoTable(option1_Bak);
- // 灏哹lob瀵硅薄 鍒涘缓bloburl,鐒跺悗鐢╝鏍囩瀹炵幇寮瑰嚭涓嬭浇妗�
+ //鍒涘缓excel鏂囨。
+ const wb = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(wb, sheet1, "娑ょ憾");
+ XLSX.utils.book_append_sheet(wb, sheet2, "缇婃瘺");
+ const workbookBlob = workbook2blob(wb);
+
+ // 瀵煎嚭鏈�鍚庣殑鎬昏〃
+ var ExcelName = "閿�鍞嚭搴撴槑缁嗘姤琛�" + Format(new Date(), "yyyy-MM-dd") + ".xlsx";
+ openDownloadDialog(workbookBlob, ExcelName);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//#region 璁剧疆瀵煎嚭鍙傛暟
function workbook2blob(workbook) {
--
Gitblit v1.9.1