|
@@ -36,10 +36,10 @@ func (b *ProductBillExcel) drawTitle() error {
|
|
|
startCell := fmt.Sprintf("A%d", b.Row)
|
|
|
endCell := fmt.Sprintf("H%d", b.Row)
|
|
|
marginLeft := excelize.PageMarginLeft(0.35)
|
|
|
- b.Excel.SetColWidth(b.SheetName, "A", "A", 17)
|
|
|
- b.Excel.SetColWidth(b.SheetName, "B", "B", 14)
|
|
|
+ b.Excel.SetColWidth(b.SheetName, "A", "A", 18.5)
|
|
|
+ b.Excel.SetColWidth(b.SheetName, "B", "B", 16)
|
|
|
b.Excel.SetColWidth(b.SheetName, "C", "G", 12)
|
|
|
- b.Excel.SetColWidth(b.SheetName, "H", "H", 22)
|
|
|
+ b.Excel.SetColWidth(b.SheetName, "H", "H", 18.5)
|
|
|
b.Excel.SetPageMargins(b.SheetName, marginLeft)
|
|
|
err := b.Excel.MergeCell(b.SheetName, startCell, endCell)
|
|
|
if err != nil {
|
|
@@ -176,15 +176,16 @@ func (b *ProductBillExcel) drawTableContent() error {
|
|
|
b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
|
|
|
var magN float64 = 1
|
|
|
lenv := len([]rune(v))
|
|
|
- if lenv%10 > 5 {
|
|
|
- magN = math.Ceil(float64(lenv) / 10)
|
|
|
-
|
|
|
- } else {
|
|
|
- n := math.Floor(float64(lenv) / 10)
|
|
|
- if n > 0 {
|
|
|
- magN = n
|
|
|
- }
|
|
|
- }
|
|
|
+ magN = math.Ceil(float64(lenv) / 10)
|
|
|
+ // if lenv%10 > 5 {
|
|
|
+ // magN = math.Ceil(float64(lenv) / 10)
|
|
|
+
|
|
|
+ // } else {
|
|
|
+ // n := math.Floor(float64(lenv) / 10)
|
|
|
+ // if n > 0 {
|
|
|
+ // magN = n
|
|
|
+ // }
|
|
|
+ // }
|
|
|
b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
|
|
|
}
|
|
|
}
|