From d99fb71fe0f03090cbe852895b2488dab76fde72 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 22 Nov 2019 17:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2logo=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                     | Bin 67646 -> 67646 bytes
 src/api/job.js                         |  17 +-
 src/api/user.js                        |  12 +-
 src/assets/images/logo.png             | Bin 13437 -> 8852 bytes
 src/assets/styles/variables.scss       |   2 +-
 src/layout/components/Sidebar/Logo.vue |   7 +-
 src/mixins/crud.js                     |   2 +-
 src/utils/validate.js                  |   5 +
 src/views/system/user/center.vue       |   2 +
 src/views/system/user/form.vue         | 218 -----------------
 src/views/system/user/index.vue        | 311 +++++++++++++++----------
 11 files changed, 205 insertions(+), 371 deletions(-)
 delete mode 100644 src/views/system/user/form.vue

diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac63a87ee3ea8e7a0f3f5b5406c437e2112..fcb69992e5f0777989b89db9a6318b3621eff240 100644
GIT binary patch
literal 67646
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
U$^5!t50tOVCyZ47oXe;G53^4nod5s;

literal 67646
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
X;@D+E7Ad=S_FbjlW&KY_+xPzm3MBT?

diff --git a/src/api/job.js b/src/api/job.js
index 4eb1187c8..1ede2e54a 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -36,19 +36,4 @@ export function edit(data) {
   })
 }
 
