update

boxcost/api/bill-produce-excel.go

@@ -210,7 +210,6 @@ func (b *ProduceBillExcel) drawTableContent() error {
 }
 
 func (b *ProduceBillExcel) drawTableFooter() error {
-	left1Cell := fmt.Sprintf("A%d", b.Row)
 	border := []excelize.Border{
 		{Type: "top", Style: 1, Color: "000000"},
 		{Type: "left", Style: 1, Color: "000000"},
@@ -223,16 +222,13 @@ func (b *ProduceBillExcel) drawTableFooter() error {
 		Border:    border,
 	})
 
-	b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
-	b.Excel.SetCellValue(b.SheetName, left1Cell, "送货地址")
+	addCel := fmt.Sprintf("A%d", b.Row)
 
-	addCel := fmt.Sprintf("B%d", b.Row)
+	b.Excel.MergeCell(b.SheetName, addCel, fmt.Sprintf("G%d", b.Row))
+	b.Excel.SetCellStyle(b.SheetName, addCel, fmt.Sprintf("G%d", b.Row), styleLeft)
+	b.Excel.SetCellValue(b.SheetName, addCel, "送货地址："+b.Content.SendTo)
 
-	b.Excel.MergeCell(b.SheetName, addCel, fmt.Sprintf("E%d", b.Row))
-	b.Excel.SetCellStyle(b.SheetName, addCel, fmt.Sprintf("E%d", b.Row), styleLeft)
-	b.Excel.SetCellValue(b.SheetName, addCel, b.Content.SendTo)
-
-	sureCel := fmt.Sprintf("F%d", b.Row)
+	sureCel := fmt.Sprintf("H%d", b.Row)
 	b.Excel.MergeCell(b.SheetName, sureCel, fmt.Sprintf("L%d", b.Row))
 	b.Excel.SetCellStyle(b.SheetName, sureCel, fmt.Sprintf("L%d", b.Row), styleLeft)
 	b.Excel.SetCellValue(b.SheetName, sureCel, "供应商签字：")
@@ -252,11 +248,17 @@ func (b *ProduceBillExcel) drawTableSignature() error {
 		// Border:    border,
 	})
 
+	style2, _ := b.Excel.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{Horizontal: "left", Vertical: "center"},
+		// Border:    border,
+	})
+
 	// 制单人
 	billUserCell := fmt.Sprintf("A%d", b.Row+1)
-	b.Excel.SetCellValue(b.SheetName, billUserCell, "制单人：")
 	billUservCell := fmt.Sprintf("B%d", b.Row+1)
-	b.Excel.SetCellValue(b.SheetName, billUservCell, b.Content.UserName)
+	b.Excel.MergeCell(b.SheetName, billUserCell, billUservCell)
+	b.Excel.SetCellStyle(b.SheetName, billUserCell, billUservCell, style2)
+	b.Excel.SetCellValue(b.SheetName, billUserCell, "制单人："+b.Content.UserName)
 
 	fontCell := fmt.Sprintf("H%d", b.Row)
 	imageCell1 := fmt.Sprintf("I%d", b.Row)

boxcost/api/bill-purchase-excel.go

