diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2714584..123387e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,175 +1,355 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
       <!--用户数据-->
-      <el-col :span="24" :xs="24">
+      <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-          label-width="68px">
-          <el-form-item label="用户昵称" prop="nickName">
-            <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable style="width: 240px"
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="ID" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable style="width: 240px"
-              @keyup.enter.native="handleQuery" />
+                 label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
-              @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
-          <el-form-item label="性别" prop="sex">
-            <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable>
-              <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                :value="dict.value"></el-option>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item label="注册时间">
-            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增用户</el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+            >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button size="mini" v-hasPermi="['system:user:edit']" @click="updateStatusByUserId('0')">批量开启</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+            >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button size="mini" v-hasPermi="['system:user:edit']" @click="updateStatusByUserId('1')">批量禁用</el-button>
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+            >导入
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+            >导出
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="手机号" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
-            width="120" />
-          <el-table-column label="微信昵称" align="center" key="wechatNickName" prop="wechatNickName"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="账号余额" align="center" key="balance" prop="balance" />
-          <el-table-column label="头像" align="center">
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                           v-if="columns[4].visible" width="120"/>
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-avatar :size="50" :src="getAvatar(scope.row)" />
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="性别" align="center">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
-            </template>
-          </el-table-column>
-          <el-table-column label="推荐人" align="center">
-            <template slot-scope="scope" v-if="scope.row.referrerSysUser">
-              <span>{{ scope.row.referrerSysUser.nickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="登陆时间" align="center">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.loginDate) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="注册时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
-            </template>
-          </el-table-column>
-
-          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button size="mini" type="text" @click="showDetail(scope.row.userId)"
-                v-hasPermi="['system:user:edit']">详情</el-button>
-              <el-button size="mini" type="text"
-                @click="updateStatusByUserId(scope.row.status === '0' ? '1' : '0', scope.row.userId)"
-                v-hasPermi="['system:user:edit']">{{ scope.row.status === '0' ? '禁用' : '开启' }}</el-button>
-              <el-button size="mini" type="text" @click="showBuyDetail(scope.row.userId)"
-                v-hasPermi="['system:user:edit']">购买明细</el-button>
-
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+              >删除
+              </el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                           v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                                    v-hasPermi="['system:user:resetPwd']">重置密码
+                  </el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                                    v-hasPermi="['system:user:edit']">分配角色
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <!-- 添加对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-divider class="custom-divider" />
-      <base-form :reset="reset" :form="form" :onSuccess="() => { this.open = false; this.getList() }" />
-    </el-dialog>
-
-    <!-- 用户详情对话框 -->
-    <el-dialog :title="title" :visible.sync="detail.open" width="1200px" append-to-body
-      @close="getList(); detail.activeName = null">
-      <el-tabs v-model="detail.activeName" type="card">
-        <el-tab-pane label="基本信息" name="base">
-          <base-form :reset="reset" :form="form" show-detail />
-        </el-tab-pane>
-        <el-tab-pane label="钱包明细" name="balance">
-          <platform-wallet-detail :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="购买明细" name="buy_detail">
-          <platform-buy-detail :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane v-hasPermi="['platform:address:list']" label="收货地址" name="address">
-          <platform-address :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="浏览记录" name="browser_history">
-          <platform-history :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="收藏记录" name="star_history">
-          <platform-collect :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="购物车" name="cart">
-          <platform-cart :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="粉丝" name="fans">
-          <platform-follower :user-id="form.userId" />
-        </el-tab-pane>
-        <el-tab-pane label="优惠券" name="discount_coupon">
-          <platform-discount :user-id="form.userId" />
-        </el-tab-pane>
-      </el-tabs>
+    <!-- 添加或修改用户配置对话框 -->
+    <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">
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择性别">
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
     </el-dialog>
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-            @click="importTemplate">下载模板</el-link>
+                   @click="importTemplate">下载模板
+          </el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -181,22 +361,24 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, resetUserPwd, changeUserStatus, updateStatus } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import { getAvatar } from "@/utils";
-import baseForm from "./profile/baseForm"
-import platformAddress from "@/views/platform/user/address"
-import platformFollower from "@/views/platform/user/follower"
-import platformCart from "@/views/platform/user/cart"
-import platformCollect from "@/views/platform/user/result/collect"
-import platformHistory from "@/views/platform/user/result/history"
-import platformDiscount from "@/views/platform/user/discount"
-import platformBuyDetail from "@/views/platform/user/buyDetail"
-import platformWalletDetail from "@/views/platform/user/walletDetail"
+import {
+  addUser,
+  changeUserStatus,
+  delUser,
+  deptTreeSelect,
+  getUser,
+  listUser,
+  resetUserPwd,
+  updateUser
+} from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
 export default {
-  name: "User",
+  name: 'User',
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { baseForm, platformAddress, platformFollower, platformCart, platformCollect, platformDiscount, platformHistory, platformBuyDetail, platformWalletDetail },
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -214,9 +396,13 @@ export default {
       // 用户表格数据
       userList: null,
       // 弹出层标题
-      title: "",
+      title: '',
+      // 部门树选项
+      deptOptions: undefined,
       // 是否显示弹出层
       open: false,
+      // 部门名称
+      deptName: undefined,
       // 默认密码
       initPassword: undefined,
       // 日期范围
@@ -231,13 +417,6 @@ export default {
         children: "children",
         label: "label"
       },
-      //用户详情
-      detail: {
-        // 是否显示弹出层
-        open: false,
-        //激活标签页
-        activeName: null
-      },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -257,11 +436,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
-        nickName: undefined,
+        userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        sex: undefined
+        deptId: undefined
       },
       // 列信息
       columns: [
@@ -273,66 +451,86 @@ export default {
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
-
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: '用户名称不能为空', trigger: 'blur' },
+          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: '用户昵称不能为空', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '用户密码不能为空', trigger: 'blur' },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        email: [
+          {
+            type: 'email',
+            message: '请输入正确的邮箱地址',
+            trigger: ['blur', 'change']
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ]
+      }
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   created() {
-    this.getList();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
+    this.getList()
+    this.getDeptTree()
+    this.getConfigKey('sys.user.initPassword').then(response => {
+      this.initPassword = response.msg
+    })
   },
   methods: {
-    showBuyDetail(userId) {
-      this.detail.activeName = 'buy_detail'
-      this.clickUserId = userId
-      this.detail.open = true
-    },
-    showDetail(userId) {
-      this.detail.activeName = 'base'
-      this.clickUserId = userId
-    },
-    //批量更新用户状态
-    updateStatusByUserId(status, userId) {
-      updateStatus({
-        userIds: userId === undefined ? this.ids.join(",") : userId,
-        status
-      }).then(response => {
-        this.$modal.msgSuccess(`批量${status === "0" ? "开启" : "禁用"}成功`);
-        this.getList()
-      })
-    },
-
-    getAvatar,
     /** 查询用户列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.userList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      }
-      );
+          this.userList = response.rows
+          this.total = response.total
+          this.loading = false
+        }
+      )
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data
+      })
     },
     // 筛选节点
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.handleQuery();
+      this.queryParams.deptId = data.id
+      this.handleQuery()
     },
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
-        return changeUserStatus(row.userId, row.status);
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status)
       }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function () {
-        row.status = row.status === "0" ? "1" : "0";
-      });
+        this.$modal.msgSuccess(text + '成功')
+      }).catch(function() {
+        row.status = row.status === '0' ? '1' : '0'
+      })
     },
     // 取消按钮
     cancel() {
@@ -343,19 +541,17 @@ export default {
     reset() {
       this.form = {
         userId: undefined,
+        deptId: undefined,
         userName: undefined,
         nickName: undefined,
         password: undefined,
         phonenumber: undefined,
         email: undefined,
         sex: undefined,
-        status: "0",
+        status: '0',
         remark: undefined,
         postIds: [],
-        roleIds: [],
-        balance: "0.00",
-        wechatNickName: undefined,
-        referrerId: undefined
+        roleIds: []
       };
       this.resetForm("form");
     },
@@ -366,9 +562,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.deptId = undefined
+      this.$refs.tree.setCurrentKey(null)
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -395,55 +593,76 @@ export default {
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "新增用户";
-        this.form.password = this.initPassword;
+        this.open = true
+        this.title = '添加用户'
+        this.form.password = this.initPassword
       });
     },
     /** 修改按钮操作 */
-    handleUpdate() {
-      this.reset();
-      const userId = this.clickUserId
+    handleUpdate(row) {
+      this.reset()
+      const userId = row.userId || this.ids
       getUser(userId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.title = "用户详情";
-        this.form.password = "";
-        this.detail.open = true
-        this.form.referrerPhone = this.form.referrerSysUser.phonenumber
+        this.form = response.data
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.$set(this.form, 'postIds', response.postIds)
+        this.$set(this.form, 'roleIds', response.roleIds)
+        this.open = true
+        this.title = '修改用户'
+        this.form.password = ''
       });
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+        inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
       }).then(({ value }) => {
         resetUserPwd(row.userId, value).then(response => {
-          this.$modal.msgSuccess("修改成功，新密码是：" + value);
-        });
-      }).catch(() => { });
+          this.$modal.msgSuccess('修改成功，新密码是：' + value)
+        })
+      }).catch(() => {
+      })
     },
     /** 分配角色操作 */
