Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="admin_page">
|
<div class="admin_page all-user">
|
||||||
<div class="admin_table_search">
|
<div class="admin_table_search">
|
||||||
<div class="admin_state">
|
<div class="admin_state">
|
||||||
<div class="admin_state_item">
|
<div class="admin_state_item">
|
||||||
@@ -435,7 +435,7 @@ export default defineComponent({
|
|||||||
if (!orgId) return
|
if (!orgId) return
|
||||||
Https.axiosPost(Https.httpUrls.searchSubscribeByOrg, {
|
Https.axiosPost(Https.httpUrls.searchSubscribeByOrg, {
|
||||||
organizationId: orgId,
|
organizationId: orgId,
|
||||||
status: ['ACTIVE','PENDING']
|
status: ['ACTIVE', 'PENDING']
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
// 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
|
// 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
|
||||||
const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
|
const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
|
||||||
@@ -459,7 +459,8 @@ export default defineComponent({
|
|||||||
orgId => {
|
orgId => {
|
||||||
if (orgId) {
|
if (orgId) {
|
||||||
fetchSubscribePlanList()
|
fetchSubscribePlanList()
|
||||||
const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
|
const userSubscriptionPlanId =
|
||||||
|
store.state.UserHabit.userDetail.subscriptionPlanId
|
||||||
if (userSubscriptionPlanId) {
|
if (userSubscriptionPlanId) {
|
||||||
selectPlanFilter(userSubscriptionPlanId)
|
selectPlanFilter(userSubscriptionPlanId)
|
||||||
}
|
}
|
||||||
@@ -766,4 +767,11 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.all-user {
|
||||||
|
.admin_table_content {
|
||||||
|
:deep(.ant-table-wrapper) {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user