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);
         },