From b4d75efaf8dcf280f7e0e7297ceda518e5030d32 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 30 一月 2024 16:52:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 838ec38..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>
@@ -396,6 +396,7 @@
userflag:true,
usernumber:0,
userStatus:false,
+ isUpdateShowInput:false,
};
},
watch: {
@@ -433,7 +434,7 @@
option() {
return{
height:'auto',
- calcHeight: 80,
+ calcHeight: 70,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -558,6 +559,7 @@
message: "璇疯緭鍏ョ櫥褰曡处鍙�",
trigger: "blur"
}],
+ disabled: this.isUpdateShowInput,
},
{
label: "鐢ㄦ埛骞冲彴",
@@ -711,7 +713,7 @@
multiple: true,
type: "tree",
dicData: [],
- disabled:this.userStatus,
+ disabled: this.isUpdateShowInput,
props: {
label: "title"
},
@@ -1100,9 +1102,9 @@
beforeOpen(done, type) {
// console.log(type)
if(type === "edit"){
- this.userStatus = true;
+ this.isUpdateShowInput = true;
}else {
- this.userStatus = false;
+ this.isUpdateShowInput = false;
}
//console.log(type)
// console.log('this.tenantId',this.tenantId)
--
Gitblit v1.9.3