From 1d5aba6455f11e4dbea30e0a3c2af6152e0a52d1 Mon Sep 17 00:00:00 2001
From: yoe <yoe0405@163.com>
Date: Thu, 7 May 2020 18:52:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api_sys.js                           |  14 +++
 src/api/api_user.js                          |   4 +-
 src/views/layout/main.vue                    |   2 +-
 src/views/modules/sys/user-add-or-update.vue |  46 +++++--
 src/views/modules/sys/user.vue               | 126 ++++++-------------
 5 files changed, 91 insertions(+), 101 deletions(-)
 create mode 100644 src/api/api_sys.js

diff --git a/src/api/api_sys.js b/src/api/api_sys.js
new file mode 100644
index 0000000..ea255bc
--- /dev/null
+++ b/src/api/api_sys.js
@@ -0,0 +1,14 @@
+import http from '../utils/http'
+
+/**
+ * 管理员列表
+ */
+// 获取管理员列表
+export const apiGetSysUserList = params => {
+  return http({ url: '/renren-fast-server/sys/user/list', method: 'get', params })
+}
+
+// 获取管理员列表
+export const apiGetSysRoleSelect = params => {
+  return http({ url: '/renren-fast-server/sys/role/select', method: 'get', params })
+}
diff --git a/src/api/api_user.js b/src/api/api_user.js
index b57c2ed..6a000d8 100644
--- a/src/api/api_user.js
+++ b/src/api/api_user.js
@@ -6,6 +6,6 @@ export const apiLogin = data => {
 }
 
 // 获取用户相关
