From 42008124b68bfd7f2e2003c07bc0bdd5311f95b6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 29 四月 2020 09:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/system/user/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 87e75d1..0bfa88a 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -198,7 +198,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="600px">
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -222,7 +222,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" />
</el-form-item>
</el-col>
@@ -295,7 +295,7 @@
</el-dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
@@ -662,4 +662,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3