Merge remote-tracking branch 'origin/master'

src/views/business/purchase/components/funds/index.vue

@@ -189,15 +189,6 @@ export default defineComponent({
         const { visible, cancel } = closeModal('purchase_pending_funds');
         const loading = ref<boolean>(false);
         const { rules, formState, formRef } = handleForm();
-        // watch(visible, (newValue, oldValue) => { //直接监听
-        //   if(newValue){
-        //     initData(()=>{
-        //       QueryMiddleGoodsChange(props.selectedRow.deliverygoodsid).then(res=>{
-        //       })
-        //     })
-        //   }
-        // });
-
         function submit() {
             console.log(props.selectedRow);
             const wrapEl = unref(formRef);

src/views/information/account_info/compoments/add-futures/index.vue

@@ -70,7 +70,7 @@
 <script lang="ts">
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef } from 'vue';
+import { defineComponent, ref, reactive, toRaw, UnwrapRef, watchEffect } from 'vue';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 
@@ -80,6 +80,7 @@ export default defineComponent({
     setup() {
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_manager_btn_add');
+
         // 证件类型
         // const cardTypeList = ref<AllEnums[]>(getCardType());
         // // 表单

src/views/information/account_info/list/account_info_futures/index.vue

@@ -71,6 +71,7 @@ export default defineComponent({
     components: {
         contextMenu,
         BtnList,
+        filterCustomTable,
         Add,
     },
     setup() {