Compare commits
No commits in common. "5ee7ba982072930003232d85211cafc1efb2d010" and "28bb98099c6d5317824038e0a888e162869afd14" have entirely different histories.
5ee7ba9820
...
28bb98099c
|
@ -103,29 +103,7 @@
|
||||||
stripe
|
stripe
|
||||||
@sort-change="handleSortByColumn"
|
@sort-change="handleSortByColumn"
|
||||||
>
|
>
|
||||||
<el-table-column type="index" width="60">
|
<el-table-column type="index" width="50" />
|
||||||
<template slot-scope="scope">
|
|
||||||
<span
|
|
||||||
style="
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-end;
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-tooltip
|
|
||||||
class="item"
|
|
||||||
effect="dark"
|
|
||||||
:content="$t('trials:staff:tip:userDisabled')"
|
|
||||||
placement="top"
|
|
||||||
style="margin-right: 3px"
|
|
||||||
v-if="!scope.row.Status"
|
|
||||||
>
|
|
||||||
<i v-if="!scope.row.Status" class="el-icon-warning icon-i"></i>
|
|
||||||
</el-tooltip>
|
|
||||||
<span>{{ scope.$index + 1 }}</span>
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<!-- 姓名 -->
|
<!-- 姓名 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="FullName"
|
prop="FullName"
|
||||||
|
@ -151,22 +129,6 @@
|
||||||
width="140"
|
width="140"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tooltip
|
|
||||||
class="item"
|
|
||||||
effect="dark"
|
|
||||||
:content="$t('trials:staff:tip:userTypeDisabled')"
|
|
||||||
placement="top"
|
|
||||||
style="margin-right: 3px"
|
|
||||||
v-if="
|
|
||||||
Array.isArray(scope.row.TrialUserRoleList) &&
|
|
||||||
scope.row.TrialUserRoleList.length > 0 &&
|
|
||||||
scope.row.TrialUserRoleList.some(
|
|
||||||
(item) => item.IsDeleted || item.IsUserRoleDisabled
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<i class="el-icon-warning icon-i"></i>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-button
|
<el-button
|
||||||
v-if="
|
v-if="
|
||||||
Array.isArray(scope.row.TrialUserRoleList) &&
|
Array.isArray(scope.row.TrialUserRoleList) &&
|
||||||
|
@ -285,7 +247,7 @@
|
||||||
:title="$t('trials:staff:action:status')"
|
:title="$t('trials:staff:action:status')"
|
||||||
icon="el-icon-edit-outline"
|
icon="el-icon-edit-outline"
|
||||||
:disabled="
|
:disabled="
|
||||||
!!scope.row.TrialUserRoleList.find(
|
scope.row.TrialUserRoleList.find(
|
||||||
(item) => item.UserTypeEnum === 1
|
(item) => item.UserTypeEnum === 1
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
@ -397,32 +359,7 @@
|
||||||
<base-model v-if="role_model.visible" :config="role_model">
|
<base-model v-if="role_model.visible" :config="role_model">
|
||||||
<template slot="dialog-body">
|
<template slot="dialog-body">
|
||||||
<el-table :data="roleList" style="width: 100%" max-height="300px">
|
<el-table :data="roleList" style="width: 100%" max-height="300px">
|
||||||
<el-table-column type="index" width="60">
|
<el-table-column type="index" width="40" />
|
||||||
<template slot-scope="scope">
|
|
||||||
<span
|
|
||||||
style="
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-end;
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-tooltip
|
|
||||||
class="item"
|
|
||||||
effect="dark"
|
|
||||||
:content="$t('trials:staff:tip:userDisabled')"
|
|
||||||
placement="top"
|
|
||||||
style="margin-right: 3px"
|
|
||||||
v-if="scope.row.IsUserRoleDisabled"
|
|
||||||
>
|
|
||||||
<i
|
|
||||||
v-if="scope.row.IsUserRoleDisabled"
|
|
||||||
class="el-icon-warning icon-i"
|
|
||||||
></i>
|
|
||||||
</el-tooltip>
|
|
||||||
<span>{{ scope.$index + 1 }}</span>
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="UserTypeShortName"
|
prop="UserTypeShortName"
|
||||||
:label="
|
:label="
|
||||||
|
@ -749,8 +686,4 @@ export default {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.icon-i {
|
|
||||||
color: #e6a23c;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue