Merge branch 'glms/feature/1.4.2' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs into glms/feature/1.4.2

YLErpDAL/Modules/SwapModule/SwapDealService.cs

@@ -276,6 +276,7 @@ namespace YLErp.Modules.SwapModule
                     floatEvent.PayDirection = position.PosiDirection;
                     floatEvent.PosiGrossPrice = position.PosiGrossPrice;
                     floatEvent.PosiNetPrice = position.PosiNetPrice;
+                    // 注意：TradingAmountNetAvg 字段名为"成交净价(期末语义)"，但收益结算/平仓初始化时装入的是期初净价(PosiNetNoFeePrice)，前端展示期初净价时取此字段
                     floatEvent.TradingAmountNetAvg = position.PosiNetNoFeePrice;
                     floatEvent.TradingAmountNetFeeAvg = position.PosiNetFeePrice;
                     floatEvent.PositionType = position.PositionType;

YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml

@@ -152,9 +152,13 @@
                                 {{floatPosition.UnderlyingCode}}
                             </td>
                             <td>{{priceFormat(floatPosition.PosiGrossPrice)}}</td>
-                            <td v-if="deal.StructureType!='普通收益互换'">{{priceFormat(floatPosition.TradingAmountNetAvg)}}</td>
+                            <!-- 期初标的交割净价: TradingAmountNetAvg 字段名为"成交净价(期末语义)",但此处后端 InitIncome 实际装入的是期初净价(position.PosiNetNoFeePrice),值是期初值 -->
+                            <td v-if="deal.StructureType!='普通收益互换'">{{priceFormat(floatPosition.TradingAmountNetAvg > 0 ? floatPosition.TradingAmountNetAvg : floatPosition.PosiNetPrice)}}</td>
                             <td>
-                                {{floatPosition.TradingAmountAvg}}
+                                <vue-number-input v-model="floatPosition.TradingAmountAvg" v-bind:format="inputFormatEqvNotional" v-on:input="changeUnderlyingPrice" style="width:107px;"></vue-number-input>
+                                <a href="javascript:void(0)" v-on:click="refreshUnderlyingPrice()">
+                                    <span title="使用系统标的价格" class="glyphicon glyphicon-refresh"></span>
+                                </a>
                             </td>
                             <td>{{floatPosition.Quantity}}</td>
                             <td>

YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js

@@ -97,11 +97,23 @@ const vue = new Vue({
             }
             if (!isUseApproval) {
                 this.getInterestList();
-                //this.refreshUnderlyingPrice();
             } else {
                 this.dataFormat();
             }
         },
+        changeUnderlyingPrice() {//修改标的价格
+            this.calcFloatClosePnl();
+        },
+        refreshUnderlyingPrice() {//刷新标的价格
+            var thisObj = this;
+            main.post("/underlying_manager/GetUnderlyingPriceByCode",
+                { code: thisObj.floatPosition.UnderlyingCode, valuedate: thisObj.deal.ValueDate })
+                .done(function (res) {
+                    res.obj = res.obj * thisObj.multiplier;
+                    thisObj.floatPosition.TradingAmountAvg = otcformat.trading.tradeSinglePrice(res.obj);
+                    thisObj.calcFloatClosePnl();
+                });
+        },
         changeTradingFee() {//修改交易费用
             this.calcFloatClosePnl();
         },