|
|
@@ -4047,14 +4047,6 @@ namespace OASystem.API.Controllers
|
|
|
//文件名
|
|
|
string strFileName = _DelegationInfo.TeamName + "出入境费用.docx";
|
|
|
|
|
|
- //文件流下载
|
|
|
- //byte[] bytes = null;
|
|
|
- //using (MemoryStream stream = new MemoryStream())
|
|
|
- //{
|
|
|
- // doc.Save(stream, Aspose.Words.SaveFormat.Doc);
|
|
|
- // bytes = stream.ToArray();
|
|
|
- //}
|
|
|
-
|
|
|
doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
|
|
|
string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
|
|
|
return Ok(JsonView(true, "成功", new { Url = url }));
|
|
|
@@ -4239,7 +4231,7 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
|
|
|
|
//总计
|
|
|
- decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.CityTranffic + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
|
|
|
+ decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
|
|
|
|
|
|
//国际旅费
|
|
|
|
leiy