|
@@ -5758,9 +5758,16 @@ FROM
|
|
|
airPriceStr += $" {_EnterExitCosts.AirTD.ToString("#0.00")} 元/人(头等舱)";
|
|
|
}
|
|
|
|
|
|
+ string twoItemRemark = "备注:";
|
|
|
+ if (!string.IsNullOrEmpty(_EnterExitCosts.TwoItemRemark))
|
|
|
+ {
|
|
|
+ twoItemRemark = _EnterExitCosts.TwoItemRemark;
|
|
|
+ }
|
|
|
+
|
|
|
dic.Add("AirTotalStr", airTotalStr);
|
|
|
dic.Add("AirPriceStr", airPriceStr);
|
|
|
dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
|
|
|
+ dic.Add("TwoItemRemark", twoItemRemark);
|
|
|
|
|
|
NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
|
|
|
Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
|
|
@@ -8591,11 +8598,11 @@ FROM
|
|
|
}
|
|
|
else if (dto.ExportType == 2) //表格
|
|
|
{
|
|
|
-
|
|
|
+ return Ok(JsonView(400, "因需关联团组信息和客户信息,请在出入境费用明细里下载!", ""));
|
|
|
}
|
|
|
else if (dto.ExportType == 3)
|
|
|
{
|
|
|
-
|
|
|
+ return Ok(JsonView(400, "因需关联团组信息和客户信息,请在出入境费用明细里下载!", ""));
|
|
|
}
|
|
|
|
|
|
return Ok(JsonView(400, "只可导出明细表!", ""));
|