commit 提交

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

@@ -27,19 +27,19 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
-                       name="logincode">
+                       name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="登录账号"
-                       name="accountname">
+                       name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

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

@@ -26,19 +26,19 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
-                       name="logincode">
+                       name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="登录账号"
-                       name="accountname">
+                       name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>
@@ -77,7 +77,7 @@
 import { closeModal } from '@/common/setup/modal/index';
 import { defineComponent, ref, PropType, watchEffect } from 'vue';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
-import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+import {LoginaccountOperateReq, LoginTaaccount} from '@/services/proto/accountinfo/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { handleBusinessForm, handleRoleName } from '../setup';
@@ -120,20 +120,21 @@ export default defineComponent({
             validateAction<BusinessFormState>(formRef, formState).then((res) => {
                 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 期货账户（勾选交易员必填）
+                    logincode: res.logincode, // string 登录账号
+                    accountname: res.accountname, // string 账户名称
+                    password: res.password, // string 登录密码（明文）
+                    mobile: res.mobile, // string 手机号码（明文）
+                    roleids: [24], // uint64 账号角色
+                    userid: props.selectedData.userid,
+                    loginid: props.selectedData.loginid,
+                    logintaaccounts: res.logintaaccounts.map(res => {
+                        const taAccount: LoginTaaccount = {
+                            accountid: res
+                        };
+                        return taAccount
+                    }), // LoginTaaccount 期货账户（勾选交易员必填）
                 };
+                debugger
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改交易员成功', '修改交易员失败:']).then(() => {
                     cancel();
                     context.emit('refresh');

src/views/information/account_info/compoments/setup.ts

@@ -22,8 +22,8 @@ export function handleBusinessForm() {
     const formRef = ref();
     const formState: UnwrapRef<BusinessFormState> = reactive(initFormData())
     const rules = {
-        logincode: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
-        accountname: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
+        logincode: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
+        accountname: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
         password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
         mobile: [{ required: true, message: '请输入手机号码', trigger: 'blur' }],
         userid: [{ required: true, message: '请输入账户权限' }],

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

@@ -11,7 +11,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">锁定</a-button>
+                @click="submit">解锁</a-button>
     </template>
     <a-form class="inlineForm"
             :model="formState">
@@ -131,7 +131,7 @@ export default defineComponent({
                         operatetype: 6, // 5: 锁定 6：解锁
                         logintaaccounts: [],
                     };
-                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['解锁锁定成功', '解锁锁定失败:']).then(() => {
+                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['解锁解锁成功', '解锁解锁失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });