Merge remote-tracking branch 'origin/master'

src/common/components/uploadImg/index.vue

@@ -68,9 +68,14 @@ export default defineComponent({
 </script>
 <style lang="less">
 .upload {
+    .flex;
+    flex-direction: column;
     .ant-upload-list {
         max-width: calc(100% - 80px);
     }
+    .look {
+        white-space: nowrap;
+    }
 }
 </style
 >;

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

@@ -75,8 +75,6 @@
         ErmcpTaAccount,
         ErmcpTaAccountEx
     } from '@/services/go/ermcp/account/interface';
-    import {handleBusinessForm, handleRoleName} from '../setup';
-    import {mergeTwoObj} from '@/utils/objHandle';
     import {getLongTypeLoginID} from "@/services/bus/login";
     import {ErmcpTradeConfigTMP} from '@/services/go/ermcp/business-review/interface';
 

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

@@ -90,7 +90,7 @@ import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
-import { handleBusinessForm, handleRoleName } from '../setup';
+import { handleBusinessForm } from '../setup';
 import { mergeTwoObj } from '@/utils/objHandle';
 
 export default defineComponent({

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

@@ -18,7 +18,7 @@
         <a-col :span="12">
           <a-form-item label="所属用户"
                        name="">
-            <span class="white">{{rolename}}</span>
+            <span class="white">{{firstBtnData.rolename}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -62,8 +62,8 @@
                        v-for="(item, index) in selectedData.acclist"
                        :key="index"
                        :class="[index > 1 ? 'mt10' : '']">
-                  <a-checkbox
-                              :value="item.accountid" disabled>
+                  <a-checkbox :value="item.accountid"
+                              disabled>
                     {{item.accountname}}/{{item.accountid}}
                   </a-checkbox>
                 </a-col>
@@ -80,13 +80,17 @@
 import { defineComponent, PropType, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { mergeTwoObj } from '@/utils/objHandle';
-import { handleBusinessForm, handleRoleName } from '../setup';
+import { handleBusinessForm } from '../setup';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
 
 export default defineComponent({
     name: 'trader-detail',
     components: {},
     props: {
+      firstBtnData: {
+            type: Object as PropType<ErmcpLoginUserEx>,
+            default: {},
+        },
         selectedData: {
             type: Object as PropType<ErmcpLoginUser>,
             default: {},
@@ -103,12 +107,10 @@ export default defineComponent({
     setup(props) {
         const { visible, cancel } = closeModal('detail');
         const { formState } = handleBusinessForm();
-        const { rolename, getRoleName } = handleRoleName();
         watchEffect(() => {
-            if (visible.value) {
-                const { selectedData, tableList } = props;
+                       if (visible.value && props.selectedData) {
+                const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                getRoleName(tableList, selectedData);
                 formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
                 formState.accountname = props.selectedData.loginname;
             }
@@ -118,7 +120,6 @@ export default defineComponent({
             cancel,
             formState,
             maskClosableFlag: false,
-            rolename,
         };
     },
 });
@@ -130,10 +131,10 @@ export default defineComponent({
         margin-top: 20px;
     }
     .checkboxGroupItem {
-      .ant-col.ant-form-item-control-wrapper {
-        width: 100%;
-        white-space: nowrap;
-      }
+        .ant-col.ant-form-item-control-wrapper {
+            width: 100%;
+            white-space: nowrap;
+        }
     }
 }
 </style>;

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

@@ -85,7 +85,7 @@ import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
 import { Modal } from 'ant-design-vue';
 import { mergeTwoObj } from '@/utils/objHandle';
-import { handleBusinessForm, handleRoleName } from '../setup';
+import { handleBusinessForm, } from '../setup';
 
 export default defineComponent({
     name: 'account_info_trade_btn_locked',
@@ -154,14 +154,14 @@ export default defineComponent({
 
 <style lang="less">
 .add-custom {
-  .checkboxGroupItem {
-    .ant-row {
-      .ant-col.ant-col-12 {
-        white-space: nowrap;
-        min-width: 356px;
-      }
+    .checkboxGroupItem {
+        .ant-row {
+            .ant-col.ant-col-12 {
+                white-space: nowrap;
+                min-width: 356px;
+            }
+        }
     }
-  }
 }
 </style
 >;

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

@@ -80,7 +80,7 @@ import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/
 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';
+import { handleBusinessForm, } from '../setup';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { validateAction } from '@/common/setup/form';
 import { BusinessFormState } from '../interface';

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

@@ -85,7 +85,7 @@ import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
 import { Modal } from 'ant-design-vue';
 import { mergeTwoObj } from '@/utils/objHandle';
-import { handleBusinessForm, handleRoleName } from '../setup';
+import { handleBusinessForm, } from '../setup';
 
 export default defineComponent({
     name: 'account_info_trade_btn_child_unlocked',