|
@@ -270,7 +270,7 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
public class DayAndCostInfoView
|
|
public class DayAndCostInfoView
|
|
{
|
|
{
|
|
|
|
|
|
-
|
|
+
|
|
|
|
|
|
public int Id { get; set; }
|
|
public int Id { get; set; }
|
|
|
|
|
|
@@ -305,10 +305,42 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
|
|
|
public int Days { get; set; }
|
|
public int Days { get; set; }
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int NationalTravelFeeId { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public string? Country { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public string? City { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- public string? Place { get; set; }
|
|
+ public string? PlaceName
|
|
|
|
+ {
|
|
|
|
+ get
|
|
|
|
+ {
|
|
|
|
+ string str = "";
|
|
|
|
+
|
|
|
|
+ if (City.Contains("城市")) str = Country;
|
|
|
|
+ else str = City;
|
|
|
|
+
|
|
|
|
+ return str;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -335,9 +367,66 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
|
|
|
|
|
|
|
public decimal SubTotal { get; set; }
|
|
public decimal SubTotal { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public string? Remark { get; set; } = "";
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public class DayAndCostAddView
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int Id { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int DiId { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int Type { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int Days { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int NationalTravelFeeId { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public decimal Cost { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public int Currency { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public decimal SubTotal { get; set; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public string? Remark { get; set; } = "";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|