交易账户

src/common/constants/buttonType.ts

@@ -34,10 +34,10 @@ export interface ButtonType {
     account_info_trade_btn_add: string; // 交易账户 新增
     account_info_trade_btn_modify: string; // 交易账户 修改
     account_info_trade_btn_child_modify: string; // 交易子账户 修改
-    account_info_trade_btn_locked: string; // 交易账户 锁定
-    account_info_trade_btn_unlocked: string; // 交易账户 解锁
-    account_info_trade_btn_reset: string; // 交易账户 重置密码
-    account_info_trade_btn_logout: string; // 业务账户 注销
+    account_info_trade_btn_child_locked: string; // 交易账户 锁定
+    account_info_trade_btn_child_unlocked: string; // 交易账户 解锁
+    account_info_trade_btn_child_reset: string; // 交易账户 重置密码
+    account_info_trade_btn_child_logout: string; // 业务账户 注销
 
     account_info_manager_btn_add: string; // 管理账户 新增
     account_info_manager_btn_child_add: string; // 管理子账户 新增

src/views/information/account_info/compoments/cancel-trader/index.vue

@@ -94,7 +94,7 @@ import { handleBusinessForm, handleRoleName } from '../setup';
 import { mergeTwoObj } from '@/utils/objHandle';
 
 export default defineComponent({
-    name: 'account_info_trade_btn_logout',
+    name: 'account_info_trade_btn_child_logout',
     components: {},
     props: {
         selectedData: {
@@ -112,7 +112,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_logout');
+        const { visible, cancel } = closeModal('account_info_trade_btn_child_logout');
         const loading = ref<boolean>(false);
         const { formState } = handleBusinessForm();
         const { rolename, getRoleName } = handleRoleName();

src/views/information/account_info/compoments/locked-trader/index.vue

@@ -106,7 +106,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_locked');
+        const { visible, cancel } = closeModal('account_info_trade_btn_child_locked');
         const loading = ref<boolean>(false);
         const { formState } = handleBusinessForm();
         const { rolename, getRoleName } = handleRoleName();

src/views/information/account_info/compoments/modify-traders-self/index.vue

@@ -58,7 +58,7 @@ import { FormState } from './interface';
 import { getLongTypeLoginID } from '@/services/bus/login';
 
 export default defineComponent({
-    name: 'account_info_trade_btn_modify_self',
+    name: 'account_info_trade_btn_modify',
     props: {
         selectedData: {
             type: Object as PropType<ErmcpLoginUserEx>,
@@ -67,7 +67,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_child_modify');
+        const { visible, cancel } = closeModal('account_info_trade_btn_modify');
         const loading = ref<boolean>(false);
         const { rules, formState, formRef } = handleForm();
         watchEffect(() => {

src/views/information/account_info/compoments/modify-traders/index.vue

@@ -86,7 +86,7 @@ import { validateAction } from '@/common/setup/form';
 import { BusinessFormState } from '../interface';
 
 export default defineComponent({
-    name: 'account_info_trade_btn_modify',
+    name: 'account_info_trade_btn_child_modify',
     props: {
         selectedData: {
             type: Object as PropType<ErmcpLoginUser>,
@@ -103,7 +103,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_modify');
+        const { visible, cancel } = closeModal('account_info_trade_btn_child_modify');
         const loading = ref<boolean>(false);
         const { rules, formState, formRef } = handleBusinessForm();
         const { rolename, getRoleName } = handleRoleName();

src/views/information/account_info/compoments/reset-trader/index.vue

@@ -73,7 +73,7 @@ import { validateAction } from '@/common/setup/form';
 import { handlePasswordForm } from '../setup';
 
 export default defineComponent({
-    name: 'account_info_trade_btn_reset',
+    name: 'account_info_trade_btn_child_reset',
     props: {
         selectedData: {
             default: {},
@@ -82,7 +82,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_reset');
+        const { visible, cancel } = closeModal('account_info_trade_btn_child_reset');
         const { rules, formState, formRef } = handlePasswordForm();
         const loading = ref<boolean>(false);
         watchEffect(() => {

src/views/information/account_info/compoments/unlocked-trader/index.vue

@@ -88,7 +88,7 @@ import { mergeTwoObj } from '@/utils/objHandle';
 import { handleBusinessForm, handleRoleName } from '../setup';
 
 export default defineComponent({
-    name: 'account_info_trade_btn_unlocked',
+    name: 'account_info_trade_btn_child_unlocked',
     components: {},
     props: {
         selectedData: {
@@ -106,7 +106,7 @@ export default defineComponent({
     },
     setup(props, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_trade_btn_unlocked');
+        const { visible, cancel } = closeModal('account_info_trade_btn_child_unlocked');
         const loading = ref<boolean>(false);
         const { formState } = handleBusinessForm();
         const { rolename, getRoleName } = handleRoleName();

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

@@ -33,11 +33,10 @@
           <a-row class="headRow">
             <a-col :span="12">
               {{item.rolename}}({{item.userlist.length}})
-              <a-button @click.stop="modifySelfClick(item)">修改</a-button>
             </a-col>
             <a-col :span="12">
               <BtnList :selectedData="item"
-                       :btnList="commonBtn"
+                       :btnList="firstBtn"
                        @onClick="openAction" />
             </a-col>
           </a-row>
@@ -92,7 +91,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { defineComponent, initData, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
 import { getRoleTypeName } from '../setup';
 import { queryTableList } from './setup';
@@ -129,21 +128,16 @@ export default defineComponent({
     },
     setup() {
         const { loading, tableList, queryTable } = queryTableList();
-        const { commonBtn, forDataBtn } = getBtnList('account_info_trade', true);
+        const [firstBtn, secondBtn] = _getBtnList('account_info_trade', true).value;
         // 新增弹窗
         const { selectedData: addModelData, openAction } = handleModalData<ErmcpLoginUserEx>();
         // 修改 重置密码、详情等弹窗
         const { selectedData: moreModelData, openAction: moreOptenAction } = handleModalData<ErmcpLoginUser>();
         // 处理根据状态显示对应按钮
         function handleBtnAction() {
-            handleTableList(queryTable, tableList, forDataBtn.value);
-        }
-        // 修改交易用户
-        const { openAction: openModifySelf } = openModal('account_info_trade_btn_child_modify');
-        function modifySelfClick(value: ErmcpLoginUserEx) {
-            Object.assign(addModelData, value);
-            openModifySelf();
+            handleTableList(queryTable, tableList, secondBtn);
         }
+
         // 授权期货账户
         const accountList = ref<ErmcpTaAccount[]>([]);
 
@@ -163,8 +157,8 @@ export default defineComponent({
         function search(value: any) {}
 
         return {
-            commonBtn,
-            forDataBtn,
+            firstBtn,
+            secondBtn,
             loading,
             search,
             tableList,
@@ -176,7 +170,6 @@ export default defineComponent({
             moreOptenAction,
             handleBtnAction,
             accountList,
-            modifySelfClick,
         };
     },
 });