Merge branch 'dev/2.4_rai_new'

controller/contract/register.go

@@ -1945,8 +1945,15 @@ func ExportInvoiceList(c *gin.Context, req fms.ContractInvoiceListReq, results *
 	// 前两行显示合计金额, 第三行空出与列表数据隔一行
 	rowA := sheet.AddRow()
 	cellAA := rowA.AddCell()
-	cellAA.SetString(fmt.Sprintf("已开票合计金额（换算后）：%.2f（元）", results.AmountTotal))
-	rowBData := "已开票金额："
+	rowBData := ""
+	if req.InvoiceType == 1 {
+		cellAA.SetString(fmt.Sprintf("已开票合计金额（换算后）：%.2f（元）", results.AmountTotal))
+		rowBData = "已开票金额："
+	} else {
+		cellAA.SetString(fmt.Sprintf("已到款合计金额（换算后）：%.2f（元）", results.AmountTotal))
+		rowBData = "已到款金额："
+	}
+
 	for _, v := range results.CurrencyTotal {
 		rowBData += fmt.Sprintf("%s%.2f(%s)  ", v.Name, v.Amount, v.UnitName)
 	}
@@ -1956,7 +1963,7 @@ func ExportInvoiceList(c *gin.Context, req fms.ContractInvoiceListReq, results *
 
 	// 列表数据表头
 	titles := []string{"合同编号", "套餐类型", fmt.Sprintf("%s金额", listName), "金额单位", "换算金额（元）",
-		fmt.Sprintf("%s日期", listName), "销售", "备注"}
+		fmt.Sprintf("%s日期", listName), "备注"}
 	titleRow := sheet.AddRow()
 	titleRow.SetHeight(40)
 	for i := range titles {
@@ -1978,7 +1985,6 @@ func ExportInvoiceList(c *gin.Context, req fms.ContractInvoiceListReq, results *
 		dataRow.AddCell().SetString(v.UnitName)                                // 金额单位
 		dataRow.AddCell().SetString(fmt.Sprint(v.Amount))                      // 换算金额(元)
 		dataRow.AddCell().SetString(v.InvoiceDate)                             // 开票日
-		dataRow.AddCell().SetString(v.SellerName)                              // 销售
 		dataRow.AddCell().SetString(v.Remark)                                  // 备注
 	}