From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 02d3363..e2892d9 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -94,19 +94,19 @@
</template>
<template slot="tenantName"
slot-scope="{row}">
- <el-tag>{{ row.tenantName }}</el-tag>
+ <el-tag v-if="row.tenantName">{{ row.tenantName }}</el-tag>
</template>
<template slot="roleName"
slot-scope="{row}">
- <el-tag>{{ row.roleName }}</el-tag>
+ <el-tag v-if="row.roleName">{{ row.roleName }}</el-tag>
</template>
<template slot="deptName"
slot-scope="{row}">
- <el-tag>{{ row.deptName }}</el-tag>
+ <el-tag v-if="row.deptName">{{ row.deptName }}</el-tag>
</template>
<template slot="userTypeName"
slot-scope="{row}">
- <el-tag>{{ row.userTypeName }}</el-tag>
+ <el-tag v-if="row.userTypeName">{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
</div>
@@ -434,7 +434,7 @@
option() {
return{
height:'auto',
- calcHeight: 80,
+ calcHeight: 70,
tip: false,
searchShow: true,
searchMenuSpan: 6,
--
Gitblit v1.9.3