合并代码，解决冲突

src/views/business/exposure/list/spot/index.vue

@@ -64,7 +64,6 @@ function getExposure() {
                 console.log('获取表格数据', tableList);
             })
             .catch((err) => {
-                debugger
                 message.error(err);
                 loading.value = false;
             });

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

@@ -86,9 +86,12 @@
 import { closeModal } from '@/common/setup/modal/index';
 import { defineComponent, ref, PropType } from 'vue';
 import { ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { handleBusinessForm } from '../setup';
 import { validateAction } from '@/common/setup/form';
 import { BusinessFormState } from '../interface';
+import { loginAccountOperate } from '@/services/proto/accountinfo';
+import { LoginaccountOperateReq, LoginTaaccount } from '@/services/proto/accountinfo/interface';
 
 export default defineComponent({
     name: 'account_info_trade_btn_add',
@@ -103,13 +106,33 @@ export default defineComponent({
             type: Object as PropType<ErmcpTaAccount>,
         },
     },
-    setup() {
+    setup(props, context) {
         const loading = ref<boolean>(false);
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_trade_btn_add');
         const { rules, formState, formRef } = handleBusinessForm();
         function submit() {
-            validateAction<BusinessFormState>(formRef, formState).then((res) => {});
+            validateAction<BusinessFormState>(formRef, formState).then((res) => {
+                const reqParam: LoginaccountOperateReq = {
+                    operatetype: 10, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
+                    logincode: res.logincode, // string 登录账号
+                    accountname: res.accountname, // string 账户名称
+                    password: res.password, // string 登录密码（明文）
+                    mobile: res.mobile, // string 手机号码（明文）
+                    roleids: [props.selectedData.roleid], // uint64 账号角色
+                    userid: props.selectedData.roleid,
+                    logintaaccounts: res.logintaaccounts.map((res) => {
+                        const taAccount: LoginTaaccount = {
+                            accountid: res,
+                        };
+                        return taAccount;
+                    }), // LoginTaaccount 期货账户（勾选交易员必填）
+                };
+                requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['新增交易员成功', '新增交易员失败:']).then(() => {
+                    cancel();
+                    context.emit('refresh');
+                });
+            });
         }
         return {
             formState,

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

@@ -87,16 +87,21 @@
 
 <script lang="ts">
 import { closeModal } from '@/common/setup/modal/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef } from 'vue';
+import {defineComponent, ref, reactive, toRaw, UnwrapRef, PropType} from 'vue';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import {ErmcpLoginUser} from "@/services/go/ermcp/account/interface";
+import {LoginaccountOperateReq, LoginTaaccount} from "@/services/proto/accountinfo/interface";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {loginAccountOperate} from "@/services/proto/accountinfo";
 
 export default defineComponent({
     name: 'add-custom',
     components: {},
-    setup() {
+    setup(name, context) {
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_trade_btn_modify');
+        const loading = ref<boolean>(false);
         // 证件类型
         // const cardTypeList = ref<AllEnums[]>(getCardType());
         // // 表单
@@ -113,18 +118,28 @@ export default defineComponent({
         // function isPersonal(): boolean {
         //     return formState.userinfotype === '1';
         // }
-        // function submit() {
-        //     formRef.value
-        //         .validate()
-        //         .then(() => {
-        //             const param = toRaw(formState);
-        //             applyAction(param);
-        //             console.log('values', formState);
-        //         })
-        //         .catch((error: ValidateErrorEntity<FormState>) => {
-        //             console.log('error', error);
-        //         });
-        // }
+        function submit() {
+            const reqParam: LoginaccountOperateReq = {
+                operatetype: 13, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
+                // logincode: res.logincode, // string 登录账号
+                // accountname: res.accountname, // string 账户名称
+                // password: res.password, // string 登录密码（明文）
+                // mobile: res.mobile, // string 手机号码（明文）
+                // roleids: [props.selectedData.roleid], // uint64 账号角色
+                // loginid = obj.loginid
+                // userid = obj.userid
+                // logintaaccounts: res.logintaaccounts.map(res => {
+                //     const taAccount: LoginTaaccount = {
+                //         accountid: res
+                //     };
+                //     return taAccount
+                // }), // LoginTaaccount 期货账户（勾选交易员必填）
+            }
+            requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改交易员成功', '修改交易员失败:']).then(() => {
+                cancel();
+                context.emit('refresh');
+            });
+        }
         return {
             // formState,
             // rules,

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

@@ -98,7 +98,6 @@ export default defineComponent({
                 operatetype: 7,  // 5: 锁定 6：解锁
                 logintaaccounts: [],
             }
-            debugger
             console.log('reqParam', reqParam);
             requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['重置登录账户密码成功', '重置登录账户密码失败:']).then(() => {
                 cancel();

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

@@ -98,7 +98,6 @@ export default defineComponent({
                 operatetype: 7, // 5: 锁定 6：解锁
                 logintaaccounts: [],
             };
-            debugger;
             console.log('reqParam', reqParam);
             requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['重置登录账户密码成功', '重置登录账户密码失败:']).then(() => {
                 cancel();

src/views/information/spot-contract/components/detail/index.vue

@@ -281,7 +281,6 @@ export default defineComponent({
                 spotcontractid: props.selectedRow.spotcontractid,
                 inouttype: '1,3'
             }
-            debugger
             requestResultLoadingAndInfo(QueryAreaStockApply, StockParam, loading, ['入库记录请求成功', '入库记录请求失败:']).then((res) => {
                 console.log("入库记录请求成功:  \n")
                 console.log(res)