From 0be314cdbf33d8dba06ac20896edc965944ca6c7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 27 Sep 2020 15:20:09 +0800
Subject: [PATCH] sompe update

---
 client/src/views/login/index.vue  | 14 +++++++-------
 client/src/views/system/user.vue  | 27 ++++++++++++++++++++++-----
 server/apps/system/serializers.py | 11 +++++++++--
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue
index bb4d84a..a6132da 100644
--- a/client/src/views/login/index.vue
+++ b/client/src/views/login/index.vue
@@ -42,10 +42,10 @@
                 auto-complete="on"
                 @keyup.enter.native="handleLogin"
               />
-              <span class="show-pwd" @click="sendMsg">
-                <el-button :disabled="disabled" plain type="primary">
+              <span class="show-pwd" @click="sendMsg" style="color:white">
+                
                   <template>{{buttonmsg}}</template>
-                </el-button>
+                
                 <!-- <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" /> -->
               </span>
             </el-form-item>
@@ -139,7 +139,7 @@ export default {
       timer:null,
       disabled:false,
       buttonmsg:'发送验证码',
-      count:20,
+      count:60,
       activeName: "msg",
       loginForm: {
         username: "",
@@ -196,7 +196,7 @@ export default {
       });
     },
     sendMsg(){
-      if(this.loginForm2.mail.length){
+      if(this.loginForm2.mail.length&&this.buttonmsg=='发送验证码'){
         this.getTimer()
         sendMsg({'mail':this.loginForm2.mail}).then(res=>{
           this.$message.success('验证码已发送至该邮箱,请注意查收')
@@ -206,14 +206,14 @@ export default {
       }
     },
     getTimer(){
-     const TIME_COUNT = 20;
+     const TIME_COUNT = 60;
      if (!this.timer) {
        this.count = TIME_COUNT;
        this.disabled = true;
        this.timer = setInterval(() => {
        if (this.count > 0 && this.count <= TIME_COUNT) {
          this.count--;
-         this.buttonmsg = this.count
+         this.buttonmsg = this.count + '秒'
         } else {
          this.disabled = false;
          clearInterval(this.timer);
diff --git a/client/src/views/system/user.vue b/client/src/views/system/user.vue
index dbbdc44..4d32479 100644
--- a/client/src/views/system/user.vue
+++ b/client/src/views/system/user.vue
@@ -1,10 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
+    <el-row :gutter="6">
 
-      <el-col :md="6">
+      <el-col :xs="24" :md="6">
+        <el-card>
+          <div slot="header" class="clearfix">
+    <span>部门</span>
+  </div>
         <el-input v-model="filterOrgText" placeholder="输入部门名进行过滤" />
-
         <el-tree
           ref="tree"
           v-loading="treeLoding"
@@ -17,8 +20,13 @@
           style="margin-top:10px;"
           @node-click="handleOrgClick"
         />
+        </el-card>
       </el-col>
-      <el-col :md="18">
+      <el-col :xs="24" :md="18">
+        <el-card>
+          <div slot="header" class="clearfix">
+    <span>用户</span>
+  </div>
         <div>
           <el-select
             v-model="listQuery.is_active"
@@ -82,6 +90,13 @@
               slot-scope="scope"
             >{{ scope.row.dept_name }}</template>
           </el-table-column>
+          <el-table-column align="header-center" label="角色" >
+            <template slot-scope="scope">
+            <el-tag  style="margin:2px" effect="plain" v-for="(item, index) in scope.row.roles_" :key="index">
+              {{item.name}}
+            </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="创建日期">
             <template slot-scope="scope">
               <span>{{ scope.row.date_joined }}</span>
@@ -116,6 +131,7 @@
           :limit.sync="listQuery.page_size"
           @pagination="getList"
         />
+        </el-card>
       </el-col>
     </el-row>
 
@@ -226,7 +242,8 @@ export default {
       dialogType: "new",
       rule1: {
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-        username: [{ required: true, message: "请输入账号", trigger: "change" }]
+        username: [{ required: true, message: "请输入账号", trigger: "change" }],
+        roles: [{ required: true, message: "请选择角色", trigger: "change" }]
         // password: [
         //   { required: true, message: '请输入密码', trigger: 'change' }
         // ],
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index 89867a7..4feb35a 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -45,6 +45,13 @@ class RoleSerializer(serializers.ModelSerializer):
         model = Role
         fields = '__all__'
 
+class RoleListSerializer(serializers.ModelSerializer):
+    """
+    角色序列化
+    """
+    class Meta:
+        model = Role
+        fields = ['id','name']
 
 class PermissionSerializer(serializers.ModelSerializer):
     """
@@ -72,11 +79,11 @@ class UserListSerializer(serializers.ModelSerializer):
     用户列表序列化
     """
     dept_name = serializers.StringRelatedField(source='dept')
-
+    roles_ = RoleListSerializer(source='roles', many=True, read_only=True)
     class Meta:
         model = User
         fields = ('id', 'name', 'phone', 'email', 'position',
-                  'username', 'is_active', 'date_joined', 'dept_name', 'dept', 'roles', 'avatar')
+                  'username', 'is_active', 'date_joined', 'dept_name', 'dept', 'roles', 'avatar','roles_')
 
     @staticmethod
     def setup_eager_loading(queryset):