Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增利息端类型字段

Browse Source
This commit is contained in:
马冰冰
2026-07-23 16:59:58 +08:00
parent ef7fa7c6e5
commit ef179fc26c
5 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/YLErp.Core/DBModels/SwapPosition.cs
+4
View File
@@ -246,6 +246,10 @@ namespace YLErp.DBModels
/// </summary>
public int? interest_rule { get; set; }
/// <summary>
/// 利息端类别
/// </summary>
public string category_tag { get; set; }
/// <summary>
/// 互换观察日集合
/// </summary>
[NotMapped]
YLErpDAL/Modules/SwapModule/SwapTradeService.cs
+1
View File
@@ -1377,6 +1377,7 @@ namespace YLErp.Modules.SwapModule
position.FloatRateUnderlyingCode = swap.FloatRateUnderlyingCode;
position.interest_rest_days = swap.interest_rest_days;
position.interest_rule = swap.interest_rule;
position.category_tag = string.IsNullOrEmpty(swap.category_tag) ? "互换利率" : swap.category_tag;
position.InitYtm = swap.InitYtm;
if (swap.InitYtm != null && swap.InitYtm > 0)
{
YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
+10
View File
@@ -21,6 +21,7 @@
var jsTraders = canAddNewTrader ? JsDataModel.GetTraders(assetunits) : Enumerable.Empty<TraderJsModel>();
var jsTrader = canAddNewTrader && Model.TraderId > 0 ? jsTraders.FirstOrDefault(n => n.id == Model.TraderId) : null;
var currencys = CurrencyController.getList();
var categoryTagOptions = DictionaryBLL.GetList("利息端类别", false, "互换利率");
List<string> places = new List<string>();
List<string> agencys = new List<string>();
var tradingPlaceMap = YLErp.DBModels.Consts.ConsReport.TradingPlaceMapDisplay;
@@ -362,6 +363,7 @@
<th>计息方式</th>
<th>重置频率(天)</th>
<th>利率准则</th>
<th>类别</th>
<th>结算规则</th>
<th> <button class="btn btn-primary swapadd" type="button" v-on:click="addGetSwapRate">+</button></th>
</tr>
@@ -412,6 +414,14 @@
<option value=-1>前一营业日</option>
</select>
</td>
<td>
<select v-model="item.category_tag">
@foreach (var option in categoryTagOptions)
{
<option value="@option.Value">@option.Text</option>
}
</select>
</td>
<td>
<button class="btn btn-sm btn-outline-danger" type="button" v-on:click="initObservationDates(item,1)">设置观察日</button>
</td>
YLErpWeb/Views/SwapTrade2/TradeView.cshtml
+4
View File
@@ -304,6 +304,7 @@
<th>计息方式</th>
<th>重置频率(天)</th>
<th>利率准则</th>
<th>类别</th>
<th>结算规则</th>
</tr>
@if (trade.swap_positions != null)
@@ -348,6 +349,7 @@
</td>
<td>@item.interest_rest_days</td>
<td>@((item.interest_rule != null) ? (SwapInterestRule)item.interest_rule : "")</td>
<td>@(string.IsNullOrEmpty(item.category_tag) ? "互换利率" : item.category_tag)</td>
<td>
<button class="btn btn-sm btn-outline-danger" type="button" onclick="showSwapRate('@(item.InterestSwapInterval)', false)" style="height:22px;">查看</button>
</td>
@@ -508,6 +510,7 @@
<th>计息方式</th>
<th>重置频率(天)</th>
<th>利率准则</th>
<th>类别</th>
<th>结算规则</th>
</tr>
@{
@@ -549,6 +552,7 @@
<td>@(item.InterestType == 0 ? "单利" : "复利")</td>
<td>@item.interest_rest_days</td>
<td>@((item.interest_rule != null) ? (SwapInterestRule)item.interest_rule : "")</td>
<td>@(string.IsNullOrEmpty(item.category_tag) ? "互换利率" : item.category_tag)</td>
<td><button class="btn btn-sm btn-outline-danger" type="button" onclick="showSwapRate('@(item.InterestSwapInterval)')" style="height:22px;">查看</button></td>
</tr>
}
YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+3 -1
View File
@@ -1289,6 +1289,7 @@ const vue = new Vue({
thisObj.getSwapList = thisObj.trade.swap_positions.filter(x => { if ((x.UnderlyingCode == null || x.UnderlyingCode.length == 0) && x.IsInitial && (x.InterestMode == 1 || x.InterestMode == 2 || x.InterestMode == 7 || x.InterestMode == 8 || x.InterestMode == 9)) return x; });
thisObj.getSwapList.forEach((val, num, arr) => {
arr[num].index = num;
arr[num].category_tag = arr[num].category_tag || '互换利率';
// 解析 InterestSwapInterval 为 SwapIntervalList
if (arr[num].InterestSwapInterval && !arr[num].SwapIntervalList) {
try {
@@ -1368,7 +1369,8 @@ const vue = new Vue({
HappenDate: null,//发生日期,
Currency: 'CNY',//币种
interest_rest_days: 7,//重置频率
interest_rule: null//利率准则
interest_rule: null,//利率准则
category_tag: '互换利率'//类别
}
thisObj.getSwapList.push(getSwap);
},