fix

controller/census/seller.go

@@ -213,10 +213,10 @@ func ExportGroupInvoiceList(c *gin.Context, list []*fms.CensusSellerGroupInvoice
 	// 填充数据
 	for k, v := range list {
 		dataRow := sheet.AddRow()
-		dataRow.AddCell().SetString(fmt.Sprint(k + 1))            // 排名
-		dataRow.AddCell().SetString(v.GroupName)                  // 销售组别
-		dataRow.AddCell().SetString(fmt.Sprintf("%.2f", v.InvoiceAmount))  // 开票金额
-		dataRow.AddCell().SetString(fmt.Sprint(v.GroupRate, "%")) // 组别占比
+		dataRow.AddCell().SetString(fmt.Sprint(k + 1))                    // 排名
+		dataRow.AddCell().SetString(v.GroupName)                          // 销售组别
+		dataRow.AddCell().SetString(fmt.Sprintf("%.2f", v.InvoiceAmount)) // 开票金额
+		dataRow.AddCell().SetString(fmt.Sprint(v.GroupRate, "%"))         // 组别占比
 	}
 
 	// 输出文件
@@ -450,17 +450,17 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 	}
 
 	var departmentId int
-	if req.SellerType == 1 {
-		departmentId = crm.SellerDepartmentId
-	} else if req.SellerType == 2 {
-		departmentId = crm.RaiSellerDepartmentId
-	} else if req.SellerType == 0 {
-		resp.Fail("请选择销售类型", c)
-		return
-	} else {
-		resp.Fail("请选择正确的销售类型", c)
-		return
-	}
+	//if req.SellerType == 1 {
+	//	departmentId = crm.SellerDepartmentId
+	//} else if req.SellerType == 2 {
+	//	departmentId = crm.RaiSellerDepartmentId
+	//} else if req.SellerType == 0 {
+	//	resp.Fail("请选择销售类型", c)
+	//	return
+	//} else {
+	//	resp.Fail("请选择正确的销售类型", c)
+	//	return
+	//}
 
 	var totalMoneySlice []float64
 	historyTime, _ := time.Parse(utils.FormatDate, "2023-04-01")
@@ -831,6 +831,11 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 	adminPars := make([]interface{}, 0)
 	adminCond := ` department_id = %d `
 	adminCond = fmt.Sprintf(adminCond, departmentId)
+
+	if !req.ShowResign {
+		adminCond += ` AND enabled = 1 `
+	}
+
 	adminList, e := adminOB.List(adminCond, adminPars)
 	if e != nil {
 		resp.FailMsg("获取失败", "获取销售列表失败, Err: "+e.Error(), c)
@@ -965,12 +970,12 @@ func ExportInvoiceList(c *gin.Context, list []*fms.CensusSellerInvoiceItem, req
 	// 填充数据
 	for k, v := range list {
 		dataRow := sheet.AddRow()
-		dataRow.AddCell().SetString(fmt.Sprint(k + 1))             // 排名
-		dataRow.AddCell().SetString(v.SellerName)                  // 销售员
-		dataRow.AddCell().SetString(v.GroupName)                   // 销售组别
-		dataRow.AddCell().SetString(fmt.Sprintf("%.2f", v.InvoiceAmount))   // 开票金额
-		dataRow.AddCell().SetString(fmt.Sprint(v.GroupRate, "%"))  // 小组占比
-		dataRow.AddCell().SetString(fmt.Sprint(v.SellerRate, "%")) // 全员占比
+		dataRow.AddCell().SetString(fmt.Sprint(k + 1))                    // 排名
+		dataRow.AddCell().SetString(v.SellerName)                         // 销售员
+		dataRow.AddCell().SetString(v.GroupName)                          // 销售组别
+		dataRow.AddCell().SetString(fmt.Sprintf("%.2f", v.InvoiceAmount)) // 开票金额
+		dataRow.AddCell().SetString(fmt.Sprint(v.GroupRate, "%"))         // 小组占比
+		dataRow.AddCell().SetString(fmt.Sprint(v.SellerRate, "%"))        // 全员占比
 	}
 
 	// 输出文件