huangbin 4 年之前
父節點
當前提交
02cb1bd40d

+ 1 - 0
src/utils/timer/timerUtil.ts

@@ -16,6 +16,7 @@ export interface TimeoutTimerNames {
     loadMylieList: string; //发布闲置之后延时请求接口数据 不然马上新增数据马上请求是请求不到的
     debounce: string; // 防抖
     debounceInput: string; // 输入框防抖
+    filterTimer: string;
     debounceOnSearch: string; // 搜索框防抖
     overtimeOut: string; // 超时,如果太久没有操作界面,则退出登录
     subscribeQuote: string; //按需订阅防抖

+ 14 - 1
src/views/market/spot_trade/components/filter/index.vue

@@ -3,7 +3,7 @@
   <div class="filterTable">
     <div class="filter-custom-table">
       <a-tree-select v-model:value="selectedFT"
-                     @change="changeFT"
+                     @select="changeFT"
                      style="width: 200px"
                      :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                      :tree-data="FtDeliveryGoods"
@@ -65,6 +65,7 @@ import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { handleIs, setGoodsPrice } from '../buy-sell-market/setup';
 import { BuyOrSell, TradeMode } from '@/common/constants/enumCommon';
 import { getMarketByTradeMode } from '@/services/bus/market';
+import TimerUtils from '@/utils/timer/timerUtil';
 
 const ALL = TreeSelect.SHOW_ALL;
 
@@ -91,6 +92,17 @@ export default defineComponent({
         // 仓单要素
         const wrLsit = ref<SelectList[]>([]);
         function changeFT(value: number, label: any, extra: any) {
+            const children = label?.children;
+            if (Array.isArray(children) && children.length) {
+                TimerUtils.setTimeout(
+                    () => {
+                        selectedFT.value = undefined;
+                    },
+                    100,
+                    'filterTimer'
+                );
+                return;
+            }
             queryWrStandardFactoryItem({ wrstandardid: value }).then((res) => {
                 const result: SelectList[] = [];
                 res.forEach((el) => {
@@ -99,6 +111,7 @@ export default defineComponent({
                 wrLsit.value = result;
             });
         }
+
         // 全部期货合约
         const goodsList = getGoodsListByTrade(TradeMode.ListingAndSelection);
         const selectedGoods = ref<Goods>();

+ 1 - 1
src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -229,7 +229,7 @@ export default defineComponent({
                         FixedPrice: res.FixedPrice, // 固定价格
                         PriceFactor: 1, // 价格系数(浮动价时填写)
                         PriceMove: 0, // 升贴水(浮动价时填写)
-                        TimevalidType: 4, // 时间有效类型 1:当日有效 2:本周有效 3:指定时间有效 4:一直有效
+                        TimevalidType: 3, // 时间有效类型 1:当日有效 2:本周有效 3:指定时间有效 4:一直有效
                         ValidTime: moment(formState.vidaliteTime).format('YYYY-MM-DD HH:mm:ss'), // 有效期限
                         ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
                         FirstRatio: 0, // 首付比例

+ 2 - 1
src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -80,7 +80,8 @@
                             v-model:checked="numCheck">整单</a-checkbox>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <a-col :span="12"
+                   v-if="!numCheck">
               <a-form-item label="起摘数量"
                            class="relative"
                            name="DelistMinQty">

+ 2 - 1
src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -81,7 +81,8 @@
                             v-model:checked="numCheck">整单</a-checkbox>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <a-col :span="12"
+                   v-if="!numCheck">
               <a-form-item label="起摘数量"
                            class="relative"
                            name="DelistMinQty">