update

.eslintrc.js

@@ -19,11 +19,8 @@ module.exports = {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'vue/multi-word-component-names': 0,
-  },
-  globals: {
-    Proto: 'readonly',
-    Model: 'readonly',
-    App: 'readonly',
-    Store: 'readonly'
+    // https://segmentfault.com/q/1010000040251236
+    // https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
+    'no-undef': 'off',
   }
 }

src/packages/pc/components/modules/action-menu/index.vue

@@ -97,7 +97,7 @@ const onClick = (item: ActionMenu, index: number) => {
 
 watchEffect(() => {
     actionMenus.value = props.menus.map((e) => ({
-        name: e.code,
+        name: e.resourceCode,
         label: e.title,
         icon: e.icon,
         className: e.className,

src/packages/pc/components/modules/auth-component/index.vue

@@ -30,14 +30,14 @@ const props = defineProps({
 
 const { componentMap, getAuthComponents } = useMenu(props.code)
 const { onChange } = useAttrs()
-const dataList = shallowRef<Model.UserRoutes[]>([]) // 数据列表
+const dataList = shallowRef<Model.MenusRsp[]>([]) // 数据列表
 const dataIndex = shallowRef(0) // 选中的标签
 
-const componentId = computed(() => dataList.value[dataIndex.value]?.code)
+const componentId = computed(() => dataList.value[dataIndex.value]?.resourceCode)
 
-const onTabChange = (index: number, { code }: Model.UserRoutes) => {
+const onTabChange = (index: number, { resourceCode }: Model.MenusRsp) => {
     if (onChange instanceof Function) {
-        onChange(code)
+        onChange(resourceCode)
     } else {
         dataIndex.value = index
     }
@@ -47,12 +47,12 @@ onMounted(() => {
     const auth = getAuthComponents();
 
     if (props.tabs.length) {
-        dataList.value = auth.filter((e) => props.tabs.includes(e.code))
+        dataList.value = auth.filter((e) => props.tabs.includes(e.resourceCode))
     } else {
         dataList.value = auth
     }
 
-    const tabIndex = dataList.value.findIndex((e) => e.code === props.selectedTab)
+    const tabIndex = dataList.value.findIndex((e) => e.resourceCode === props.selectedTab)
     if (tabIndex > -1) {
         dataIndex.value = tabIndex
     }

src/packages/pc/views/account/fundacct/components/details/index.vue

@@ -56,7 +56,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.TaAccountRsp | Model.OrganTaaccountRsp>,
+        type: Object as PropType<Model.TaAccountRsp | Member.OrganTaaccountRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/accountcfg/components/add/index.vue

@@ -146,7 +146,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = reactive<Model.TradeConfigAddReq>({
+const formData = reactive<Member.TradeConfigAddReq>({
     memberuserid: 1,
     feeList: [],
     ruleList: [],
@@ -230,7 +230,7 @@ const formRules: FormRules = {
 }
 
 // 选择交易商
-const onInvestorChange = (item?: Model.InitAccTradeRsp) => {
+const onInvestorChange = (item?: Investor.InitAccTradeRsp) => {
     formData.accountid = undefined
     formData.marketid = undefined
     formData.goodsid = undefined

src/packages/pc/views/investor/custom/accountcfg/components/add/select-investor/index.vue

@@ -21,7 +21,7 @@ import AppRemoteSelect from '@pc/components/base/remote-select/index.vue'
 const props = defineProps({
     modelValue: Number,
     params: {
-        type: Object as PropType<Model.InitAccTradeReq>
+        type: Object as PropType<Investor.InitAccTradeReq>
     },
 })
 

src/packages/pc/views/investor/custom/accountcfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccTradeConfigViewRsp>,
+        type: Object as PropType<Investor.AccTradeConfigViewRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/accountcfg/components/edit/index.vue

@@ -125,7 +125,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccTradeConfigViewRsp>,
+        type: Object as PropType<Investor.AccTradeConfigViewRsp>,
         required: true
     }
 })
@@ -139,7 +139,7 @@ const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
 
-const formData = reactive<Model.TradeConfigAddReq>({
+const formData = reactive<Member.TradeConfigAddReq>({
     memberuserid: props.record.memberuserid,
     accountid: props.record.accountid,
     feeList: [],

src/packages/pc/views/investor/custom/accountcfg/index.vue

@@ -2,8 +2,8 @@
 <template>
     <div class="g-view-tree">
         <app-view>
-            <el-tree :data="nodeList" node-key="id" :props="{ label: 'name' }" :default-expanded-keys="['-1']"
-                @node-click="nodeClick" highlight-current />
+            <el-tree ref="treeRef" :data="nodeList" node-key="id" :props="{ label: 'name' }"
+                :default-expanded-keys="['-1']" @node-click="nodeClick" highlight-current />
         </app-view>
         <app-view>
             <div style="display: flex;justify-content: space-between;">
@@ -101,7 +101,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, toRaw } from 'vue'
+import { ref, reactive, computed, toRaw, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import type Node from 'element-plus/es/components/tree/src/model/node'
 import { handleNoneValue, buildTree } from '@/filters'
@@ -118,7 +118,8 @@ const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
 
-const nodeList = ref<(Model.AccTradeTreeRsp & { children: Model.AccTradeTreeRsp[]; })[]>([])
+const treeRef = ref()
+const nodeList = ref<(Investor.AccTradeTreeRsp & { children: Investor.AccTradeTreeRsp[]; })[]>([])
 const selectedNode = ref<Node>()
 
 const currentInfo = reactive({
@@ -128,7 +129,7 @@ const currentInfo = reactive({
     customerType: ''
 })
 
-const qs = computed<Model.AccTradeConfigViewReq>(() => {
+const qs = computed<Investor.AccTradeConfigViewReq>(() => {
     const data = selectedNode.value?.data
     return {
         userid: data?.userid,
@@ -139,7 +140,7 @@ const qs = computed<Model.AccTradeConfigViewReq>(() => {
     }
 })
 
-const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Model.AccTradeConfigViewRsp>({
+const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Investor.AccTradeConfigViewRsp>({
     onClose: (componentId) => {
         getNodeList()
         if (componentId === 'investor_custom_accountcfg_modify') {
@@ -167,6 +168,14 @@ const { run: getNodeList } = useRequest(getAccTradeTree, {
             }
         )
         nodeList.value = buildTree(res.data, 'id', 'pid', (node) => node.pid === '0')
+
+        // 设置选中节点
+        nextTick(() => {
+            const data = selectedNode.value?.data
+            if (data) {
+                treeRef.value.setCurrentKey(data.id)
+            }
+        })
     },
     onError: (err) => {
         ElMessage.error(err)
@@ -203,7 +212,7 @@ const feeColumns = computed<Model.TableColumn[]>(() => [
     { field: 'cvalue', label: '个性化' },
 ])
 
-const nodeClick = (data: Model.CreateTreeRsp, node: Node) => {
+const nodeClick = (data: Member.CreateTreeRsp, node: Node) => {
     if (data.goodsid) {
         selectedNode.value = node
         currentInfo.goodsName = node.label

src/packages/pc/views/investor/custom/group/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.PersonalizedRsp>,
+        type: Object as PropType<Investor.PersonalizedRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/group/components/edit/index.vue

@@ -46,7 +46,7 @@ import AppTableDetails from '@pc/components/base/table-details/index.vue'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.PersonalizedRsp>
+        type: Object as PropType<Investor.PersonalizedRsp>
     }
 })
 
@@ -59,11 +59,11 @@ const formRef = ref<FormInstance>()
 const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
-const configs = reactive<Model.RiskRatioTypeForMarketerRsp[]>([])
+const configs = reactive<Investor.RiskRatioTypeForMarketerRsp[]>([])
 
 const areauseridRef = ref() // 经纪会员组件实例
 
-const formData = ref<Model.AddPersonalizedReq>({
+const formData = ref<Investor.AddPersonalizedReq>({
     groupname: ''
 })
 

src/packages/pc/views/investor/custom/group/components/user/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.PersonalizedDetailRsp>,
+        type: Object as PropType<Investor.PersonalizedDetailRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/group/components/user/edit/index.vue

@@ -24,7 +24,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.PersonalizedRsp>,
+        type: Object as PropType<Investor.PersonalizedRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/group/components/user/index.vue

@@ -47,7 +47,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.PersonalizedRsp>,
+        type: Object as PropType<Investor.PersonalizedRsp>,
         required: true
     }
 })
@@ -58,9 +58,9 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const emit = defineEmits(['closed'])
-const selectedItem = ref<Model.PersonalizedDetailRsp>()
+const selectedItem = ref<Investor.PersonalizedDetailRsp>()
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.PersonalizedDetailReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.PersonalizedDetailReq>()
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run())
 
@@ -98,7 +98,7 @@ const onSearch = (clear = false) => {
     run(qs)
 }
 
-const showComponent = (code: string, row?: Model.PersonalizedDetailRsp) => {
+const showComponent = (code: string, row?: Investor.PersonalizedDetailRsp) => {
     selectedItem.value = row
     openComponent(code)
 }

src/packages/pc/views/investor/custom/group/index.vue

@@ -44,9 +44,9 @@ const { global: { t } } = i18n
 // 风险客户类别
 const customerTypeEnum = useEnum('customerType')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.PersonalizedReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.PersonalizedReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.PersonalizedRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.PersonalizedRsp>({
     onClose: () => onSearch()
 })
 

src/packages/pc/views/investor/custom/riskcfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccountRiskConfigRsp>,
+        type: Object as PropType<Investor.AccountRiskConfigRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/riskcfg/components/details/index.vue

@@ -23,7 +23,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccountRiskConfigRsp>,
+        type: Object as PropType<Investor.AccountRiskConfigRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/riskcfg/components/edit/index.vue

@@ -51,7 +51,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccountRiskConfigRsp>
+        type: Object as PropType<Investor.AccountRiskConfigRsp>
     }
 })
 
@@ -63,11 +63,11 @@ const formRef = ref<FormInstance>()
 const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
-const configs = reactive<Model.RiskRatioTypeForMarketerRsp[]>([])
+const configs = reactive<Investor.RiskRatioTypeForMarketerRsp[]>([])
 
 const useridRef = ref() // 交易商组件实例
 
-const formData = ref<Model.AddAccountRiskConfigReq>({})
+const formData = ref<Partial<Investor.AddAccountRiskConfigReq>>({})
 
 // 选中的风险率配置
 const selectedItem = computed(() => configs.find((e) => e.customertype === formData.value.customertype))

src/packages/pc/views/investor/custom/riskcfg/index.vue

@@ -44,9 +44,9 @@ const { global: { t } } = i18n
 // 风险客户类别
 const customerTypeEnum = useEnum('customerType')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.AccountRiskConfigReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.AccountRiskConfigReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.AccountRiskConfigRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.AccountRiskConfigRsp>({
     onClose: () => onSearch()
 })
 

src/packages/pc/views/investor/custom/tradecfg/components/add/index.vue

@@ -123,7 +123,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = reactive<Model.TraderPersonAddReq>({
+const formData = reactive<Investor.TraderPersonAddReq>({
     feeList: [],
     flag: 0,
     ruleList: []

src/packages/pc/views/investor/custom/tradecfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.TradeConfigViewRsp>,
+        type: Object as PropType<Investor.TradeConfigViewRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/custom/tradecfg/components/edit/index.vue

@@ -104,7 +104,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.TradeConfigViewRsp>,
+        type: Object as PropType<Investor.TradeConfigViewRsp>,
         required: true
     }
 })
@@ -118,7 +118,7 @@ const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
 
-const formData = reactive<Model.TraderPersonAddReq>({
+const formData = reactive<Investor.TraderPersonAddReq>({
     feeList: [],
     flag: 1,
     goodsid: props.record.goodsid,

src/packages/pc/views/investor/custom/tradecfg/index.vue

@@ -2,8 +2,8 @@
 <template>
     <div class="g-view-tree">
         <app-view>
-            <el-tree :data="nodeList" node-key="id" :props="{ label: 'name' }" :default-expanded-keys="['-1']"
-                @node-click="nodeClick" highlight-current />
+            <el-tree ref="treeRef" :data="nodeList" node-key="id" :props="{ label: 'name' }"
+                :default-expanded-keys="['-1']" @node-click="nodeClick" highlight-current />
         </app-view>
         <app-view>
             <div style="display: flex;justify-content: space-between;">
@@ -83,7 +83,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, reactive, toRaw } from 'vue'
+import { ref, computed, reactive, toRaw, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import type Node from 'element-plus/es/components/tree/src/model/node'
 import { buildTree, handleNoneValue } from '@/filters'
@@ -97,11 +97,13 @@ import AppOperation from '@pc/components/base/operation/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
 import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
 
-const nodeList = ref<(Model.InvestorTreeRsp & { children: Model.InvestorTreeRsp[]; })[]>([])
+const treeRef = ref()
+const nodeList = ref<(Investor.InvestorTreeRsp & { children: Investor.InvestorTreeRsp[]; })[]>([])
 const selectedNode = ref<Node>()
 
 const currentInfo = reactive({
@@ -112,7 +114,7 @@ const currentInfo = reactive({
     marginValue: ''
 })
 
-const qs = computed<Model.TradeConfigViewReq>(() => {
+const qs = computed<Investor.TradeConfigViewReq>(() => {
     const data = selectedNode.value?.data
     return {
         usergroupid: data?.usergroupid,
@@ -121,9 +123,7 @@ const qs = computed<Model.TradeConfigViewReq>(() => {
     }
 })
 
-const { global: { t } } = i18n
-
-const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Model.TradeConfigViewRsp>({
+const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Investor.TradeConfigViewRsp>({
     onClose: (componentId) => {
         getNodeList()
         if (componentId === 'investor_custom_tradecfg_modify') {
@@ -149,6 +149,14 @@ const { run: getNodeList } = useRequest(getInvestorTree, {
             }
         )
         nodeList.value = buildTree(res.data, 'id', 'pid', (node) => node.pid === '0')
+
+        // 设置选中节点
+        nextTick(() => {
+            const data = selectedNode.value?.data
+            if (data) {
+                treeRef.value.setCurrentKey(data.id)
+            }
+        })
     },
     onError: (err) => {
         ElMessage.error(err)
@@ -184,7 +192,7 @@ const feeColumns = computed<Model.TableColumn[]>(() => [
     { field: 'cvalue', label: 'investor.custom.tradecfg.cvalue' },
 ])
 
-const nodeClick = (data: Model.InvestorTreeRsp, node: Node) => {
+const nodeClick = (data: Investor.InvestorTreeRsp, node: Node) => {
     if (data.goodsid) {
         selectedNode.value = node
         currentInfo.goodsName = node.label

src/packages/pc/views/investor/manage/cancelapply/components/details/index.vue

@@ -28,7 +28,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorUserCancelApplyRsp>,
+        type: Object as PropType<Investor.InvestorUserCancelApplyRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/cancelapply/index.vue

@@ -27,7 +27,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { ElMessage } from 'element-plus'
-import { formatDate, handleNoneValue } from '@/filters'
+import { formatDate } from '@/filters'
 import { useEnum } from '@/hooks/enum'
 import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable-v2'
@@ -46,7 +46,7 @@ const ucapplystatusEnum = useEnum('ucapplystatus')
 // 处理状态
 const handlestatusEnum = useEnum('handlestatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.InvestorUserCancelApplyRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.InvestorUserCancelApplyRsp>({
     onClose: () => onSearch()
 })
 
@@ -70,7 +70,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.InvestorUserCancelApplyReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Investor.InvestorUserCancelApplyReq>({
     filters: [
         {
             field: 'accountname',
@@ -89,7 +89,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.Inves
 })
 
 // 处理操作按钮
-const handleOperateButtons = (row: Model.InvestorUserCancelApplyRsp) => {
+const handleOperateButtons = (row: Investor.InvestorUserCancelApplyRsp) => {
     const buttons = ['investor_manage_cancelapply_details']
     if (!row.handlestatus) {
         buttons.push('investor_manage_cancelapply_audit')

src/packages/pc/views/investor/manage/modification/components/audit/index.vue

@@ -15,7 +15,7 @@ import { i18n } from '@/stores'
 
 defineProps({
     record: {
-        type: Object as PropType<Model.ModifyPageRsp>,
+        type: Object as PropType<Investor.ModifyPageRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/modification/components/audit/operate/index.vue

@@ -30,7 +30,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.ModifyPageRsp>,
+        type: Object as PropType<Investor.ModifyPageRsp>,
         required: true
     }
 })
@@ -41,7 +41,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = ref<Model.ModifyAuditReq>({
+const formData = ref<Investor.ModifyAuditReq>({
     auditflag: 1,
     userid: props.record.userid,
 })

src/packages/pc/views/investor/manage/modification/index.vue

@@ -40,9 +40,9 @@ const { global: { t } } = i18n
 // 变更状态
 const modifystatusEnum = useEnum('modifystatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.ModifyPageReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.ModifyPageReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.ModifyPageRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.ModifyPageRsp>({
     onClose: () => onSearch()
 })
 

src/packages/pc/views/investor/manage/transfer/components/edit/index.vue

@@ -100,11 +100,11 @@ const loading = shallowRef(false)
 const outParentUserRef = shallowRef() // 转出所属会员组件实例
 const inUserRef = shallowRef() // 转入所属机构组件实例
 
-const accountInfo = shallowRef<Model.UserAccountDetailRsp>()
+const accountInfo = shallowRef<Investor.UserAccountDetailRsp>()
 const outUserInfo = shallowRef<Model.UserinfoByUserIdRsp>()
 const inUserInfo = shallowRef<Model.UserinfoByUserIdRsp>()
 
-const formData = reactive<Partial<Model.InvestorTransferAddReq>>({
+const formData = reactive<Partial<Investor.InvestorTransferAddReq>>({
     diversiontype: 1,
 })
 

src/packages/pc/views/investor/manage/transfer/index.vue

@@ -66,7 +66,7 @@ const transferstatusEnum = useEnum('transferstatus')
 // 转移类型
 const investortransfertypeEnum = useEnum('investortransfertype')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganSonRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganSonRsp>({
     onClose: () => onSearch()
 })
 
@@ -93,7 +93,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganSonTransferReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganSonTransferReq>({
     filters: [
         {
             field: 'outinvestor',

src/packages/pc/views/investor/manage/user/components/account/details/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.ShowAccountRsp>,
+        type: Object as PropType<Investor.ShowAccountRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/account/edit/index.vue

@@ -39,7 +39,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.ShowAccountRsp>,
+        type: Object as PropType<Investor.ShowAccountRsp>,
         required: true
     }
 })
@@ -54,7 +54,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = ref<Model.InvestorAccountEditReq>({
+const formData = ref<Investor.InvestorAccountEditReq>({
     accountid: props.selectedItem.accountid,
     outthreshold: props.selectedItem.outthreshold,
     parentaccountid: props.selectedItem.parentaccountid,

src/packages/pc/views/investor/manage/user/components/account/index.vue

@@ -47,7 +47,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })
@@ -58,7 +58,7 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const emit = defineEmits(['closed'])
-const selectedItem = ref<Model.ShowAccountRsp>()
+const selectedItem = ref<Investor.ShowAccountRsp>()
 
 const accounttypeEnum = useEnum('accounttype') // 内/外部
 const tradestatusEnum = useEnum('traderstatus') // 交易状态
@@ -87,7 +87,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.ShowAccountReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Investor.ShowAccountReq>({
     filters: [
         {
             field: 'accountid',
@@ -106,7 +106,7 @@ const onSearch = (clear = false) => {
     run(qs)
 }
 
-const showComponent = (code: string, row?: Model.ShowAccountRsp) => {
+const showComponent = (code: string, row?: Investor.ShowAccountRsp) => {
     selectedItem.value = row
     openComponent(code)
 }

src/packages/pc/views/investor/manage/user/components/cancel/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/user/components/close/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/user/components/config/index.vue

@@ -47,7 +47,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })
@@ -90,7 +90,7 @@ const feeColumns = computed<Model.TableColumn[]>(() => [
     { field: 'memberdefaultvalue', label: 'investor.manage.user.config.memberdefaultvalue' },
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.AccountQueryReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Investor.AccountQueryReq>({
     filters: [
         {
             field: 'accountid',

src/packages/pc/views/investor/manage/user/components/details/index.vue

@@ -9,7 +9,7 @@ import DetailsView from './view.vue'
 
 defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/user/components/details/view.vue

@@ -84,8 +84,8 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 const hideField = [2, 3, 4].includes(props.modifyStatus) // 根据状态是否隐藏字段
-const newData = ref<Model.InvestorListDetailRsp['newResult']>()
-const oldData = ref<Model.InvestorListDetailRsp['oldResult']>()
+const newData = ref<Investor.InvestorListDetailRsp['newResult']>()
+const oldData = ref<Investor.InvestorListDetailRsp['oldResult']>()
 
 // 是否实名
 const hasauthEnum = useEnum('hasauth')

src/packages/pc/views/investor/manage/user/components/edit/index.vue

@@ -164,7 +164,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>
+        type: Object as PropType<Investor.InvestorListRsp>
     }
 })
 
@@ -194,7 +194,7 @@ const uploadFiles = reactive<{
 // 是否个人
 const isPerson = computed(() => formData.value.userinfoDetailVo.userinfoType === UserInfoType.Personal)
 
-const formData = ref<Model.InvestorEditReq>({
+const formData = ref<Investor.InvestorEditReq>({
     userAccountDetailVo: {},
     userinfoDetailVo: {}
 })

src/packages/pc/views/investor/manage/user/components/login/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/login/details/index.vue

@@ -25,7 +25,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/login/index.vue

@@ -57,7 +57,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })
@@ -75,7 +75,7 @@ const emit = defineEmits(['closed'])
 
 const userStore = useUserStore()
 
-const selectedItem = ref<Model.InvestorLoginListRsp>()
+const selectedItem = ref<Investor.InvestorLoginListRsp>()
 
 const loginstatusEnum = useEnum('loginstatus') // 账号状态
 
@@ -100,7 +100,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.InvestorLoginListReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Investor.InvestorLoginListReq>({
     filters: [
         {
             field: 'loginid',
@@ -123,7 +123,7 @@ const onSearch = (clear = false) => {
     run(qs)
 }
 
-const showComponent = (code: string, row?: Model.InvestorLoginListRsp) => {
+const showComponent = (code: string, row?: Investor.InvestorLoginListRsp) => {
     selectedItem.value = row
     openComponent(code)
 }

src/packages/pc/views/investor/manage/user/components/login/lock/index.vue

@@ -19,7 +19,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/login/log/index.vue

@@ -26,7 +26,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/login/password/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/login/recover/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.InvestorLoginListRsp>,
+        type: Object as PropType<Investor.InvestorLoginListRsp>,
         required: true
     },
 })

src/packages/pc/views/investor/manage/user/components/recover/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorListRsp>,
+        type: Object as PropType<Investor.InvestorListRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/manage/user/index.vue

@@ -48,9 +48,9 @@ const areastatusEnum = useEnum('areastatus')
 // 变更状态
 const modifystatusEnum = useEnum('modifystatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.InvestorListReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.InvestorListReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.InvestorListRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.InvestorListRsp>({
     onClose: () => onSearch()
 })
 
@@ -105,7 +105,7 @@ filterOptons.buttonList = [
 ]
 
 // 处理操作按钮
-const handleOperateButtons = (row: Model.InvestorListRsp) => {
+const handleOperateButtons = (row: Investor.InvestorListRsp) => {
     const buttons = ['investor_manage_user_details']
     if (row.accountStatus === 6) {
         buttons.push('investor_manage_user_recover')

src/packages/pc/views/investor/user/initreview/index.vue

@@ -46,9 +46,9 @@ const openmodeEnum = useEnum('openmode')
 // 开户状态
 const userstateEnum = useEnum('investorOpenStatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.InvestorReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.InvestorReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.InvestorRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.InvestorRsp>({
     onClose: () => onSearch()
 })
 

src/packages/pc/views/investor/user/open/components/cancel/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorRsp>,
+        type: Object as PropType<Investor.InvestorRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/user/open/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorRsp>,
+        type: Object as PropType<Investor.InvestorRsp>,
         required: true
     }
 })

src/packages/pc/views/investor/user/open/components/details/index.vue

@@ -57,7 +57,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorRsp>,
+        type: Object as PropType<Investor.InvestorRsp>,
         required: true
     },
     audit: Boolean

src/packages/pc/views/investor/user/open/components/edit/index.vue

@@ -159,7 +159,7 @@ import service from '@/services'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.InvestorRsp>
+        type: Object as PropType<Investor.InvestorRsp>
     }
 })
 
@@ -174,7 +174,7 @@ const areaidRef = ref() // 所属机构组件实例
 const brokeridRef = ref() // 经纪人组件实例
 const referralRef = ref() // 推荐人组件实例
 
-const formData = ref<Partial<Model.MemberDetail>>({
+const formData = ref<Partial<Member.MemberDetail>>({
     userinfotype: UserInfoType.Personal,
     sex: Gender.Male
 })

src/packages/pc/views/investor/user/open/index.vue

@@ -45,9 +45,9 @@ const openmodeEnum = useEnum('openmode')
 // 开户状态
 const userstateEnum = useEnum('investorOpenStatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.InvestorReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.InvestorReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.InvestorRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.InvestorRsp>({
     onClose: () => onSearch()
 })
 
@@ -83,7 +83,7 @@ filterOptons.buttonList = [
 ]
 
 // 处理操作按钮
-const handleOperateButtons = (row: Model.InvestorRsp) => {
+const handleOperateButtons = (row: Investor.InvestorRsp) => {
     switch (row.userState) {
         case 1:
         case 3:

src/packages/pc/views/investor/user/rereview/index.vue

@@ -45,9 +45,9 @@ const openmodeEnum = useEnum('openmode')
 // 开户状态
 const userstateEnum = useEnum('investorOpenStatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.InvestorReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Investor.InvestorReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.InvestorRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Investor.InvestorRsp>({
     onClose: () => onSearch()
 })
 

src/packages/pc/views/member/institution/broker/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/broker/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/broker/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/goodscfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberGoodsLimitRsp>,
+        type: Object as PropType<Member.MemberGoodsLimitRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/goodscfg/components/edit/index.vue

@@ -61,7 +61,7 @@ import { useMarket } from '@/hooks/market'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberGoodsLimitRsp>
+        type: Object as PropType<Member.MemberGoodsLimitRsp>
     }
 })
 
@@ -72,7 +72,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = shallowRef(false)
 
-const formData = ref<Partial<Model.AddLimitReq>>({
+const formData = ref<Partial<Member.AddLimitReq>>({
     iscannotbuy: 0,
     iscannotsell: 0,
     isnodisplay: 0,

src/packages/pc/views/member/institution/goodscfg/index.vue

@@ -57,7 +57,7 @@ import AppSelectMember from '@pc/components/modules/select-member/index.vue'
 const { getMarketOptions } = useMarket()
 const { global: { t } } = i18n
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.MemberGoodsLimitRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.MemberGoodsLimitRsp>({
     onClose: () => onSearch()
 })
 
@@ -81,7 +81,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.MemberGoodsLimitReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.MemberGoodsLimitReq>({
     filters: [
         {
             field: 'userid',

src/packages/pc/views/member/institution/industry/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/industry/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/industry/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/marketer/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/marketer/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/marketer/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/marketing/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/marketing/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/open/components/cancel/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>,
+        type: Object as PropType<Member.MemberDetail>,
         required: true
     }
 })

src/packages/pc/views/member/institution/open/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>,
+        type: Object as PropType<Member.MemberDetail>,
         required: true
     }
 })

src/packages/pc/views/member/institution/open/components/details/agree.vue

@@ -31,7 +31,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>,
+        type: Object as PropType<Member.MemberDetail>,
         required: true
     }
 })
@@ -42,7 +42,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = ref<Partial<Model.MemberDetail>>({
+const formData = ref<Partial<Member.MemberDetail>>({
     userid: props.record.userid,
     auditflag: 1,
     smpassword: '123456'

src/packages/pc/views/member/institution/open/components/details/index.vue

@@ -73,7 +73,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>,
+        type: Object as PropType<Member.MemberDetail>,
         required: true
     }
 })

src/packages/pc/views/member/institution/open/components/details/refuse.vue

@@ -22,7 +22,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>,
+        type: Object as PropType<Member.MemberDetail>,
         required: true
     }
 })
@@ -33,7 +33,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = ref<Partial<Model.MemberDetail>>({
+const formData = ref<Partial<Member.MemberDetail>>({
     userid: props.record.userid,
     auditflag: 2
 })

src/packages/pc/views/member/institution/open/components/edit/index.vue

@@ -126,7 +126,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.MemberDetail>
+        type: Object as PropType<Member.MemberDetail>
     }
 })
 
@@ -157,7 +157,7 @@ const uploadFiles = reactive<{
 // 是否个人
 const isPerson = computed(() => formData.value.userinfotype === UserInfoType.Personal)
 
-const formData = ref<Partial<Model.MemberDetail>>({
+const formData = ref<Partial<Member.MemberDetail>>({
     userinfotype: UserInfoType.Company,
     sex: Gender.Male
 })

src/packages/pc/views/member/institution/open/index.vue

@@ -58,9 +58,9 @@ const openmodeEnum = useEnum('openmode')
 // 开户状态
 const userstateEnum = useEnum('investorOpenStatus')
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.WskhUserinfoReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Member.WskhUserinfoReq>()
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.MemberDetail>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.MemberDetail>({
     onClose: () => onSearch()
 })
 
@@ -92,7 +92,7 @@ filterOptons.buttonList = [
 ]
 
 // 处理操作按钮
-const handleOperateButtons = (row: Model.MemberDetail) => {
+const handleOperateButtons = (row: Member.MemberDetail) => {
     switch (row.userstate) {
         case 1:
         case 3:

src/packages/pc/views/member/institution/operation/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/operation/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/operation/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/riskcfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccountRiskConfigRsp>,
+        type: Object as PropType<Member.AccountRiskConfigRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/riskcfg/index.vue

@@ -2,14 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-filter :option="filterOption">
-                <template #memberuserid="{ item }">
-                    <el-form-item :label="item.label" prop="memberuserid">
-                        <app-select-member v-model="item.value" :params="{ usertype: '2,3' }"
-                            :placeholder="t('member.institution.riskcfg.tips2')" />
-                    </el-form-item>
-                </template>
-            </app-filter>
+            <app-filter :option="filterOption" />
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
@@ -44,11 +37,10 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
-import AppSelectMember from '@pc/components/modules/select-member/index.vue'
 
 const { global: { t } } = i18n
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.AccountRiskConfigRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.AccountRiskConfigRsp>({
     onClose: () => onSearch()
 })
 
@@ -70,17 +62,15 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.AccountRiskConfigReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.AccountRiskConfigReq>({
     filters: [
         {
-            field: 'memberuserid',
-            label: t('member.institution.riskcfg.memberuserid'),
-            required: true,
+            field: 'username',
+            label: t('member.institution.riskcfg.memberuserid')
         },
         {
             field: 'accountid',
-            label: t('member.institution.riskcfg.accountid'),
-            required: true,
+            label: t('member.institution.riskcfg.accountid')
         }
     ],
     buttons: [
@@ -94,5 +84,4 @@ const onSearch = () => {
     const qs = getQueryParams()
     run(qs)
 }
-
 </script>

src/packages/pc/views/member/institution/self/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/self/components/details/index.vue

@@ -33,7 +33,7 @@ const { global: { t } } = i18n
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganRoleRsp>,
+        type: Object as PropType<Member.OrganRoleRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/self/index.vue

@@ -43,7 +43,7 @@ const { global: { t } } = i18n
 // 状态
 const areastatusEnum = useEnum('areastatus')
 
-const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganRoleReq>({
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleReq>({
     onClose: () => onSearch()
 })
 
@@ -69,7 +69,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganRoleReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganRoleReq>({
     filters: [
         {
             field: 'accountname',

src/packages/pc/views/member/institution/tradecfg/components/add/index.vue

@@ -115,7 +115,7 @@ const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
 
-const formData = reactive<Model.TradeConfigAddReq>({
+const formData = reactive<Member.TradeConfigAddReq>({
     memberuserid: 0,
     feeList: [],
     ruleList: [],
@@ -207,7 +207,7 @@ const onTradeTypeChange = () => {
 }
 
 // 选择会员
-const onMemberChange = (item?: Model.InitAccTradeRsp) => {
+const onMemberChange = (item?: Model.OrganSelectRsp) => {
     formData.accountid = undefined
     formData.marketid = undefined
     formData.goodsid = undefined

src/packages/pc/views/member/institution/tradecfg/components/delete/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccTradeConfigViewRsp>,
+        type: Object as PropType<Member.TradeConfigViewRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/tradecfg/components/edit/index.vue

@@ -83,7 +83,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.AccTradeConfigViewRsp>,
+        type: Object as PropType<Member.TradeConfigViewRsp>,
         required: true
     }
 })
@@ -97,7 +97,7 @@ const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
 
-const formData = reactive<Model.TradeConfigAddReq>({
+const formData = reactive<Member.TradeConfigAddReq>({
     memberuserid: props.record.memberuserid,
     accountid: props.record.accountid,
     feeList: [],

src/packages/pc/views/member/institution/tradecfg/index.vue

@@ -2,8 +2,8 @@
 <template>
     <div class="g-view-tree">
         <app-view>
-            <el-tree :data="nodeList" node-key="id" :props="{ label: 'name' }" :default-expanded-keys="['-1', '-2']"
-                @node-click="nodeClick" highlight-current />
+            <el-tree ref="treeRef" :data="nodeList" node-key="id" :props="{ label: 'name' }"
+                :default-expanded-keys="['-1', '-2']" @node-click="nodeClick" highlight-current />
         </app-view>
         <app-view>
             <div style="display: flex;justify-content: space-between;">
@@ -67,7 +67,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, toRaw } from 'vue'
+import { ref, reactive, computed, toRaw, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import type Node from 'element-plus/es/components/tree/src/model/node'
 import { handleNoneValue, buildTree } from '@/filters'
@@ -84,7 +84,8 @@ const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
 
-const nodeList = ref<(Model.CreateTreeRsp & { children: Model.CreateTreeRsp[]; })[]>([])
+const treeRef = ref()
+const nodeList = ref<(Member.CreateTreeRsp & { children: Member.CreateTreeRsp[]; })[]>([])
 const selectedNode = ref<Node>()
 
 const currentInfo = reactive({
@@ -94,7 +95,7 @@ const currentInfo = reactive({
     customerType: ''
 })
 
-const qs = computed<Model.OrganDetailTradeConfigViewReq>(() => {
+const qs = computed<Member.TradeConfigViewReq>(() => {
     const data = selectedNode.value?.data
     return {
         userid: data?.userid,
@@ -106,7 +107,7 @@ const qs = computed<Model.OrganDetailTradeConfigViewReq>(() => {
     }
 })
 
-const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganDetailTradeConfigViewRsp>({
+const { componentMap, componentId, openComponent, closeComponent, getActionButtons } = useOperation<Member.TradeConfigViewRsp>({
     onClose: (componentId) => {
         getNodeList()
         if (componentId === 'member_institution_tradecfg_modify') {
@@ -145,6 +146,14 @@ const { run: getNodeList } = useRequest(createTree, {
             }
         )
         nodeList.value = buildTree(res.data, 'id', 'pid', (node) => node.pid === '0')
+
+        // 设置选中节点
+        nextTick(() => {
+            const data = selectedNode.value?.data
+            if (data) {
+                treeRef.value.setCurrentKey(data.id)
+            }
+        })
     },
     onError: (err) => {
         ElMessage.error(err)
@@ -177,7 +186,7 @@ const feeColumns = computed<Model.TableColumn[]>(() => [
     { field: 'cvalue', label: '个性化' },
 ])
 
-const nodeClick = (data: Model.CreateTreeRsp, node: Node) => {
+const nodeClick = (data: Member.CreateTreeRsp, node: Node) => {
     if (data.goodsid) {
         selectedNode.value = node
         currentInfo.goodsName = node.label

src/packages/pc/views/member/institution/user/components/account/edit/index.vue

@@ -40,7 +40,7 @@ import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganTaaccountRsp>,
+        type: Object as PropType<Member.OrganTaaccountRsp>,
         required: true
     }
 })
@@ -56,7 +56,7 @@ const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
 
-const formData = reactive<Model.TaaccountEditReq>({
+const formData = reactive<Member.TaaccountEditReq>({
     accountid: props.record.accountId,
     outthreshold: props.record.outThreshold,
     parentaccountid: props.record.parentAccountId,

src/packages/pc/views/member/institution/user/components/account/index.vue

@@ -47,7 +47,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })
@@ -68,7 +68,7 @@ const accounttypeEnum = useEnum('accounttype')
 // 交易状态
 const traderstatusEnum = useEnum('traderstatus')
 
-const selectedItem = shallowRef<Model.OrganTaaccountRsp>()
+const selectedItem = shallowRef<Member.OrganTaaccountRsp>()
 
 const { global: { t } } = i18n
 
@@ -97,7 +97,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'operate', label: 'common.operate', width: 180, fixed: 'right' }
 ])
 
-const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganTaaccountReq>({
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.OrganTaaccountReq>({
     filters: [
         {
             field: 'accountId',
@@ -110,7 +110,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.Organ
     ]
 })
 
-const showComponent = (code: string, row?: Model.OrganTaaccountRsp) => {
+const showComponent = (code: string, row?: Member.OrganTaaccountRsp) => {
     selectedItem.value = row
     openComponent(code)
 }

src/packages/pc/views/member/institution/user/components/account/password/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganTaaccountRsp>,
+        type: Object as PropType<Member.OrganTaaccountRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/account/signstatement/index.vue

@@ -33,7 +33,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganTaaccountRsp>,
+        type: Object as PropType<Member.OrganTaaccountRsp>,
         required: true
     }
 })
@@ -64,7 +64,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'currency', label: '币种' }
 ])
 
-const { filterOption, getQueryParams } = useDataFilter<Model.SignlogReq>({
+const { filterOption, getQueryParams } = useDataFilter<Member.SignlogReq>({
     filters: [
         {
             field: 'querytype',

src/packages/pc/views/member/institution/user/components/close/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/details/index.vue

@@ -56,7 +56,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/edit/index.vue

@@ -140,7 +140,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })
@@ -155,7 +155,7 @@ const refresh = ref(false)
 
 const refereeuseridRef = ref() // 推荐人组件实例
 
-const formData = ref<Partial<Model.EditOrganReq>>({})
+const formData = ref<Partial<Member.EditOrganReq>>({})
 
 const uploadFiles = reactive<{
     cardfrontphotourl: UploadUserFile[];

src/packages/pc/views/member/institution/user/components/login/index.vue

@@ -44,7 +44,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })
@@ -62,7 +62,7 @@ const userstatusEnum = useEnum('userstatus')
 
 const { global: { t } } = i18n
 const statuses = shallowRef(0) // 所有状态
-const selectedItem = shallowRef<Model.OrganTaaccountRsp>()
+const selectedItem = shallowRef<Member.OrganTaaccountRsp>()
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run())
 
@@ -90,7 +90,7 @@ const updateStatuses = (value: number) => {
     openComponent('UpdateStatuses')
 }
 
-const showComponent = (code: string, row?: Model.OrganTaaccountRsp) => {
+const showComponent = (code: string, row?: Member.OrganTaaccountRsp) => {
     selectedItem.value = row
     openComponent(code)
 }

src/packages/pc/views/member/institution/user/components/login/password/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.Organ2UserRsp>,
+        type: Object as PropType<Member.Organ2UserRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/login/status/index.vue

@@ -21,7 +21,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
-        type: Object as PropType<Model.Organ2UserRsp>,
+        type: Object as PropType<Member.Organ2UserRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/login/statuses/index.vue

@@ -25,7 +25,7 @@ const props = defineProps({
         required: true
     },
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })

src/packages/pc/views/member/institution/user/components/recover/index.vue

@@ -18,7 +18,7 @@ import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
-        type: Object as PropType<Model.OrganDetailListRsp>,
+        type: Object as PropType<Member.OrganDetailListRsp>,
         required: true
     }
 })