Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

src/packages/pc/components/modules/roles/index.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, PropType } from 'vue'
+import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import { handleNoneValue } from '@/filters'
 import { useRequest } from '@/hooks/request'
@@ -29,6 +29,7 @@ import { i18n } from '@/stores'
 import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { useEnum } from '@/hooks/enum'
 
 const props = defineProps({
     roleid: {
@@ -37,6 +38,7 @@ const props = defineProps({
     }
 })
 
+const roleTypeEnum = useEnum('roleType') // 角色名称
 const { global: { t } } = i18n
 const filteredRoutes = ref<Model.MenusRsp[]>([])
 const show = ref(true)
@@ -96,7 +98,7 @@ const { data, loading } = useRequest(queryDetail, {
 })
 
 const detailProps: CellProp[] = [
-    { prop: 'rolename', label: 'admin.role.edit.rolename' },
+    { prop: 'autoid', label: 'admin.role.edit.rolename', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
     { prop: 'sensitivefields', label: 'admin.role.edit.sensitivefields' },
     { prop: 'menuids', label: 'admin.role.edit.menuids' },
 ]

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

@@ -106,7 +106,10 @@ const { run: runRoleDetail } = useRequest(queryRoleDetail, {
     },
     onSuccess: (res) => {
         formData.value.customertype = res.data.customertype.customertype
-        runAccountIdForMarket()
+        // 获取资金账号信息
+        runAccountIdForMarket({
+            userid: props.record?.userid
+        })
     }
 })