|
@@ -1090,7 +1090,7 @@ namespace OASystem.API.Controllers
|
|
|
//住宿费 伙食费 公杂费 培训费 选中才计算出费用
|
|
//住宿费 伙食费 公杂费 培训费 选中才计算出费用
|
|
|
|
|
|
|
|
//住宿费 选中赋值
|
|
//住宿费 选中赋值
|
|
|
- List<Grp_DayAndCost> dac1 = new List<Grp_DayAndCost>();
|
|
|
|
|
|
|
+ List<Grp_DayAndCost> dac1 = new List<Grp_DayAndCost>();
|
|
|
if (_EnterExitCosts.ChoiceThree == 1) dac1 = _DayAndCosts.Where(it => it.Type == 1).ToList(); //住宿费
|
|
if (_EnterExitCosts.ChoiceThree == 1) dac1 = _DayAndCosts.Where(it => it.Type == 1).ToList(); //住宿费
|
|
|
|
|
|
|
|
//伙食费 选中赋值
|
|
//伙食费 选中赋值
|
|
@@ -1378,7 +1378,7 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
placeArr.Clear();
|
|
placeArr.Clear();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
TeableBookmarkArr.Add("zsinfo", zsinfo); //住宿费详情
|
|
TeableBookmarkArr.Add("zsinfo", zsinfo); //住宿费详情
|
|
|
TeableBookmarkArr.Add("hs", dac2.Sum(x => Convert.ToDecimal(x.SubTotal)).ToString("#0.00") + " 元"); //伙食费
|
|
TeableBookmarkArr.Add("hs", dac2.Sum(x => Convert.ToDecimal(x.SubTotal)).ToString("#0.00") + " 元"); //伙食费
|
|
|
TeableBookmarkArr.Add("hsinfo", hsinfo); //伙食费详情
|
|
TeableBookmarkArr.Add("hsinfo", hsinfo); //伙食费详情
|
|
@@ -1794,7 +1794,7 @@ namespace OASystem.API.Controllers
|
|
|
.ToListAsync();
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
decimal visaFee = costInfo?.Visa ?? 0.00M, //签证费
|
|
decimal visaFee = costInfo?.Visa ?? 0.00M, //签证费
|
|
|
- //intercityFare = costInfo?.CityTranffic ?? 0.00M, //城市区间交通费
|
|
|
|
|
|
|
+ //intercityFare = costInfo?.CityTranffic ?? 0.00M, //城市区间交通费
|
|
|
hotelFee = hotelCostInfos.Sum(x => x.Cost), //住宿费
|
|
hotelFee = hotelCostInfos.Sum(x => x.Cost), //住宿费
|
|
|
hotelCNYEquivalent = hotelCostInfos.Sum(x => x.SubTotal), //住宿费CNY折算价
|
|
hotelCNYEquivalent = hotelCostInfos.Sum(x => x.SubTotal), //住宿费CNY折算价
|
|
|
hotelRate = rateInfos.FirstOrDefault(x => x.CurrencyCode.Equals(hotelCostInfos.FirstOrDefault().Name))?.Rate ?? 0.00M; //住宿费汇率
|
|
hotelRate = rateInfos.FirstOrDefault(x => x.CurrencyCode.Equals(hotelCostInfos.FirstOrDefault().Name))?.Rate ?? 0.00M; //住宿费汇率
|
|
@@ -2644,7 +2644,7 @@ namespace OASystem.API.Controllers
|
|
|
if (sum_fr <= 0m && (sum_fr + sum_extra) <= 0m && sum_refund <= 0m && ((sum_fr + sum_extra) - (sum_pr - sum_refund)) <= 0m)
|
|
if (sum_fr <= 0m && (sum_fr + sum_extra) <= 0m && sum_refund <= 0m && ((sum_fr + sum_extra) - (sum_pr - sum_refund)) <= 0m)
|
|
|
{
|
|
{
|
|
|
item_rst.isChangeColorRed = true;
|
|
item_rst.isChangeColorRed = true;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
var currDatas = datas.Where(w => w.Id == diId).ToList();
|
|
var currDatas = datas.Where(w => w.Id == diId).ToList();
|
|
|
|
|
|
|
|
decimal totalCost = currDatas.Sum(s => s.CNYMoney);
|
|
decimal totalCost = currDatas.Sum(s => s.CNYMoney);
|
|
@@ -4375,7 +4375,10 @@ namespace OASystem.API.Controllers
|
|
|
return Ok(JsonView(false, "查询失败"));
|
|
return Ok(JsonView(false, "查询失败"));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- detailView.Remark = detailView.Remark.Replace("[TuT]", string.Empty);
|
|
|
|
|
|
|
+ if (detailView.Remark != null)
|
|
|
|
|
+ {
|
|
|
|
|
+ detailView.Remark = detailView.Remark.Replace("[TuT]", string.Empty);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return Ok(JsonView(true, "查询成功", detailView));
|
|
return Ok(JsonView(true, "查询成功", detailView));
|
|
|
}
|
|
}
|