ソースを参照

fixed:#1014

huangbin 4 年 前
コミット
560c2ba1fd
1 ファイル変更41 行追加49 行削除
  1. 41 49
      src/views/market/spot_trade/components/filter/index.vue

+ 41 - 49
src/views/market/spot_trade/components/filter/index.vue

@@ -1,56 +1,49 @@
 <template>
-    <!-- 报表通用过滤 -->
-    <div class="filterTable">
-        <div class="filter-custom-table">
-            <a-tree-select
-                v-model:value="selectedFT"
-                @change="changeFT"
-                style="width: 200px"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="FtDeliveryGoods"
-                placeholder="全部商品"
-                :showCheckedStrategy="ALL"
-                tree-default-expand-all
-            ></a-tree-select>
-            <a-select
-                label-in-value
+  <!-- 报表通用过滤 -->
+  <div class="filterTable">
+    <div class="filter-custom-table">
+      <a-tree-select v-model:value="selectedFT"
+                     @change="changeFT"
+                     style="width: 200px"
+                     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                     :tree-data="FtDeliveryGoods"
+                     placeholder="全部商品"
+                     :showCheckedStrategy="ALL"
+                     tree-default-expand-all></a-tree-select>
+      <a-select label-in-value
                 class="conditionSelect"
                 v-for="(item, index) in wrLsit"
                 :key="index + '11'"
                 style="width: 120px"
                 v-model:value="item.selected"
-                :placeholder="`全部${item.itemtypename}`"
-            >
-                <a-select-option
-                    v-for="sub in item.itemlst"
-                    :key="sub.dgfactoryitemid"
-                >{{sub.dgfactoryitemvalue}}</a-select-option>
-            </a-select>
-            <a-space direction="vertical" v-if="!isWR()">
-                <a-month-picker
-                    :allowClear="false"
-                    placeholder="全部交收月"
-                    v-model:value="time"
-                    class="commonDatePicker conditionPicker allDatePicker"
-                />
-            </a-space>
-            <a-select
-                class="conditionSelect"
+                :placeholder="`全部${item.itemtypename}`">
+        <a-select-option v-for="sub in item.itemlst"
+                         :key="sub.dgfactoryitemid">{{sub.dgfactoryitemvalue}}</a-select-option>
+      </a-select>
+      <a-space direction="vertical"
+               v-if="!isWR()">
+        <a-month-picker :allowClear="false"
+                        placeholder="全部交收月"
+                        v-model:value="time"
+                        class="commonDatePicker conditionPicker allDatePicker" />
+      </a-space>
+      <a-select class="conditionSelect"
                 v-if="isFloat()"
                 :style="{width: '180px', maxHeight: '400px', overflow: 'auto' }"
                 @change="goodsChange"
-                placeholder="全部期货合约"
-            >
-                <a-select-option
-                    v-for="item in goodsList"
-                    :value="item.goodsid"
-                    :key="item.goodsid"
-                >{{item.goodscode}}({{item.goodsname}})</a-select-option>
-            </a-select>
-            <a-button class="btnDeafault" @click="search(true)" style="width: 80px">筛选</a-button>
-            <a-button class="operBtn" @click="listingAction">挂牌求购</a-button>
-        </div>
+                placeholder="全部期货合约">
+        <a-select-option v-for="item in goodsList"
+                         :value="item.goodsid"
+                         :key="item.goodsid">{{item.goodscode}}({{item.goodsname}})
+        </a-select-option>
+      </a-select>
+      <a-button class="btnDeafault"
+                @click="search(true)"
+                style="width: 80px">筛选</a-button>
+      <a-button class="operBtn"
+                @click="listingAction">挂牌求购</a-button>
     </div>
+  </div>
 </template>
 
 <script lang="ts">
@@ -67,10 +60,11 @@ import { Moment } from 'moment';
 import moment from 'moment';
 import { addSubscribeQuotation, removeSubscribeQuotation } from '@/services/socket/quota';
 import { v4 } from 'uuid';
-import { getGoodsList, getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
+import { getGoodsList, getGoodsListByTrade, getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { handleIs, setGoodsPrice } from '../buy-sell-market/setup';
-import { BuyOrSell } from '@/common/constants/enumCommon';
+import { BuyOrSell, TradeMode } from '@/common/constants/enumCommon';
+import { getMarketByTradeMode } from '@/services/bus/market';
 
 const ALL = TreeSelect.SHOW_ALL;
 
@@ -106,11 +100,9 @@ export default defineComponent({
             });
         }
         // 全部期货合约
-        const goodsList = ref<Goods[]>([]);
+        const goodsList = getGoodsListByTrade(TradeMode.ListingAndSelection);
         const selectedGoods = ref<Goods>();
-        initData(() => {
-            goodsList.value = getGoodsList();
-        });
+
         const uuid = v4();
         // 切换商品
         function goodsChange(id: number) {