|
@@ -143,19 +143,8 @@ func (this *OverseasCustomController) CustomList() {
|
|
|
}
|
|
|
|
|
|
for _, v := range list {
|
|
|
- //if v.Source == 1 && v.OverseasStatus != "" {
|
|
|
- // v.CompanyStatus = v.OverseasStatus
|
|
|
- //}
|
|
|
- if v.Source == 1 {
|
|
|
- v.CompanyStatus = v.Status
|
|
|
- } else {
|
|
|
- if v.Status == "正式" || v.Status == "永续" {
|
|
|
- v.CompanyStatus = "正式"
|
|
|
- } else if v.Status == "试用" {
|
|
|
- v.CompanyStatus = "试用"
|
|
|
- } else {
|
|
|
- v.CompanyStatus = "关闭"
|
|
|
- }
|
|
|
+ if v.Source == 1 && v.OverseasStatus != "" {
|
|
|
+ v.CompanyStatus = v.OverseasStatus
|
|
|
}
|
|
|
}
|
|
|
page = paging.GetPaging(currentIndex, pageSize, total)
|
|
@@ -301,8 +290,7 @@ func (this *OverseasCustomController) CustomStatusSet() {
|
|
|
var resetBtn int
|
|
|
|
|
|
if item.OverseasStatus == "正式" && item.ResetBtn == 2 { //重置,获取当前客户的状态
|
|
|
- //overseasStatus = item.CompanyStatus
|
|
|
- overseasStatus = ""
|
|
|
+ overseasStatus = item.CompanyStatus
|
|
|
resetBtn = 1
|
|
|
} else if item.OverseasStatus == "试用" && (item.ResetBtn == 1 || item.ResetBtn == 0) { //转正式,获取当前客户的状态
|
|
|
overseasStatus = "正式"
|