From c053e36d7f36153717e1bbc39ecc0d1df28d3548 Mon Sep 17 00:00:00 2001
From: tengyufan <1532636164@qq.com>
Date: Wed, 1 Jul 2026 16:19:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(SwapTrade2):=20=E4=B8=BA=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=8D=E5=8F=97=E5=BD=B1=E5=93=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8F=96=E6=B6=88=E6=96=B0=E7=89=88=E4=BA=92?=
 =?UTF-8?q?=E6=8D=A2=E4=BA=A4=E6=98=93=E6=A0=87=E7=9A=84=E6=8C=89=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89=EF=BC=8C=E4=B8=A4=E4=B8=AA=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86=E5=9D=87=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=A0=87=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- consUnderlyingFlagNonBond 和 consUnderlyingFlagBond 去掉品种位，仅保留行为位
- 非债券和债券两个输入框不再按 Stock/Fund/CreditBonds 等类型过滤
- 与旧版 SwapTrade 行为对齐：不过滤标的类型，全量返回
---
 .../Scripts/app/swaptrade/swapTradeEdit.js    | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
index 5831c53a..0b3f630b 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
@@ -21,11 +21,18 @@ const consUnderlyingFlagBase = (function () {
 }());
 const consUnderlyingFlagNonBond = (function () {
     let unSelFlag = tradeHelper.UnderlyingSelectFlag;
-    return consUnderlyingFlagBase | unSelFlag.Stock | unSelFlag.StockIndex | unSelFlag.StockIF | unSelFlag.CommodityFutures | unSelFlag.CommoditySpot;
+    //临时注释，保证业务不受影响
+    //return consUnderlyingFlagBase | unSelFlag.Stock | unSelFlag.StockIndex | unSelFlag.StockIF | unSelFlag.Fund | unSelFlag.CommodityFutures | unSelFlag.CommoditySpot;
+    return consUnderlyingFlagBase;
 }());
 const consUnderlyingFlagBond = (function () {
     let unSelFlag = tradeHelper.UnderlyingSelectFlag;
-    return consUnderlyingFlagBase | unSelFlag.CreditBonds | unSelFlag.Bonds | unSelFlag.TBonds | unSelFlag.OtherBonds;
+    const consUnderlyingFlagNonBond = (function () {
+        let unSelFlag = tradeHelper.UnderlyingSelectFlag;
+        //临时注释，保证业务不受影响
+        //return consUnderlyingFlagBase | unSelFlag.Stock | unSelFlag.StockIndex | unSelFlag.StockIF | unSelFlag.Fund | unSelFlag.CommodityFutures | unSelFlag.CommoditySpot;
+        return consUnderlyingFlagBase;
+    }());
 }());
 
 const inputFormatDouble2 = Object.freeze({ precision: 2, append: '' });
@@ -57,7 +64,13 @@ const createVueUnderlying = function (selectFlag) {
             return { autoUnderlying: null };
         },
         mounted() {
-            this.autoUnderlying = tradeHelper.UnderlyingAutoComplete(this.$el, { SelectFlag: selectFlag, BlackLimit: 2, });
+            var selFlag = tradeHelper.UnderlyingSelectFlag;
+            this.autoUnderlying = tradeHelper.UnderlyingAutoComplete(this.$el, { SelectFlag: selFlag.UsePinYinFilter |
+                    selFlag.UseForTrading |
+                    selFlag.IncludeSynthetic |
+                    selFlag.IncludeMatured |
+                    selFlag.IncludeBasket |
+                    selFlag.CheckLaunch, BlackLimit: 2, });
             this.autoUnderlying.onSelect(this.onchange);
             this.value && this.autoUnderlying.selectByCode(this.value);
         },
@@ -90,7 +103,13 @@ const vueUnderlyingRate = function () {
         mounted() {
             var selFlag = tradeHelper.UnderlyingSelectFlag;
             var instrumentTypes = ["FixingRepoRate", "OtherRate"];
-            this.autoUnderlying = tradeHelper.UnderlyingAutoComplete(this.$el, { SelectFlag: selFlag.UsePinYinFilter | selFlag.UseForTrading | selFlag.IncludeSynthetic | selFlag.IncludeMatured | selFlag.IncludeBasket | selFlag.CheckLaunch, BlackLimit: 2, InstrumentTypes: instrumentTypes, UseAll: true, UseSignle: true });
+            this.autoUnderlying = tradeHelper.UnderlyingAutoComplete(this.$el, 
+                { SelectFlag: selFlag.UsePinYinFilter | 
+                        selFlag.UseForTrading | 
+                        selFlag.IncludeSynthetic | 
+                        selFlag.IncludeMatured | 
+                        selFlag.IncludeBasket | 
+                        selFlag.CheckLaunch, BlackLimit: 2, InstrumentTypes: instrumentTypes, UseAll: true, UseSignle: true });
             this.autoUnderlying.onSelect(this.onchange);
             this.value && this.autoUnderlying.selectByCode(this.value);
         },