Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
a5445804e2
|
@ -103,7 +103,29 @@
|
|||
stripe
|
||||
@sort-change="handleSortByColumn"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column type="index" width="60">
|
||||
<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
|
||||
prop="FullName"
|
||||
|
@ -129,6 +151,22 @@
|
|||
width="140"
|
||||
>
|
||||
<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
|
||||
v-if="
|
||||
Array.isArray(scope.row.TrialUserRoleList) &&
|
||||
|
@ -247,7 +285,7 @@
|
|||
:title="$t('trials:staff:action:status')"
|
||||
icon="el-icon-edit-outline"
|
||||
:disabled="
|
||||
scope.row.TrialUserRoleList.find(
|
||||
!!scope.row.TrialUserRoleList.find(
|
||||
(item) => item.UserTypeEnum === 1
|
||||
)
|
||||
"
|
||||
|
@ -359,7 +397,32 @@
|
|||
<base-model v-if="role_model.visible" :config="role_model">
|
||||
<template slot="dialog-body">
|
||||
<el-table :data="roleList" style="width: 100%" max-height="300px">
|
||||
<el-table-column type="index" width="40" />
|
||||
<el-table-column type="index" width="60">
|
||||
<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
|
||||
prop="UserTypeShortName"
|
||||
:label="
|
||||
|
@ -686,4 +749,8 @@ export default {
|
|||
padding: 10px;
|
||||
}
|
||||
}
|
||||
.icon-i {
|
||||
color: #e6a23c;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue