Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,107 @@
+<template>
+  <!-- 交易账号详情-->
+  <a-modal class="add-custom custom-detail"
+           title="交易账号详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                @click="cancel">关闭</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :model="formState">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <span class="white">{{formState.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">{{formState.logincode}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              value="2323423"
+                              v-model:value="formState.password"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">{{formState.mobile}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.roleids">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox :value="22">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox :value="23">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { mergeTwoObj } from '@/utils/objHandle';
+import { handleBusinessForm } from '../setup';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+
+export default defineComponent({
+    name: 'business-detail',
+    components: {},
+    props: {
+        selectedData: {
+            type: Object as PropType<ErmcpLoginUser>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const { visible, cancel } = closeModal('detail');
+        const { formState } = handleBusinessForm();
+        watchEffect(() => {
+            if (visible.value) {
+                mergeTwoObj(formState, props.selectedData);
+            }
+        });
+        return {
+            visible,
+            cancel,
+            formState,
+            maskClosableFlag: false,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+}
+</style>;

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

@@ -67,6 +67,7 @@
             :selectedData="moreOptenAction" />
     <Reset @refresh="queryTable"
            :selectedData="moreOptenAction" />
+    <Detail :selectedData="moreOptenAction" />
 
   </div>
 </template>
@@ -83,6 +84,7 @@ import Locked from '../../compoments/locked-trader/index.vue';
 import Unlocked from '../../compoments/unlocked-trader/index.vue';
 import Cancel from '../../compoments/cancel-trader/index.vue';
 import Reset from '../../compoments/reset-trader/index.vue';
+import Detail from '../../compoments/detail-trader/index.vue';
 import { handleModalData } from '../setup';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 
@@ -98,6 +100,7 @@ export default defineComponent({
         Unlocked,
         Cancel,
         Reset,
+        Detail,
     },
     setup() {
         const { loading, tableList, queryTable } = queryTableList();

src/views/manage/business-review/components/somepriceCancel/index.vue

@@ -129,7 +129,7 @@ export default defineComponent({
     const maskClosableFlag = ref<boolean>(false);
 
     function submit() {
-
+      visible.value = false
     }
 
     function back(){