update

boxcost/api/bill-purchase-excel.go

@@ -396,24 +396,3 @@ func (b *PurchaseBillExcel) FormatToEmpty(str *string) {
 	}
 
 }
-
-func (b *PurchaseBillExcel) PrintPurchType() string {
-	return "process"
-}
-
-func (b *PurchaseBillExcel) SetContent(content *model.PurchaseBill) {
-	b.Content = content
-
-}
-func (b *PurchaseBillExcel) SetTitle(title string) {
-	b.Title = title
-
-}
-func (b *PurchaseBillExcel) SetOffset(offset int) {
-	b.Offset = offset
-
-}
-func (b *PurchaseBillExcel) SetSignatures(sign []*model.Signature) {
-	b.Signatures = sign
-
-}

boxcost/api/bill.go

@@ -225,11 +225,7 @@ func DownLoadBills(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	f.SetActiveSheet(index)
 	f.SetDefaultFont("宋体")
 
-	var billExcel IPurchBill
-
-	// if bill.Process != nil {
-	// 	billExcel = NewProcessBill(f)
-	// }
+	var billExcel *PurchaseBillExcel
 
 	if len(bill.Paper) > 0 {
 		billExcel = NewPurchaseBill(f)
@@ -247,13 +243,13 @@ func DownLoadBills(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 				Query:       repo.Map{"_id": bson.M{"$in": bill.SignUsers}},
 				Sort:        bson.M{"sort": 1}, // 升序
 			}, &signs)
-			billExcel.SetSignatures(signs)
+			billExcel.Signatures = signs
 		}
 
 	}
-	billExcel.SetContent(&bill)
+	billExcel.Content = &bill
 	companyName := getCompanyName(apictx)
-	billExcel.SetTitle(fmt.Sprintf("%s原材料采购单", companyName))
+	billExcel.Title = fmt.Sprintf("%s原材料采购单", companyName)
 
 	//设置对应的数据
 	billExcel.Draws()

boxcost/api/plan.go

@@ -136,21 +136,16 @@ func DownLoadPlan(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 			}, &purchase)
 			fmt.Println(purchase)
 			if found {
-				var billExcel IPurchBill
-				// if purchase.Process != nil {
-				// 	billExcel = NewProcessBill(f)
-				// }
-
+				var billExcel *PurchaseBillExcel
 				if len(purchase.Paper) > 0 {
 					billExcel = NewPurchaseBill(f)
 				}
-				// purchaseExcel := NewPurchaseBill(f)
-				billExcel.SetContent(&purchase)
-				billExcel.SetTitle(fmt.Sprintf("%s原材料采购单", companyName))
-				billExcel.SetOffset(offset)
-				// billExcel.Title = fmt.Sprintf("%s原材料采购单", companyName)
-				//设置对应的数据
-				// purchaseExcel.Offset = offset
+				if billExcel == nil {
+					return nil, errors.New("数据未找到")
+				}
+				billExcel.Content = &purchase
+				billExcel.Title = fmt.Sprintf("%s原材料采购单", companyName)
+				billExcel.Offset = offset
 				billExcel.Draws()
 
 				offset += 15