Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/utils/eventBus/index.ts

@@ -6,6 +6,8 @@ interface EnentNames {
     moneyChangedNtf_UI: string; // /接收到资金变化通知 UI 成 使用
     financing_manager: string; // 融资摘牌
     changeTheme: string; // 切换主题
+
+    applyInOrOut: string; // 出入金申请
 }
 
 /** 一个事件只能存储一个回调 */
@@ -22,6 +24,7 @@ interface EnentNamesOnlyOneValue {
 
     bargain: string; // 议价单
 
+
     orderCanceledNtf: string; //接收到委托单撤单通知
     quoteReceiveNtf: string; // 接收实时行情推送
 }

src/views/account-manager/account-manager-agency/account-manager-agency-sub/index.vue

@@ -90,6 +90,7 @@ import { QueryAccountInOutApplyRsp, QueryAccountInOutApplyRsq, QueryBankAccountS
 import { QueryPermancePlanTmpRsp } from '@/services/go/wrtrade/interface';
 import { ref, watch, watchEffect } from 'vue';
 import { getColumns } from './setup';
+import Bus from '@/utils/eventBus/index';
 
 const addCode = 'account-manager-agency-sub-add';
 const updateCode = 'account-manager-agency-sub-modiy';
@@ -139,19 +140,22 @@ export default defineComponent({
         const detailList = ref<QueryAccountInOutApplyRsq[]>([]);
         const allDetailList = ref<QueryAccountInOutApplyRsp[]>([]);
         const fn = (type: 1 | 2) => allDetailList.value.filter((e) => e.executetype === type);
+        let cacheIndex = 0;
         // 出入金申请列表
         function queryDetail() {
             const { queryTable } = queryTableList<QueryAccountInOutApplyRsp>();
             queryTable(QueryAccountInOutApply, {}).then((res) => {
                 allDetailList.value = res;
-                changeTab(0, tabList.value[0]);
+                changeTab(cacheIndex, tabList.value[cacheIndex]);
             });
         }
 
         // 明细表头
         const detailColumns = ref(applyInColumns);
+
         // 切换明细
         function changeTab(index: number, current: TabList) {
+            cacheIndex = index;
             const { code, lable } = current;
             // executetype: number;//申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
             if (code === 'account-manager-agency-sub-apply-in') {
@@ -188,9 +192,13 @@ export default defineComponent({
         });
         watchEffect(() => {
             if (visible.value) {
-                changeTab(0, tabList.value[0]);
+                changeTab(cacheIndex, tabList.value[cacheIndex]);
             }
         });
+        // 出入金申请，重新加载数据
+        Bus.$on('applyInOrOut', () => {
+            queryDetail();
+        });
         return {
             loading,
             tableList,

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/post_buying/index.vue

@@ -61,7 +61,7 @@
             </a-col>
             <a-col :span="24"
                    v-else>
-              <a-form-item label="基差"
+              <a-form-item label="点差"
                            name="PriceMove">
                 <a-input-number class="commonInput"
                                 style="width: 260px"

src/views/order/funding_information/components/funding_information_funding_summary/components/funding_information_funding_summary_recharge/index.vue

@@ -66,6 +66,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { getApplyInOrOutTime, useSignBank } from '../setup';
 import { FormState } from './interface';
 import { handleForm } from './setup';
+import Bus from '@/utils/eventBus/index';
 
 export default defineComponent({
     name: 'funding_information_funding_summary_recharge',
@@ -110,6 +111,7 @@ export default defineComponent({
                 };
                 requestResultLoadingAndInfo(buildInMoney, param, loading, ['充值成功', '充值失败:']).then(() => {
                     cancel(true);
+                    Bus.$emit('applyInOrOut', true);
                 });
             });
         }

src/views/order/funding_information/components/funding_information_funding_summary/components/funding_information_funding_summary_withdraw/index.vue

@@ -87,6 +87,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { getApplyInOrOutTime, useSignBank } from '../setup';
 import { FormState } from './interface';
 import { handleForm } from './setup';
+import Bus from '@/utils/eventBus/index';
 
 export default defineComponent({
     name: 'funding_information_funding_summary_withdraw',
@@ -139,6 +140,7 @@ export default defineComponent({
                 };
                 requestResultLoadingAndInfo(buildOutMoney, param, loading, ['提现成功', '提现失败:']).then(() => {
                     cancel(true);
+                    Bus.$emit('applyInOrOut', true);
                 });
             });
         }