|
|
@@ -6082,7 +6082,7 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
if (item.IsAuditGM == 1)
|
|
|
{
|
|
|
- yesPayment += $"已支付团款（{item.PayPercentage}）：{item.PayMoney} {currObj.Remark}（如有需要，请在此处填写明细）\r\n";
|
|
|
+ yesPayment += $"已支付团款（{(int)item.PayPercentage}%）：{item.PayMoney} {currObj.Remark}（如有需要，请在此处填写明细）\r\n";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -6324,9 +6324,9 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
IOOperatorHelper io = new IOOperatorHelper();
|
|
|
var byts = io.ConvertZipStream(Zips);
|
|
|
- io.ByteToFile(byts, AppSettingsHelper.Get("ExcelBasePath") + "\\ExportLocalGuidePriceDetail\\地接费用明细.zip");
|
|
|
+ io.ByteToFile(byts, AppSettingsHelper.Get("ExcelBasePath") + $"\\ExportLocalGuidePriceDetail\\{group.TeamName}_地接费用明细.zip");
|
|
|
//http://132.232.92.186:24/Office/Word/EnterExitCost/File/
|
|
|
- jw = JsonView(true, "success" , new { url = AppSettingsHelper.Get("OfficeBaseUrl") + "\\Office\\Excel\\ExportLocalGuidePriceDetail\\地接费用明细.zip" });
|
|
|
+ jw = JsonView(true, "success" , new { url = AppSettingsHelper.Get("OfficeBaseUrl") + $"\\Office\\Excel\\ExportLocalGuidePriceDetail\\{group.TeamName}_地接费用明细.zip" });
|
|
|
}
|
|
|
else
|
|
|
{
|
yuanrf