-export function downloadJob(params) {
-  return request({
-    url: 'api/job/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
-export default {
-  add,
-  edit,
-  del,
-  getAllJob,
-  downloadJob
-}
+export default { add, edit, del }
diff --git a/src/api/user.js b/src/api/user.js
index 334635fb5..c6f831df3 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -8,15 +8,6 @@ export function add(data) {
   })
 }
 
-export function downloadUser(params) {
-  return request({
-    url: 'api/users/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
 export function del(id) {
   return request({
     url: 'api/users/' + id,
@@ -51,3 +42,6 @@ export function updateEmail(code, data) {
     data
   })
 }
+
+export default { add, edit, del }
+
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 1670e67aae33d7d85aeffe5cb00c1f9a8e874f10..f7577109651b89def3d9359ab324b445c714fe77 100644
GIT binary patch
literal 8852
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
ZLF@BRes2KN|GQZNP*u`YtbtmE{|_Y7!}b6G

literal 13437
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

diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 5688f25b5..41de79cab 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -19,7 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 200px;
+$sideBarWidth: 205px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index e96f5b830..495b667aa 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import Logo from '@/assets/images/logo.png'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -24,8 +25,8 @@ export default {
   },
   data() {
     return {
-      title: 'EL-ADMIN 后台管理',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+      title: 'ELADMIN-后台管理',
+      logo: Logo
     }
   }
 }
@@ -57,7 +58,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 6px;
     }
 
     & .sidebar-title {
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index dacd6fb3b..7b67301ce 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -8,7 +8,7 @@ export default {
       // 表格数据
       data: [],
       // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
-      sort: ['id,desc', 'createTime,asc'],
+      sort: ['id,desc'],
       // 页码
       page: 0,
       // 每页数据条数
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 6b3ac4180..08b361b4c 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -64,6 +64,11 @@ export function validEmail(email) {
   return reg.test(email)
 }
 
+export function isvalidPhone(phone) {
+  const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+  return reg.test(phone)
+}
+
 /**
  * @param {string} str
  * @returns {Boolean}
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index d93f2eb61..f8d9fd082 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -36,6 +36,7 @@
           </div>
         </el-card>
       </el-col>
+      <!-- 用户日志 -->
       <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="19">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -143,6 +144,7 @@ export default {
         duration: 2500
       })
     },
+    // 刷新日志
     refresh() {
       this.ico = 'el-icon-loading'
       this.init()
diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue
deleted file mode 100644
index 8b6e69254..000000000
--- a/src/views/system/user/form.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增用户' : '编辑用户'" append-to-body width="570px">
-    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
-      <el-form-item label="用户名" prop="username">
-        <el-input v-model="form.username" />
-      </el-form-item>
-      <el-form-item label="状态" prop="enabled">
-        <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-      </el-form-item>
-      <el-form-item label="电话" prop="phone">
-        <el-input v-model.number="form.phone" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="form.email" />
-      </el-form-item>
-      <el-form-item label="部门">
-        <treeselect v-model="deptId" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
-      </el-form-item>
-      <el-form-item label="岗位">
-        <el-select v-model="jobId" style="width: 178px" placeholder="请先选择部门">
-          <el-option
-            v-for="(item, index) in jobs"
-            :key="item.name + index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item style="margin-bottom: 0px;" label="角色">
-        <el-select v-model="roleIds" style="width: 450px;" multiple placeholder="请选择">
-          <el-option
-            v-for="(item, index) in roles"
-            :key="item.name + index"
-            :disabled="level !== 1 && item.level <= level"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-import { add, edit } from '@/api/user'
-import { getDepts } from '@/api/dept'
-import { getAll, getLevel } from '@/api/role'
-import { getAllJob } from '@/api/job'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    const validPhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入电话号码'))
-      } else if (!this.isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      dialog: false, loading: false, form: { username: '', email: '', enabled: 'false', roles: [], job: { id: '' }, dept: { id: '' }, phone: null },
-      roleIds: [], roles: [], depts: [], deptId: null, jobId: null, jobs: [], level: 3,
-      rules: {
-        username: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-        ],
-        email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
-        ],
-        enabled: [
-          { required: true, message: '状态不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.form.dept.id = this.deptId
-      this.form.job.id = this.jobId
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.deptId === null || this.deptId === undefined) {
-            this.$message({
-              message: '部门不能为空',
-              type: 'warning'
-            })
-          } else if (this.jobId === null) {
-            this.$message({
-              message: '岗位不能为空',
-              type: 'warning'
-            })
-          } else if (this.roleIds.length === 0) {
-            this.$message({
-              message: '角色不能为空',
-              type: 'warning'
-            })
-          } else {
-            this.loading = true
-            this.form.roles = []
-            const _this = this
-            this.roleIds.forEach(function(data, index) {
-              const role = { id: data }
-              _this.form.roles.push(role)
-            })
-            if (this.isAdd) {
-              this.doAdd()
-            } else this.doEdit()
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          message: '默认密码：123456',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.deptId = null
-      this.jobId = null
-      this.roleIds = []
-      this.form = { username: '', email: '', enabled: 'false', roles: [], job: { id: '' }, dept: { id: '' }, phone: null }
-    },
-    getRoles() {
-      getAll().then(res => {
-        this.roles = res
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    getJobs(id) {
-      getAllJob(id).then(res => {
-        this.jobs = res.content
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
-    },
-    isvalidPhone(str) {
-      const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
-      return reg.test(str)
-    },
-    selectFun(node, instanceId) {
-      this.getJobs(node.id)
-    },
-    getRoleLevel() {
-      getLevel().then(res => {
-        this.level = res.level
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index eb7483ed3..056e95c69 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,14 +1,12 @@
 <template>
   <div class="app-container">
-    <!--form 组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.user_status" />
     <el-row :gutter="20">
-      <!--部门数据-->
+      <!--侧边部门数据-->
       <el-col :xs="9" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
           <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
         </div>
-        <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
+        <el-tree :data="deptDatas" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
       </el-col>
       <!--用户数据-->
       <el-col :xs="15" :sm="18" :md="20" :lg="20" :xl="20">
@@ -17,7 +15,7 @@
           <!-- 搜索 -->
           <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
           <el-date-picker
-            v-model="query.date"
+            v-model="query.createTime"
             :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
@@ -32,27 +30,68 @@
           </el-select>
           <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
           <!-- 新增 -->
-          <div v-permission="['admin','user:add']" style="display: inline-block;margin: 0px 2px;">
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              @click="add"
-            >新增</el-button>
-          </div>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="showAddFormDialog"
+          >新增</el-button>
           <!-- 导出 -->
-          <div style="display: inline-block;">
-            <el-button
-              :loading="downloadLoading"
-              size="mini"
-              class="filter-item"
-              type="warning"
-              icon="el-icon-download"
-              @click="download"
-            >导出</el-button>
-          </div>
+          <el-button
+            :loading="downloadLoading"
+            size="mini"
+            class="filter-item"
+            type="warning"
+            icon="el-icon-download"
+            @click="downloadMethod"
+          >导出</el-button>
         </div>
+        <!--表单渲染-->
+        <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="hideFormDialog" :title="getFormTitle()" append-to-body width="570px">
+          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
+            <el-form-item label="用户名" prop="username">
+              <el-input v-model="form.username" />
+            </el-form-item>
+            <el-form-item label="状态" prop="enabled">
+              <el-radio v-for="item in dict.user_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
+            </el-form-item>
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model.number="form.phone" />
+            </el-form-item>
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" />
+            </el-form-item>
+            <el-form-item label="部门" prop="dept.id">
+              <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
+            </el-form-item>
+            <el-form-item label="岗位" prop="job.id">
+              <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
+                <el-option
+                  v-for="(item, index) in jobs"
+                  :key="item.name + index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item style="margin-bottom: 0px;" label="角色" prop="roles">
+              <el-select v-model="form.roles" style="width: 450px;" multiple placeholder="请选择">
+                <el-option
+                  v-for="item in roles"
+                  :key="item.name"
+                  :disabled="level !== 1 && item.level <= level"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="text" @click="hideFormDialog">取消</el-button>
+            <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+          </div>
+        </el-dialog>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
           <el-table-column prop="username" label="用户名" />
@@ -80,7 +119,7 @@
           </el-table-column>
           <el-table-column v-if="checkPermission(['admin','user:edit','user:del'])" label="操作" width="125" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
               <el-popover
                 :ref="scope.row.id"
                 v-permission="['admin','user:del']"
@@ -90,7 +129,7 @@
                 <p>确定删除本条数据吗？</p>
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                  <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                  <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
                 </div>
                 <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
               </el-popover>
@@ -112,35 +151,65 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, downloadUser, edit } from '@/api/user'
+import crud from '@/mixins/crud'
+import crudUser from '@/api/user'
+import { isvalidPhone } from '@/utils/validate'
 import { getDepts } from '@/api/dept'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import { getAll, getLevel } from '@/api/role'
+import { getAllJob } from '@/api/job'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'User',
-  components: { eForm },
-  mixins: [initData],
-  // 设置数据字典
+  components: { Treeselect },
+  mixins: [crud],
+  // 数据字典
   dicts: ['user_status'],
   data() {
+    // 自定义验证
+    const validPhone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入电话号码'))
+      } else if (!isvalidPhone(value)) {
+        callback(new Error('请输入正确的11位手机号码'))
+      } else {
+        callback()
+      }
+    }
     return {
-      height: document.documentElement.clientHeight - 180 + 'px;', isAdd: false,
-      delLoading: false, deptName: '', depts: [], deptId: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
+      crudMethod: {
+        ...crudUser
       },
+      title: '用户',
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
+      defaultProps: { children: 'children', label: 'name' },
       enabledTypeOptions: [
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
-      ]
+      ],
+      form: { username: null, email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null },
+      rules: {
+        username: [
+          { required: true, message: '请输入用户名', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        email: [
+          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, trigger: 'blur', validator: validPhone }
+        ],
+        enabled: [
+          { required: true, message: '状态不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
-    this.getDeptDatas()
     this.$nextTick(() => {
+      this.getDeptDatas()
       this.init()
     })
   },
@@ -151,103 +220,82 @@ export default {
     }
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/users'
-      const sort = 'id,desc'
-      const query = this.query
-      const blurry = query.blurry
-      const enabled = query.enabled
-      this.params = { page: this.page, size: this.size, sort: sort, deptId: this.deptId }
-      if (blurry) { this.params['blurry'] = blurry }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
-      if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
-    // 导出
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadUser(this.params).then(result => {
-        downloadFile(result, '用户列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.getDepts()
+      this.getRoles()
+      this.getRoleLevel()
+    },
+    // 打开编辑弹窗前做的操作
+    beforeShowEditForm(data) {
+      this.getDepts()
+      this.getRoles()
+      this.getRoleLevel()
+      this.getJobs(this.form.dept.id)
+      this.form.enabled = data.enabled.toString()
+      const roles = []
+      data.roles.forEach(function(role, index) {
+        roles.push(role.id)
       })
+      this.form.roles = roles
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
+    // 提交前做的操作
+    beforeSubmitMethod() {
+      if (!this.form.dept.id) {
+        this.$message({
+          message: '部门不能为空',
+          type: 'warning'
+        })
+        return false
+      } else if (!this.form.job.id) {
+        this.$message({
+          message: '岗位不能为空',
+          type: 'warning'
+        })
+        return false
+      } else if (this.form.roles.length === 0) {
+        this.$message({
+          message: '角色不能为空',
+          type: 'warning'
         })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
+        return false
+      }
+      const roles = []
+      this.form.roles.forEach(function(data, index) {
+        const role = { id: data }
+        roles.push(role)
       })
+      this.form.roles = roles
+      return true
     },
+    // 获取左侧部门数据
     getDeptDatas() {
       const sort = 'id,desc'
       const params = { sort: sort }
       if (this.deptName) { params['name'] = this.deptName }
       getDepts(params).then(res => {
+        this.deptDatas = res.content
+      })
+    },
+    // 获取弹窗内部门数据
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
         this.depts = res.content
       })
     },
+    // 切换部门
     handleNodeClick(data) {
       if (data.pid === 0) {
-        this.deptId = null
+        this.query.deptId = null
       } else {
-        this.deptId = data.id
+        this.query.deptId = data.id
       }
       this.init()
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.getDepts()
-      this.$refs.form.getRoles()
-      this.$refs.form.getRoleLevel()
-      this.$refs.form.dialog = true
-    },
-    // 数据转换
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'createTime' || j === 'lastPasswordResetTime') {
-          return parseTime(v[j])
-        } else if (j === 'enabled') {
-          return parseTime(v[j]) ? '启用' : '禁用'
-        } else {
-          return v[j]
-        }
-      }))
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.getRoles()
-      _this.getDepts()
-      _this.getRoleLevel()
-      _this.roleIds = []
-      _this.form = { id: data.id, username: data.username, phone: data.phone, email: data.email, enabled: data.enabled.toString(), roles: [], dept: { id: data.dept.id }, job: { id: data.job.id }}
-      data.roles.forEach(function(data, index) {
-        _this.roleIds.push(data.id)
-      })
-      _this.deptId = data.dept.id
-      _this.jobId = data.job.id
-      _this.getJobs(_this.deptId)
-      _this.dialog = true
-    },
     // 改变状态
     changeEnabled(data, val) {
       this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
@@ -255,19 +303,36 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        edit(data).then(res => {
-          this.$notify({
-            title: this.dict.label.user_status[val] + '成功',
-            type: 'success',
-            duration: 2500
-          })
-        }).catch(err => {
+        this.crudMethod.edit(data).then(res => {
+          this.notify(this.dict.label.user_status[val] + '成功', 'success')
+        }).catch(() => {
           data.enabled = !data.enabled
-          console.log(err.response.data.message)
         })
       }).catch(() => {
         data.enabled = !data.enabled
       })
+    },
+    // 获取弹窗内角色数据
+    getRoles() {
+      getAll().then(res => {
+        this.roles = res
+      }).catch(() => {})
+    },
+    // 获取弹窗内岗位数据
+    getJobs(id) {
+      getAllJob(id).then(res => {
+        this.jobs = res.content
+      }).catch(() => {})
+    },
+    // 点击部门搜索对应的岗位
+    selectFun(node, instanceId) {
+      this.getJobs(node.id)
+    },
+    // 获取权限级别
+    getRoleLevel() {
+      getLevel().then(res => {
+        this.level = res.level
+      }).catch(() => {})
     }
   }
 }