-export const apiGetUserInfo = params => {
-  return http({ url: '/renren-fast-server/sys/user/info', method: 'get', params })
+export const apiGetUserInfo = (params, id) => {
+  return http({ url: `/renren-fast-server/sys/user/info${id}`, method: 'get', params })
 }
diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue
index d096d71..2ec174d 100644
--- a/src/views/layout/main.vue
+++ b/src/views/layout/main.vue
@@ -75,7 +75,7 @@
       },
       // 获取当前登录用户的信息
       handleGetUserInfo () {
-        apiGetUserInfo({}).then(res => {
+        apiGetUserInfo({}, '').then(res => {
           if (res && res.code === 0) {
             this.loading = false
             this.userId = res.user.userId
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index e4dd4e7..313c41f 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -40,6 +40,9 @@
 
 <script>
   import { isEmail, isMobile } from '@/utils/validate'
+  import { apiGetSysRoleSelect } from '@/api/api_sys'
+  import { apiGetUserInfo } from '@/api/api_user'
+
   export default {
     data () {
       var validatePassword = (rule, value, callback) => {
@@ -87,15 +90,9 @@
           status: 1
         },
         dataRule: {
-          userName: [
-            { required: true, message: '用户名不能为空', trigger: 'blur' }
-          ],
-          password: [
-            { validator: validatePassword, trigger: 'blur' }
-          ],
-          comfirmPassword: [
-            { validator: validateComfirmPassword, trigger: 'blur' }
-          ],
+          userName: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+          password: [{ validator: validatePassword, trigger: 'blur' }],
+          comfirmPassword: [{ validator: validateComfirmPassword, trigger: 'blur' }],
           email: [
             { required: true, message: '邮箱不能为空', trigger: 'blur' },
             { validator: validateEmail, trigger: 'blur' }
@@ -108,7 +105,7 @@
       }
     },
     methods: {
-      init (id) {
+      init1 (id) {
         this.dataForm.id = id || 0
         this.$http({
           url: this.$http.adornUrl('/sys/role/select'),
@@ -140,6 +137,35 @@
           }
         })
       },
+      // 新增/修改
+      handleAdd (id) {
+        this.dataForm.id = id || 0
+        apiGetSysRoleSelect({}).then(res => {
+          this.roleList = res && res.code === 0 ? res.list : []
+          this.visible = true
+          this.$nextTick(() => {
+            this.$refs['dataForm'].resetFields()
+          })
+        }).then(() => {
+          this.handleEdit()
+        })
+      },
+      // 编辑
+      handleEdit () {
+        apiGetUserInfo({}, `/${this.dataForm.id}`).then(res => {
+          if (res && res.code === 0) {
+            this.$nextTick(() => {
+              this.dataForm.userName = res.user.username
+              this.dataForm.salt = res.user.salt
+              this.dataForm.email = res.user.email
+              this.dataForm.mobile = res.user.mobile
+              this.dataForm.roleIdList = res.user.roleIdList
+              this.dataForm.status = res.user.status
+            })
+            this.visible = true
+          }
+        })
+      },
       // 表单提交
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 0345b4e..b938013 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -1,84 +1,38 @@
 <template>
   <div class="mod-user">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="handleGetTableList()">
       <el-form-item>
         <el-input v-model="dataForm.userName" placeholder="用户名" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('sys:user:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+        <el-button @click="handleGetTableList()">查询</el-button>
+        <el-button v-if="isAuth('sys:user:save')" type="primary" @click="handleAddOrUpdate()">新增</el-button>
+        <el-button v-if="isAuth('sys:user:delete')" type="danger" @click="handleDelete()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="userId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="username"
-        header-align="center"
-        align="center"
-        label="用户名">
-      </el-table-column>
-      <el-table-column
-        prop="email"
-        header-align="center"
-        align="center"
-        label="邮箱">
-      </el-table-column>
-      <el-table-column
-        prop="mobile"
-        header-align="center"
-        align="center"
-        label="手机号">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="center"
-        label="状态">
+    <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="handleChangeSelection" style="width: 100%;">
+      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="userId" header-align="center" align="center" width="80" label="ID"></el-table-column>
+      <el-table-column prop="username" header-align="center" align="center" label="用户名"></el-table-column>
+      <el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
+      <el-table-column prop="mobile" header-align="center" align="center" label="手机号"></el-table-column>
+      <el-table-column prop="status" header-align="center" align="center" label="状态">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === 0" size="small" type="danger">禁用</el-tag>
           <el-tag v-else size="small">正常</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        width="180"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
+      <el-table-column prop="createTime" header-align="center" align="center" width="180" label="创建时间"></el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
         <template slot-scope="scope">
-          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</el-button>
-          <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</el-button>
+          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="handleAddOrUpdate(scope.row.userId)">修改</el-button>
+          <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="handleDelete(scope.row.userId)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
+      @size-change="handleChangeSize"
+      @current-change="handleChangeCurrent"
       :current-page="pageIndex"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="pageSize"
@@ -86,12 +40,13 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="handleGetTableList"></add-or-update>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './user-add-or-update'
+  import { apiGetSysUserList } from '../../../api/api_sys'
   export default {
     data () {
       return {
@@ -111,24 +66,19 @@
       AddOrUpdate
     },
     activated () {
-      this.getDataList()
+      this.handleGetTableList()
     },
     methods: {
       // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/sys/user/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'username': this.dataForm.userName
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+      handleGetTableList () {
+        apiGetSysUserList({
+          'page': this.pageIndex,
+          'limit': this.pageSize,
+          'username': this.dataForm.userName
+        }).then(res => {
+          if (res && res.code === 0) {
+            this.dataList = res.page.list
+            this.totalPage = res.page.totalCount
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -137,29 +87,29 @@
         })
       },
       // 每页数
-      sizeChangeHandle (val) {
+      handleChangeSize (val) {
         this.pageSize = val
         this.pageIndex = 1
-        this.getDataList()
+        this.handleGetTableList()
       },
       // 当前页
-      currentChangeHandle (val) {
+      handleChangeCurrent (val) {
         this.pageIndex = val
-        this.getDataList()
+        this.handleGetTableList()
       },
       // 多选
-      selectionChangeHandle (val) {
+      handleChangeSelection (val) {
         this.dataListSelections = val
       },
       // 新增 / 修改
-      addOrUpdateHandle (id) {
+      handleAddOrUpdate (id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.handleAdd(id)
         })
       },
       // 删除
-      deleteHandle (id) {
+      handleDelete (id) {
         var userIds = id ? [id] : this.dataListSelections.map(item => {
           return item.userId
         })
@@ -179,7 +129,7 @@
                 type: 'success',
                 duration: 1500,
                 onClose: () => {
-                  this.getDataList()
+                  this.handleGetTableList()
                 }
               })
             } else {