|
|
@@ -331,7 +331,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
|
|
|
sheet.AddRow()
|
|
|
|
|
|
// 表头, 套餐动态获取
|
|
|
- rowTitle := []string{"序号", "客户名称", "是否新客户", "合同有效期", "开票日", "开票金额", "到款日", "到款金额", "付款方式", "销售",
|
|
|
+ rowTitle := []string{"序号", "客户名称", "代付方", "是否新客户", "合同有效期", "开票日", "开票金额", "到款日", "到款金额", "付款方式", "销售",
|
|
|
"销售组别", "销售类型"}
|
|
|
serviceTempCond := ``
|
|
|
serviceTempPars := make([]interface{}, 0)
|
|
|
@@ -429,6 +429,10 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
|
|
|
colB := dataRow.AddCell()
|
|
|
colB.VMerge = mergeRowNum
|
|
|
colB.SetString(v.CompanyName)
|
|
|
+ // 代付方
|
|
|
+ colE := dataRow.AddCell()
|
|
|
+ colE.VMerge = mergeRowNum
|
|
|
+ colE.SetString(v.ActualPayCompanies)
|
|
|
// 是否新客户
|
|
|
colC := dataRow.AddCell()
|
|
|
colC.VMerge = mergeRowNum
|
|
|
@@ -534,8 +538,8 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
|
|
|
// 客户姓名/销售
|
|
|
if req.Keyword != "" {
|
|
|
kw := "%" + req.Keyword + "%"
|
|
|
- cond += ` AND b.company_name LIKE ?`
|
|
|
- pars = append(pars, kw)
|
|
|
+ cond += ` AND (b.company_name LIKE ? OR b.actual_pay_companies LIKE ? )`
|
|
|
+ pars = append(pars, kw, kw)
|
|
|
}
|
|
|
if req.SellerIds != "" {
|
|
|
sellerIds := strings.Split(req.SellerIds, ",")
|
ziwen