|
@@ -3893,13 +3893,13 @@ namespace OASystem.API.Controllers
|
|
|
string airPayType = setDatas.Find(it => it.Id == payInfo.PayDId)?.Name ?? "-";
|
|
string airPayType = setDatas.Find(it => it.Id == payInfo.PayDId)?.Name ?? "-";
|
|
|
priName = $"{flightsCode}【{airPayType}】";
|
|
priName = $"{flightsCode}【{airPayType}】";
|
|
|
break;
|
|
break;
|
|
|
- case 98: // 98 其他款项
|
|
|
|
|
|
|
+ case 98: // 98 其他款项
|
|
|
priName = $"[费用名称:{otherMoneyDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
priName = $"[费用名称:{otherMoneyDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
|
break;
|
|
break;
|
|
|
case 285: // 285 收款退还
|
|
case 285: // 285 收款退还
|
|
|
priName = $"[费用名称:{refundPaymentDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
priName = $"[费用名称:{refundPaymentDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
|
break;
|
|
break;
|
|
|
- case 1015: // 1015 超支费用
|
|
|
|
|
|
|
+ case 1015: // 1015 超支费用
|
|
|
priName = $"[费用名称:{ExtraCostDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
priName = $"[费用名称:{ExtraCostDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.PriceName ?? " -"}]";
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
@@ -3958,7 +3958,7 @@ namespace OASystem.API.Controllers
|
|
|
PayRate = hotelContent.Rate,
|
|
PayRate = hotelContent.Rate,
|
|
|
CNYSubTotalAmount = _CNYSubTotalAmount1,
|
|
CNYSubTotalAmount = _CNYSubTotalAmount1,
|
|
|
AuditStatus = payInfo.IsAuditGM,
|
|
AuditStatus = payInfo.IsAuditGM,
|
|
|
- IsBgColorShown = Setting_IsBgColorShown(payInfo.CTable, payInfo.IsAuditGM)
|
|
|
|
|
|
|
+ IsBgColorShown = ShouldShowBackgroundColor(payInfo.CTable, payInfo.IsAuditGM,groupInfo.TeamDid)
|
|
|
};
|
|
};
|
|
|
string remaksDescription1 = $"【{childInfo1.PayType}】【{childInfo1.ModuleName}】{rouNumber}、[申请人:{childInfo1.Applicant}]{subPriceName}[收款方:{childInfo1.Payee}] {childInfo1.PayCurrCode} {_PaymentAmount1:#0.00}、CNY:{childInfo1.CNYSubTotalAmount:#0.00}(团组:{groupInfo.TeamName})";
|
|
string remaksDescription1 = $"【{childInfo1.PayType}】【{childInfo1.ModuleName}】{rouNumber}、[申请人:{childInfo1.Applicant}]{subPriceName}[收款方:{childInfo1.Payee}] {childInfo1.PayCurrCode} {_PaymentAmount1:#0.00}、CNY:{childInfo1.CNYSubTotalAmount:#0.00}(团组:{groupInfo.TeamName})";
|
|
|
|
|
|
|
@@ -4006,7 +4006,7 @@ namespace OASystem.API.Controllers
|
|
|
PayRate = payInfo.DayRate,
|
|
PayRate = payInfo.DayRate,
|
|
|
CNYSubTotalAmount = _CNYSubTotalAmount,
|
|
CNYSubTotalAmount = _CNYSubTotalAmount,
|
|
|
AuditStatus = payInfo.IsAuditGM,
|
|
AuditStatus = payInfo.IsAuditGM,
|
|
|
- IsBgColorShown = Setting_IsBgColorShown(payInfo.CTable, payInfo.IsAuditGM)
|
|
|
|
|
|
|
+ IsBgColorShown = ShouldShowBackgroundColor(payInfo.CTable, payInfo.IsAuditGM,groupInfo.TeamDid)
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人:{childInfo.Applicant}]{priName}[收款方:{childInfo.Payee}] {childInfo.PayCurrCode} {_PaymentAmount:#0.00}、CNY:{childInfo.CNYSubTotalAmount:#0.00}(团组:{groupInfo.TeamName})";
|
|
string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人:{childInfo.Applicant}]{priName}[收款方:{childInfo.Payee}] {childInfo.PayCurrCode} {_PaymentAmount:#0.00}、CNY:{childInfo.CNYSubTotalAmount:#0.00}(团组:{groupInfo.TeamName})";
|
|
@@ -4034,22 +4034,41 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
|
- /// 设置背景颜色显示与否
|
|
|
|
|
- /// 费用类型限制:76-酒店预订、79-车/导游地接、85-机票预订
|
|
|
|
|
|
|
+ /// 判断是否显示背景颜色
|
|
|
|
|
+ /// 费用类型限制:76-酒店预订、79-车/导游地接、85-机票预订、98-其他款项(团组类型为会务、高校)
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
- /// <param name="cType"></param>
|
|
|
|
|
- /// <param name="auditStatus"></param>
|
|
|
|
|
- /// <returns></returns>
|
|
|
|
|
- private static bool Setting_IsBgColorShown(int cType, int auditStatus)
|
|
|
|
|
|
|
+ /// <param name="costType">费用类型</param>
|
|
|
|
|
+ /// <param name="auditStatus">审核状态</param>
|
|
|
|
|
+ /// <param name="groupType">团组类型</param>
|
|
|
|
|
+ /// <returns>是否显示背景颜色</returns>
|
|
|
|
|
+ private static bool ShouldShowBackgroundColor(int costType, int auditStatus, int groupType)
|
|
|
{
|
|
{
|
|
|
- //费用类型限制
|
|
|
|
|
- var types = new List<int>() { 76, 79, 85, };
|
|
|
|
|
|
|
+ // 定义允许的费用类型集合
|
|
|
|
|
+ var allowedCostTypes = new HashSet<int> { 76, 79, 85, 98 };
|
|
|
|
|
|
|
|
- if (types.Contains(cType) && auditStatus == 1)
|
|
|
|
|
|
|
+ // 基本条件检查
|
|
|
|
|
+ if (!allowedCostTypes.Contains(costType) || auditStatus != 1)
|
|
|
{
|
|
{
|
|
|
- return true;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
- return false;
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 特殊处理:费用类型98需要检查团组类型
|
|
|
|
|
+ if (costType == 98)
|
|
|
|
|
+ {
|
|
|
|
|
+ // 定义允许的团组类型集合
|
|
|
|
|
+ var allowedGroupTypes = new HashSet<int>
|
|
|
|
|
+ {
|
|
|
|
|
+ 302, // 成都-会务活动
|
|
|
|
|
+ 691, // 四川-会务活动
|
|
|
|
|
+ 762, // 四川-赛事项目收入
|
|
|
|
|
+ 1047, // 成都-赛事项目收入
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ return allowedGroupTypes.Contains(groupType);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 其他允许的费用类型直接返回true
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|