huangbin 4 anni fa
parent
commit
091ec7d141

+ 2 - 2
src/views/information/account_info/compoments/detail-futures/index.vue

@@ -105,8 +105,8 @@ export default defineComponent({
         const { rolename, getRoleName } = handleRoleName();
         watchEffect(() => {
             if (visible.value) {
-                // const { selectedData, tableList } = props;
-                // mergeTwoObj(formState, selectedData);
+                const { selectedData, tableList } = props;
+                mergeTwoObj(formState, selectedData);
                 // getRoleName(tableList, selectedData);
                 // formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
                 // formState.accountname = props.selectedData.loginname;

+ 3 - 1
src/views/information/account_info/list/account_info_futures/index.vue

@@ -52,7 +52,9 @@
                 <a-col :span="12">{{getAccountStatus(sub.tradestatus)}}</a-col>
               </a-row>
             </template>
-            <BtnList :btnList="thirdBtn" />
+            <BtnList :selectedData="sub"
+                     :btnList="thirdBtn"
+                     @onClick="moreOptenAction" />
           </a-collapse-panel>
         </a-collapse>
       </a-collapse-panel>