|
|
@@ -2331,7 +2331,7 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
|
|
|
sheet.AddRow()
|
|
|
|
|
|
// 数据表头
|
|
|
- rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间", "合同金额", "金额单位", "未开票金额", "套餐类型", "销售", "销售组别", "销售类型"}
|
|
|
+ rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间", "合同金额", "金额单位", "未开票金额", "未开票换算金额", "套餐类型", "销售", "销售组别", "销售类型"}
|
|
|
titleRow := sheet.AddRow()
|
|
|
for i := range rowTitle {
|
|
|
v := titleRow.AddCell()
|
|
|
@@ -2438,7 +2438,8 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
|
|
|
|
|
|
} else {
|
|
|
|
|
|
- dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountTotal)) // 未开票金额
|
|
|
+ dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountOriginTotal)) // 未开票金额
|
|
|
+ dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountTotal)) // 未开票换算金额
|
|
|
|
|
|
dataRow.AddCell().SetString(serviceProductIdMap[item.ServiceProductId]) // 套餐类型
|
|
|
|
zwxi