|
@@ -5841,10 +5841,7 @@ FROM
|
|
}
|
|
}
|
|
|
|
|
|
string twoItemRemark = "备注:";
|
|
string twoItemRemark = "备注:";
|
|
- if (!string.IsNullOrEmpty(_EnterExitCosts.TwoItemRemark))
|
|
|
|
- {
|
|
|
|
- twoItemRemark = _EnterExitCosts.TwoItemRemark;
|
|
|
|
- }
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(_EnterExitCosts.TwoItemRemark)) twoItemRemark += _EnterExitCosts.TwoItemRemark;
|
|
if (!string.IsNullOrEmpty(rateStr)) twoItemRemark += rateStr;
|
|
if (!string.IsNullOrEmpty(rateStr)) twoItemRemark += rateStr;
|
|
|
|
|
|
dic.Add("AirTotalStr", airTotalStr);
|
|
dic.Add("AirTotalStr", airTotalStr);
|
|
@@ -6145,7 +6142,6 @@ FROM
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
-
|
|
|
|
#region 设置页眉
|
|
#region 设置页眉
|
|
|
|
|
|
string userLabel = string.Empty;
|
|
string userLabel = string.Empty;
|
|
@@ -7918,10 +7914,7 @@ FROM
|
|
}
|
|
}
|
|
|
|
|
|
string twoItemRemark = "备注:";
|
|
string twoItemRemark = "备注:";
|
|
- if (!string.IsNullOrEmpty(_EnterExitCosts.TwoItemRemark))
|
|
|
|
- {
|
|
|
|
- twoItemRemark = _EnterExitCosts.TwoItemRemark;
|
|
|
|
- }
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(_EnterExitCosts.TwoItemRemark)) twoItemRemark += _EnterExitCosts.TwoItemRemark;
|
|
|
|
|
|
if (!string.IsNullOrEmpty(rateStr)) twoItemRemark += rateStr;
|
|
if (!string.IsNullOrEmpty(rateStr)) twoItemRemark += rateStr;
|
|
|
|
|