@@ -253,11 +253,8 @@ func (b *PurchaseBillExcel) drawTableContent() error {
 }
 
 func (b *PurchaseBillExcel) drawTableFooter() error {
-	// row := b.Offset + 8
 	row := b.Row
 
-	left1Cell := fmt.Sprintf("A%d", row)
-
 	border := []excelize.Border{
 		{Type: "top", Style: 1, Color: "000000"},
 		{Type: "left", Style: 1, Color: "000000"},
@@ -270,16 +267,12 @@ func (b *PurchaseBillExcel) drawTableFooter() error {
 		Border:    border,
 	})
 
-	b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
-	b.Excel.SetCellValue(b.SheetName, left1Cell, "送货地址")
-
-	addCel := fmt.Sprintf("B%d", row)
+	addCel := fmt.Sprintf("A%d", row)
+	b.Excel.MergeCell(b.SheetName, addCel, fmt.Sprintf("G%d", row))
+	b.Excel.SetCellStyle(b.SheetName, addCel, fmt.Sprintf("G%d", row), styleLeft)
+	b.Excel.SetCellValue(b.SheetName, addCel, "送货地址："+b.Content.SendTo)
 
-	b.Excel.MergeCell(b.SheetName, addCel, fmt.Sprintf("E%d", row))
-	b.Excel.SetCellStyle(b.SheetName, addCel, fmt.Sprintf("E%d", row), styleLeft)
-	b.Excel.SetCellValue(b.SheetName, addCel, b.Content.SendTo)
-
-	sureCel := fmt.Sprintf("F%d", row)
+	sureCel := fmt.Sprintf("H%d", row)
 	b.Excel.MergeCell(b.SheetName, sureCel, fmt.Sprintf("L%d", row))
 	b.Excel.SetCellStyle(b.SheetName, sureCel, fmt.Sprintf("L%d", row), styleLeft)
 	b.Excel.SetCellValue(b.SheetName, sureCel, "供应商签字：")
@@ -299,9 +292,9 @@ func (b *PurchaseBillExcel) drawTableSignature() error {
 
 	// 制单人
 	billUserCell := fmt.Sprintf("A%d", b.Row+1)
-	b.Excel.SetCellValue(b.SheetName, billUserCell, "制单人：")
-	billUservCell := fmt.Sprintf("B%d", b.Row+1)
-	b.Excel.SetCellValue(b.SheetName, billUservCell, b.Content.UserName)
+	b.Excel.SetCellValue(b.SheetName, billUserCell, "制单人："+b.Content.UserName)
+	// billUservCell := fmt.Sprintf("B%d", b.Row+1)
+	// b.Excel.SetCellValue(b.SheetName, billUservCell, b.Content.UserName)
 
 	fontCell := fmt.Sprintf("H%d", b.Row)
 	imageCell1 := fmt.Sprintf("I%d", b.Row)
@@ -378,10 +371,16 @@ func NewPurchaseBill(f *excelize.File) *PurchaseBillExcel {
 		Signatures:       make([]*model.Signature, 0),
 	}
 
-	f.SetColWidth(b.SheetName, "A", "A", 12)
-	f.SetColWidth(b.SheetName, "B", "K", 9.5)
+	// f.SetColWidth(b.SheetName, "A", "A", 12)
+	// f.SetColWidth(b.SheetName, "B", "K", 9.5)
+	// f.SetColWidth(b.SheetName, "L", "L", 10)
+
+	f.SetColWidth(b.SheetName, "A", "A", 15)
+	f.SetColWidth(b.SheetName, "B", "B", 15)
+	f.SetColWidth(b.SheetName, "C", "G", 7)
 	// f.SetColWidth(b.SheetName, "C", "H", 9.5)
-	f.SetColWidth(b.SheetName, "L", "L", 10)
+	f.SetColWidth(b.SheetName, "H", "K", 10)
+	f.SetColWidth(b.SheetName, "L", "L", 11)
 	f.SetPageMargins(b.SheetName, excelize.PageMarginTop(0), excelize.PageMarginLeft(0), excelize.PageMarginRight(0))
 	return b
 }

boxcost/api/report-purchase-excel.go

@@ -291,9 +291,16 @@ func NewReportPurchaseExcel(f *excelize.File) *ReportPurchaseExcel {
 		AlignCenterStyle: styleLeft,
 	}
 
-	f.SetColWidth(b.SheetName, "A", "A", 12)
-	f.SetColWidth(b.SheetName, "B", "K", 9.5)
-	f.SetColWidth(b.SheetName, "L", "L", 10)
+	// f.SetColWidth(b.SheetName, "A", "A", 12)
+	// f.SetColWidth(b.SheetName, "B", "K", 9.5)
+	// f.SetColWidth(b.SheetName, "L", "L", 10)
+
+	f.SetColWidth(b.SheetName, "A", "A", 15)
+	f.SetColWidth(b.SheetName, "B", "B", 15)
+	f.SetColWidth(b.SheetName, "C", "G", 7)
+	// f.SetColWidth(b.SheetName, "C", "H", 9.5)
+	f.SetColWidth(b.SheetName, "H", "K", 10)
+	f.SetColWidth(b.SheetName, "L", "L", 11)
 	f.SetPageMargins(b.SheetName, excelize.PageMarginTop(0), excelize.PageMarginLeft(0), excelize.PageMarginRight(0))
 	return b
 }