-    handleAuthRole: function (row) {
-      const userId = row.userId;
-      this.$router.push("/system/user-auth/role/" + userId);
+    handleAuthRole: function(row) {
+      const userId = row.userId
+      this.$router.push('/system/user-auth/role/' + userId)
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
-        return delUser(userIds);
+      const userIds = row.userId || this.ids
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delUser(userIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -477,19 +696,6 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     }
-  },
-  watch: {
-    'detail.activeName': function (value) {
-      if (value === 'base' && !this.detail.open) {
-        this.handleUpdate()
-      }
-    }
   }
 };
 </script>
-<style scoped lang="scss">
-.custom-divider.el-divider {
-  margin-top: 0 !important;
-  margin-bottom: 20px !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 81283ca..d4d0f08 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,21 +1,27 @@
 <template>
   <div>
-    <div class="user-info-head" :class="{ 'img-circle': circle }" @click="editCropper()"><img v-bind:src="options.img"
-        :title="'点击上传' + title" class="img-lg" :class="{ 'img-circle': circle }" />
-
-    </div>
-    <div v-if="showBottomLabel" style="width: 120px;text-align: center;margin-top: 10px;">{{ title }}</div>
-    <el-dialog :title="'修改' + title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"
-      @close="closeDialog">
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像"
+                                                            class="img-circle img-lg"/></div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"
+               @close="closeDialog">
       <el-row>
-        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-          <vue-cropper ref="cropper" :img="options.img" :info="true" :autoCrop="options.autoCrop"
-            :autoCropWidth="options.autoCropWidth" :autoCropHeight="options.autoCropHeight" :fixedBox="options.fixedBox"
-            :outputType="options.outputType" @realTime="realTime" v-if="visible" />
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            :outputType="options.outputType"
+            @realTime="realTime"
+            v-if="visible"
+          />
         </el-col>
-        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-          <div class="avatar-upload-preview" :class="{ 'img-circle': circle }">
-            <img :src="previews.url" :style="previews.img" />
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div class="avatar-upload-preview">
+            <img :src="previews.url" :style="previews.img"/>
           </div>
         </el-col>
       </el-row>
@@ -29,19 +35,19 @@
             </el-button>
           </el-upload>
         </el-col>
-        <el-col :lg="{ span: 1, offset: 2 }" :sm="2" :xs="2">
+        <el-col :lg="{span: 1, offset: 2}" :sm="2" :xs="2">
           <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
         </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :sm="2" :xs="2">
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
           <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
         </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :sm="2" :xs="2">
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
           <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
         </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :sm="2" :xs="2">
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
           <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
         </el-col>
-        <el-col :lg="{ span: 2, offset: 6 }" :sm="2" :xs="2">
+        <el-col :lg="{span: 2, offset: 6}" :sm="2" :xs="2">
           <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
         </el-col>
       </el-row>
@@ -50,9 +56,9 @@
 </template>
 
 <script>
-import store from "@/store";
-import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/user";
+import store from '@/store'
+import { VueCropper } from 'vue-cropper'
+import { uploadAvatar } from '@/api/system/user'
 import { debounce } from '@/utils'
 
 export default {
@@ -60,17 +66,6 @@ export default {
   props: {
     user: {
       type: Object
-    },
-    circle: {
-      type: Boolean,
-      default: true
-    },
-    showBottomLabel: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String
     }
   },
   data() {
@@ -79,21 +74,22 @@ export default {
       open: false,
       // 是否显示cropper
       visible: false,
-
+      // 弹出层标题
+      title: '修改头像',
       options: {
         img: store.getters.avatar, //裁剪图片的地址
         autoCrop: true, // 是否默认生成截图框
         autoCropWidth: 200, // 默认生成截图框宽度
         autoCropHeight: 200, // 默认生成截图框高度
         fixedBox: true, // 固定截图框大小 不允许改变
-        outputType: "png" // 默认生成截图为PNG格式
+        outputType: 'png' // 默认生成截图为PNG格式
       },
       previews: {},
       resizeHandler: null
     };
   },
   methods: {
-    // 编辑
+    // 编辑头像
     editCropper() {
       this.open = true;
     },
@@ -144,8 +140,6 @@ export default {
       this.$refs.cropper.getCropBlob(data => {
         let formData = new FormData();
         formData.append("avatarfile", data);
-
-        // TODO:厂商修改LOGO需要更换接口，目前未实现
         uploadAvatar(formData).then(response => {
           this.open = false;
           this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
@@ -172,7 +166,7 @@ export default {
 .user-info-head {
   position: relative;
   display: inline-block;
-  background: rgba(0, 0, 0, 0.5);
+  height: 120px;
 }
 
 .user-info-head:hover:after {
@@ -183,11 +177,13 @@ export default {
   top: 0;
   bottom: 0;
   color: #eee;
+  background: rgba(0, 0, 0, 0.5);
   font-size: 24px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   cursor: pointer;
   line-height: 110px;
+  border-radius: 50%;
 }
 </style>