hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-17 20:35:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into member_dev

Browse Source 
# Conflicts:
#	src/views/member/user/UserForm.vue
This commit is contained in:
owen
2023-08-23 10:22:03 +08:00
parent e9120f06cf 55772cbba0
commit 2e68a5239d
51 changed files with 2277 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/member/user/index.vue
View File

@ -84,10 +84,12 @@
:show-overflow-tooltip="false"
>
<template #default="scope">
<el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index">{{ tagName }}</el-tag>
<el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index" class="mr-5px">
{{ tagName }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="积分" align="center" width="100px" />
<el-table-column label="积分" align="center" prop="point" width="100px" />
<el-table-column label="状态" align="center" prop="status" width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />