修改汇总表格式

boxcost/api/plan-summary-excel.go

@@ -117,19 +117,19 @@ func (b *PlanSummaryExcel) drawTableTitle() error {
 
 	drawCol("A", "产品名称")
 	drawCol("B", "产品部件名称")
-	drawCol2("C", "D", "类型/项目", "类型", "项目")
-	drawCol("E", "下单数量")
-	drawCol("F", "实际数量")
-	drawCol("G", "状态") // 生成订单状态 审核状态 发送状态 完成状态
-	drawCol("H", "供应商名称")
-	drawCol("I", "单价")
-	drawCol3("J", "K", "L", "规格", "厚度(纸克)", "长", "宽")
-	drawCol("M", "单位")
-	drawCol("N", "下单单价")
-	drawCol("O", "预算金额")
-	drawCol("P", "实际金额")
-	drawCol("Q", "订单编号")
-	drawCol("R", "下单日期")
+	drawCol("C", "订单编号")
+	drawCol("D", "下单日期")
+	drawCol2("E", "F", "类型/项目", "类型", "项目")
+	drawCol("G", "下单数量")
+	drawCol("H", "实际数量")
+	drawCol("I", "状态") // 生成订单状态 审核状态 发送状态 完成状态
+	drawCol("J", "供应商名称")
+	drawCol("K", "单价")
+	drawCol3("L", "M", "N", "规格", "厚度(纸克)", "长", "宽")
+	drawCol("O", "单位")
+	drawCol("P", "下单单价")
+	drawCol("Q", "预算金额")
+	drawCol("R", "实际金额")
 	drawCol("S", "备注")
 	return nil
 }
@@ -257,8 +257,8 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 							cates[billFlag] = append(cates[billFlag], b.Row)
 						}
 
-						b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm,
-							matHeigth, matWidth, unit, price, budgetPrice, realPrice, "-", "-", stage.Remark)
+						b.drawRow(b.Row, "", "", "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm,
+							matHeigth, matWidth, unit, price, budgetPrice, realPrice, stage.Remark)
 						// if stage.SupplierInfo != nil {
 						// 	cates[stage.SupplierInfo.Name] = append(cates[stage.SupplierInfo.Name], b.Row)
 
@@ -271,10 +271,10 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 						if len(billInfo) == 2 {
 							mergeStartRow := cate[0]
 							mergeEndRow := cate[len(cate)-1]
-							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("Q%d", mergeStartRow), fmt.Sprintf("Q%d", mergeEndRow))
-							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("Q%d", mergeEndRow), billInfo[0])
-							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("R%d", mergeStartRow), fmt.Sprintf("R%d", mergeEndRow))
-							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("R%d", mergeEndRow), billInfo[1])
+							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("C%d", mergeStartRow), fmt.Sprintf("C%d", mergeEndRow))
+							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("C%d", mergeEndRow), billInfo[0])
+							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("D%d", mergeStartRow), fmt.Sprintf("D%d", mergeEndRow))
+							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("D%d", mergeEndRow), billInfo[1])
 						}
 
 					}
@@ -461,8 +461,8 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 									cates[billFlag] = append(cates[billFlag], b.Row)
 								}
 
-								b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit),
-									stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice, "-", "-", stage.Remark)
+								b.drawRow(b.Row, "", "", "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit),
+									stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice, stage.Remark)
 								// if stage.SupplierInfo != nil {
 								// 	cates[stage.SupplierInfo.Name] = append(cates[stage.SupplierInfo.Name], b.Row)
 
@@ -478,10 +478,10 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 						if len(billInfo) == 2 {
 							mergeStartRow := cate[0]
 							mergeEndRow := cate[len(cate)-1]
-							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("Q%d", mergeStartRow), fmt.Sprintf("Q%d", mergeEndRow))
-							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("Q%d", mergeEndRow), billInfo[0])
-							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("R%d", mergeStartRow), fmt.Sprintf("R%d", mergeEndRow))
-							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("R%d", mergeEndRow), billInfo[1])
+							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("C%d", mergeStartRow), fmt.Sprintf("C%d", mergeEndRow))
+							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("C%d", mergeEndRow), billInfo[0])
+							b.Excel.MergeCell(b.SheetName, fmt.Sprintf("D%d", mergeStartRow), fmt.Sprintf("D%d", mergeEndRow))
+							b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("D%d", mergeEndRow), billInfo[1])
 						}
 					}
 
@@ -605,11 +605,12 @@ func NewPlanSummaryExcel(f *excelize.File) *PlanSummaryExcel {
 	}
 
 	f.SetColWidth(b.SheetName, "A", "D", 16)
-	f.SetColWidth(b.SheetName, "E", "G", 12)
-	f.SetColWidth(b.SheetName, "H", "H", 25)
-	f.SetColWidth(b.SheetName, "I", "L", 16)
-	f.SetColWidth(b.SheetName, "M", "M", 10)
-	f.SetColWidth(b.SheetName, "N", "P", 13)
+	f.SetColWidth(b.SheetName, "E", "E", 12)
+	f.SetColWidth(b.SheetName, "F", "F", 16)
+	f.SetColWidth(b.SheetName, "G", "I", 12)
+	f.SetColWidth(b.SheetName, "J", "J", 25)
+	f.SetColWidth(b.SheetName, "K", "L", 16)
+	f.SetColWidth(b.SheetName, "M", "P", 12)
 	f.SetColWidth(b.SheetName, "Q", "R", 16)
 	f.SetColWidth(b.SheetName, "S", "S", 20)
 	f.SetPageMargins(b.SheetName, excelize.PageMarginTop(0), excelize.PageMarginLeft(0), excelize.PageMarginRight(0))