update

boxcost/api/bill-produce-excel.go

@@ -131,6 +131,21 @@ func (b *ProduceBillExcel) drawSubTitles() error {
 		return nil
 	}
 
+	drawLall := func(rowIndex int, value string) error {
+		//左边1
+		left1Cell := fmt.Sprintf("A%d", rowIndex)
+		err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("K%d", rowIndex))
+		if err != nil {
+			return err
+		}
+		err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+		if err != nil {
+			return err
+		}
+		b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+		return nil
+	}
+
 	if !b.Content.IsPrint {
 		drawLeft = func(rowIndex int, value string) error {
 			//左边1
@@ -160,6 +175,21 @@ func (b *ProduceBillExcel) drawSubTitles() error {
 			b.Excel.SetCellValue(b.SheetName, right1Cell, value)
 			return nil
 		}
+
+		drawLall = func(rowIndex int, value string) error {
+			//左边1
+			left1Cell := fmt.Sprintf("A%d", rowIndex)
+			err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("H%d", rowIndex))
+			if err != nil {
+				return err
+			}
+			err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+			if err != nil {
+				return err
+			}
+			b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+			return nil
+		}
 		if b.Content.IsLam {
 			drawLeft = func(rowIndex int, value string) error {
 				//左边1
@@ -190,6 +220,21 @@ func (b *ProduceBillExcel) drawSubTitles() error {
 				return nil
 			}
 
+			drawLall = func(rowIndex int, value string) error {
+				//左边1
+				left1Cell := fmt.Sprintf("A%d", rowIndex)
+				err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("I%d", rowIndex))
+				if err != nil {
+					return err
+				}
+				err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+				if err != nil {
+					return err
+				}
+				b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+				return nil
+			}
+
 		}
 	}
 
@@ -217,7 +262,7 @@ func (b *ProduceBillExcel) drawSubTitles() error {
 	b.Excel.SetRowHeight(b.SheetName, b.Row+2, 21)
 
 	// 第四行
-	drawLeft(b.Row+3, "包含工序："+b.Content.CompProduceName)
+	drawLall(b.Row+3, "包含工序："+b.Content.CompProduceName)
 
 	return nil
 }

boxcost/api/bill-product-excel.go

@@ -104,6 +104,21 @@ func (b *ProductBillExcel) drawSubTitles() error {
 		return nil
 	}
 
+	drawLall := func(rowIndex int, value string) error {
+		//左边1
+		left1Cell := fmt.Sprintf("A%d", rowIndex)
+		err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("H%d", rowIndex))
+		if err != nil {
+			return err
+		}
+		err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+		if err != nil {
+			return err
+		}
+		b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+		return nil
+	}
+
 	//第一行
 	drawLeft(b.Row, "类别："+b.Content.Type)
 	drawRight(b.Row, "单号："+b.Content.SerialNumber)
@@ -127,7 +142,7 @@ func (b *ProductBillExcel) drawSubTitles() error {
 	drawRight(b.Row+2, "状态："+status)
 	b.Excel.SetRowHeight(b.SheetName, b.Row+2, 21)
 	// 第四行
-	drawLeft(b.Row+3, "包含工序："+b.Content.CompProduceName)
+	drawLall(b.Row+3, "包含工序："+b.Content.CompProduceName)
 
 	return nil
 }
@@ -237,18 +252,10 @@ func (b *ProductBillExcel) drawTableFooter() error {
 	})
 
 	sendToStartCell := fmt.Sprintf("A%d", b.Row)
-	// sendToEndCell := fmt.Sprintf("G%d", b.Row)
-	// supplierStartCell := fmt.Sprintf("H%d", b.Row)
-	// supplierEndCell := fmt.Sprintf("J%d", b.Row)
-
-	// !!isPdf
-	// if b.IsPdf == "true" {
 	sendToEndCell := fmt.Sprintf("E%d", b.Row)
 	supplierStartCell := fmt.Sprintf("F%d", b.Row)
 	supplierEndCell := fmt.Sprintf("H%d", b.Row)
 
-	// }
-
 	b.Excel.MergeCell(b.SheetName, sendToStartCell, sendToEndCell)
 	b.Excel.SetCellStyle(b.SheetName, sendToStartCell, sendToEndCell, styleLeft)
 	b.Excel.SetCellValue(b.SheetName, sendToStartCell, "送货地址："+b.Content.SendTo)

boxcost/api/bill-purchase-excel.go

@@ -106,6 +106,21 @@ func (b *PurchaseBillExcel) drawSubTitles() error {
 		return nil
 	}
 
+	drawLall := func(rowIndex int, value string) error {
+		//左边1
+		left1Cell := fmt.Sprintf("A%d", rowIndex)
+		err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("J%d", rowIndex))
+		if err != nil {
+			return err
+		}
+		err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+		if err != nil {
+			return err
+		}
+		b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+		return nil
+	}
+
 	//第一行
 	drawLeft(b.Row, "类别："+b.Content.Type)
 	drawRight(b.Row, "单号："+b.Content.SerialNumber)
@@ -130,7 +145,7 @@ func (b *PurchaseBillExcel) drawSubTitles() error {
 	b.Excel.SetRowHeight(b.SheetName, b.Row+2, 21)
 
 	// 第四行
-	drawLeft(b.Row+3, "包含工序："+b.Content.CompProduceName)
+	drawLall(b.Row+3, "包含工序："+b.Content.CompProduceName)
 
 	return nil
 }