huangbin před 4 roky
rodič
revize
3b47fc2069

+ 6 - 1
src/views/information/account_info/compoments/add-managers/index.vue

@@ -126,7 +126,12 @@ export default defineComponent({
                     password: res.password, // string 登录密码(明文)
                     mobile: res.mobile, // string 手机号码(明文)
                     roleids: [Number(res.userid)], // uint64 账号角色
-                    logintaaccounts: [], // LoginTaaccount 期货账户(勾选交易员必填)
+                    logintaaccounts: res.logintaaccounts.map((res) => {
+                        const taAccount: LoginTaaccount = {
+                            accountid: res,
+                        };
+                        return taAccount;
+                    }), // LoginTaaccount 期货账户(勾选交易员必填)
                 };
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['新增成功', '新增失败:']).then(() => {
                     cancel();

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

@@ -41,8 +41,6 @@ export default defineComponent({
         const { desList, getDesList } = handleDesList();
         // 账户角色
         const logintaaccounts = ref<number[]>([]);
-        // 期货账户
-        const { accountList, filerTaAccount } = useTaAccount();
         watchEffect(() => {
             if (props.selectedData) {
                 const data = props.selectedData;
@@ -52,11 +50,13 @@ export default defineComponent({
                     { label: '登录账号', value: data.logincode },
                     { label: '手机号码', value: data.mobile },
                 ]);
+
                 logintaaccounts.value = data.acclist?.map((e) => e.accountid);
             }
         });
         return {
             desList,
+            logintaaccounts,
         };
     },
 });

+ 27 - 3
src/views/information/account_info/compoments/modify-managers/index.vue

@@ -59,6 +59,24 @@
                      placeholder="请输入手机号码" />
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="授权期货账户"
+                       class="checkboxGroupItem"
+                       name="logintaaccounts">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.logintaaccounts">
+              <a-row>
+                <a-col :span="12"
+                       v-for="(item, index) in accountList"
+                       :key="index"
+                       :class="[index > 1 ? 'mt10' : '']">
+                  <a-checkbox :value="item.accountid">{{item.accountname}}/{{item.accountid}}
+                  </a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -70,7 +88,7 @@ import { defineComponent, ref, PropType, watchEffect } from 'vue';
 import { handleBusinessForm } from '../setup';
 import { validateAction } from '@/common/setup/form';
 import { BusinessFormState } from '../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 { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
@@ -97,11 +115,12 @@ export default defineComponent({
         const { rules, formState, formRef } = handleBusinessForm();
         const loading = ref<boolean>(false);
         // 期货账户
-        const { accountList, filerTaAccount } = useTaAccount();
+        const { accountList } = useTaAccount();
         watchEffect(() => {
             if (visible.value) {
                 mergeTwoObj(formState, props.selectedData);
                 formState.accountname = props.selectedData.loginname;
+                formState.logintaaccounts = props.selectedData.acclist?.map((e) => e.accountid);
             }
         });
         function submit() {
@@ -114,7 +133,12 @@ export default defineComponent({
                     userid: getUserId(),
                     mobile: res.mobile, // string 手机号码(明文)
                     roleids: [props.selectedData.clientroleid], // uint64 账号角色
-                    logintaaccounts: [], // LoginTaaccount 期货账户(勾选交易员必填)
+                    logintaaccounts: res.logintaaccounts.map((res) => {
+                        const taAccount: LoginTaaccount = {
+                            accountid: res,
+                        };
+                        return taAccount;
+                    }), // LoginTaaccount 期货账户(勾选交易员必填)
                 };
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改成功', '修改失败:']).then(() => {
                     cancel();