From d5785f7ecec215960c4d100bf129e1abeca9d5cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 30 七月 2024 20:11:03 +0800
Subject: [PATCH] 位置报表多单位使用动态表头及相应数据调整(数据使用存储的多单位数据，并展示在对应单位下面)
---
service/history_forms.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/service/history_forms.go b/service/history_forms.go
index 906354e..075317a 100644
--- a/service/history_forms.go
+++ b/service/history_forms.go
@@ -137,8 +137,10 @@
var fileName string
f := excelize.NewFile()
+ unitData, unitIndexMap := GetAllUnits()
+
// 鑷畾涔夎〃澶�
- headers := []interface{}{"鏃ユ湡", "鍗曞彿", "浜у搧", "浜у搧缂栫爜", "涓氬姟绫诲瀷", "浠�", "鑷�", map[string][]string{"鏁伴噺": {"浠�", "鍖�", "绫�", "閲嶉噺"}}, "鍗曚綅", "閲嶉噺"}
+ headers := []interface{}{"鏃ユ湡", "鍗曞彿", "浜у搧", "浜у搧缂栫爜", "涓氬姟绫诲瀷", "浠�", "鑷�", map[string][]string{"鏁伴噺": unitData}, "鍗曚綅", "閲嶉噺"}
// 璁剧疆琛ㄥご
if err := SetExcelHeader(headers, f); err != nil {
@@ -166,7 +168,7 @@
f.SetCellValue("Sheet1", "F"+column, v.FromLocation)
f.SetCellValue("Sheet1", "G"+column, v.ToLocation)
f.SetCellValue("Sheet1", "H"+column, v.Amount)
- FillMoreUnitToExcel(v.Amount, v.AmountMoreUnits, 7, i+3, f)
+ FillMoreUnitToExcel(v.AmountMoreUnits, 7, i+3, unitIndexMap, f)
f.SetCellValue("Sheet1", "L"+column, v.Unit)
f.SetCellValue("Sheet1", "M"+column, v.Weight)
}
--
Gitblit v1.8.0