Merge branch 'master' of http://182.92.174.150:3000/tiegu/czo

src/views/system/employeenInfo/authRole.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="app-container">
+    <h4 class="form-header h4">基本信息</h4>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input v-model="form.nickName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="登录账号" prop="userName">
+            <el-input  v-model="form.userName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h4 class="form-header h4">角色信息</h4>
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色名称" align="center" prop="roleName" />
+      <el-table-column label="权限字符" align="center" prop="roleKey" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAuthRole, updateAuthRole } from "@/api/system/user";
+
+export default {
+  name: "AuthRole",
+  data() {
+    return {
+       // 遮罩层
+      loading: true,
+      // 分页信息
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      // 选中角色编号
+      roleIds:[],
+      // 角色信息
+      roles: [],
+      // 用户信息
+      form: {}
+    };
+  },
+  created() {
+    const userId = this.$route.params && this.$route.params.userId;
+    if (userId) {
+      this.loading = true;
+      getAuthRole(userId).then((response) => {
+        this.form = response.user;
+        this.roles = response.roles;
+        this.total = this.roles.length;
+        this.$nextTick(() => {
+          this.roles.forEach((row) => {
+            if (row.flag) {
+              this.$refs.table.toggleRowSelection(row);
+            }
+          });
+        });
+        this.loading = false;
+      });
+    }
+  },
+  methods: {
+    /** 单击选中行数据 */
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.roleIds = selection.map((item) => item.roleId);
+    },
+    // 保存选中的数据编号
+    getRowKey(row) {
+      return row.roleId;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const userId = this.form.userId;
+      const roleIds = this.roleIds.join(",");
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+        this.$modal.msgSuccess("授权成功");
+        this.close();
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      const obj = { path: "/system/user" };
+      this.$tab.closeOpenPage(obj);
+    },
+  },
+};
+</script>

src/views/system/employeenInfo/index.vue

@@ -0,0 +1,465 @@
+<template>
+	<div class="page-container">
+		<div class="search-container" v-show="showSearch">
+			<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+				<el-form-item label="姓名" prop="userName">
+					<el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="电话号码" prop="phonenumber">
+					<el-input v-model="queryParams.phonenumber" placeholder="请输入电话号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item>
+					<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>
+		</div>
+		<div class="content-container">
+			<TreeChoice :dataList="deptOptions" nodeKey="id" nodeVal="label" @itemClick="handleNodeClick" />
+			<div class="main">
+				<div class="table-nav">
+					<div class="tags">
+						<div class="tag">员工</div>
+					</div>
+					<div class="actions">
+						<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">添加</el-button>
+						<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+						<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']" style="margin-right: 10px">导入</el-button>
+						<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+					</div>
+				</div>
+				<el-table v-loading="loading" border :data="userList">
+					<el-table-column label="序号" align="center" prop="userId" v-if="columns[0].visible" width="60">
+						<template slot-scope="scope">
+							<span>{{ scope.$index + 1 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="头像" align="center" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" width="90" />
+					<el-table-column label="姓名" align="center" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" width="120" />
+					<el-table-column label="公司部门" align="center" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" width="160" />
+					<el-table-column label="级别职务" align="center" prop="phonenumber" v-if="columns[4].visible" width="160" />
+					<el-table-column label="性质岗位" align="center" v-if="columns[5].visible" width="160" />
+					<el-table-column label="角色权限" align="center" prop="createTime" v-if="columns[6].visible" width="160" />
+					<el-table-column label="手机号码" align="center" prop="userId" v-if="columns[7].visible" width="150" />
+					<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+						<template slot-scope="scope" v-if="scope.row.userId !== 1">
+							<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-edit" @click="getRolePermissions(scope.row)" 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>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<pagination v-show="total > queryParams.pageSize" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+			</div>
+		</div>
+		<!-- 添加或修改用户配置对话框 -->
+		<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 size="mini" type="primary" @click="submitForm">确 定</el-button>
+				<el-button size="mini" @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
+			>
+				<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" /> 是否更新已经存在的用户数据 </div>
+					<span>仅允许导入xls、xlsx格式文件。</span>
+					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+				</div>
+			</el-upload>
+			<div slot="footer" class="dialog-footer">
+				<el-button size="mini" type="primary" @click="submitFileForm">确 定</el-button>
+				<el-button size="mini" @click="upload.open = false">取 消</el-button>
+			</div>
+		</el-dialog>
+
+		<!-- 修改角色权限对话框 -->
+		<el-dialog title="角色权限" :visible.sync="dialogTableRolePermissions">
+			<el-table border>
+				<el-table-column label="名称" align="center" width="180"></el-table-column>
+				<el-table-column label="描述" align="center"></el-table-column>
+			</el-table>
+			<div slot="footer" class="dialog-footer">
+				<el-button size="mini" @click="cancalRolePermissions">取 消</el-button>
+				<el-button size="mini" type="primary" @click="saveRolePermissions">保 存</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import { treeselect } from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import TreeChoice from '@/components/treeChoice/index.vue'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+	name: 'User',
+	dicts: ['sys_normal_disable', 'sys_user_sex'],
+	components: { Treeselect, TreeChoice },
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 用户表格数据
+			userList: null,
+			// 弹出层标题
+			title: '',
+			// 部门树选项
+			deptOptions: undefined,
+			// 是否显示弹出层
+			open: false,
+			// 部门名称
+			deptName: undefined,
+			// 默认密码
+			initPassword: undefined,
+			// 日期范围
+			dateRange: [],
+			// 岗位选项
+			postOptions: [],
+			// 角色选项
+			roleOptions: [],
+			// 表单参数
+			form: {},
+			defaultProps: {
+				children: 'children',
+				label: 'label'
+			},
+			// 用户导入参数
+			upload: {
+				// 是否显示弹出层（用户导入）
+				open: false,
+				// 弹出层标题（用户导入）
+				title: '',
+				// 是否禁用上传
+				isUploading: false,
+				// 是否更新已经存在的用户数据
+				updateSupport: 0,
+				// 设置上传的请求头部
+				headers: { Authorization: 'Bearer ' + getToken() },
+				// 上传的地址
+				url: process.env.VUE_APP_BASE_API + '/system/user/importData'
+			},
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				userName: undefined,
+				phonenumber: undefined,
+				status: undefined,
+				deptId: undefined
+			},
+			// 列信息
+			columns: [
+				{ key: 0, label: `序号`, visible: true },
+				{ key: 1, label: `头像`, visible: true },
+				{ key: 2, label: `姓名`, visible: true },
+				{ key: 3, label: `公司部门`, visible: true },
+				{ key: 4, label: `级别职务`, visible: true },
+				{ key: 5, label: `性质岗位`, visible: true },
+				{ key: 6, label: `角色权限`, visible: true },
+				{ key: 7, 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'
+					}
+				]
+			},
+			dialogTableRolePermissions: false, // 角色权限弹出层
+		}
+	},
+	created() {
+		this.getList()
+		this.getTreeselect()
+		this.getConfigKey('sys.user.initPassword').then((response) => {
+			this.initPassword = response.msg
+		})
+	},
+	methods: {
+		/** 查询用户列表 */
+		getList() {
+			this.loading = true
+			listUser(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+				this.userList = response.rows
+				this.total = response.total
+				this.loading = false
+			})
+		},
+		/** 查询部门下拉树结构 */
+		getTreeselect() {
+			treeselect().then((response) => {
+				this.deptOptions = response.data
+			})
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.queryParams.deptId = data.id
+			this.getList()
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false
+			this.reset()
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				userId: undefined,
+				deptId: undefined,
+				userName: undefined,
+				nickName: undefined,
+				password: undefined,
+				phonenumber: undefined,
+				email: undefined,
+				sex: undefined,
+				status: '0',
+				remark: undefined,
+				postIds: [],
+				roleIds: []
+			}
+			this.resetForm('form')
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.dateRange = []
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset()
+			this.getTreeselect()
+			getUser().then((response) => {
+				this.postOptions = response.posts
+				this.roleOptions = response.roles
+				this.open = true
+				this.title = '添加用户'
+				this.form.password = this.initPassword
+			})
+		},
+		// 修改角色权限
+		getRolePermissions(row) {
+			this.dialogTableRolePermissions = true
+		},
+		// 保存角色权限修改
+		saveRolePermissions() {
+			this.dialogTableRolePermissions = false
+		},
+		// 取消角色权限修改
+		cancalRolePermissions() {
+			this.dialogTableRolePermissions = false
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset()
+			this.getTreeselect()
+			const userId = row.userId || this.ids
+			getUser(userId).then((response) => {
+				this.form = response.data
+				this.postOptions = response.posts
+				this.roleOptions = response.roles
+				this.form.postIds = response.postIds
+				this.form.roleIds = response.roleIds
+				this.open = true
+				this.title = '修改用户'
+				this.form.password = ''
+			})
+		},
+		/** 提交按钮 */
+		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.$modal
+				.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+				.then(function () {
+					return delUser(userIds)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.catch(() => {})
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download(
+				'system/user/export',
+				{
+					...this.queryParams
+				},
+				`user_${new Date().getTime()}.xlsx`
+			)
+		},
+		/** 导入按钮操作 */
+		handleImport() {
+			this.upload.title = '用户导入'
+			this.upload.open = true
+		},
+		/** 下载模板操作 */
+		importTemplate() {
+			this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
+		},
+		// 文件上传中处理
+		handleFileUploadProgress(event, file, fileList) {
+			this.upload.isUploading = true
+		},
+		// 文件上传成功处理
+		handleFileSuccess(response, file, fileList) {
+			this.upload.open = false
+			this.upload.isUploading = false
+			this.$refs.upload.clearFiles()
+			this.$alert(response.msg, '导入结果', { dangerouslyUseHTMLString: true })
+			this.getList()
+		},
+		// 提交上传文件
+		submitFileForm() {
+			this.$refs.upload.submit()
+		}
+	}
+}
+</script>

src/views/system/employeenInfo/profile/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>个人信息</span>
+          </div>
+          <div>
+            <div class="text-center">
+              <userAvatar :user="user" />
+            </div>
+            <ul class="list-group list-group-striped">
+              <li class="list-group-item">
+                <svg-icon icon-class="user" />用户名称
+                <div class="pull-right">{{ user.userName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="phone" />手机号码
+                <div class="pull-right">{{ user.phonenumber }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="email" />用户邮箱
+                <div class="pull-right">{{ user.email }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属部门
+                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="peoples" />所属角色
+                <div class="pull-right">{{ roleGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="date" />创建日期
+                <div class="pull-right">{{ user.createTime }}</div>
+              </li>
+            </ul>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基本资料</span>
+          </div>
+          <el-tabs v-model="activeTab">
+            <el-tab-pane label="基本资料" name="userinfo">
+              <userInfo :user="user" />
+            </el-tab-pane>
+            <el-tab-pane label="修改密码" name="resetPwd">
+              <resetPwd :user="user" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import userAvatar from "./userAvatar";
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import { getUserProfile } from "@/api/system/user";
+
+export default {
+  name: "Profile",
+  components: { userAvatar, userInfo, resetPwd },
+  data() {
+    return {
+      user: {},
+      roleGroup: {},
+      postGroup: {},
+      activeTab: "userinfo"
+    };
+  },
+  created() {
+    this.getUser();
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.roleGroup = response.roleGroup;
+        this.postGroup = response.postGroup;
+      });
+    }
+  }
+};
+</script>

src/views/system/employeenInfo/profile/resetPwd.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user";
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>

src/views/system/employeenInfo/profile/userAvatar.vue

@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <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"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <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>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :md="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :md="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+
+export default {
+  components: { VueCropper },
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: store.getters.avatar, //裁剪图片的地址
+        autoCrop: true, // 是否默认生成截图框
+        autoCropWidth: 200, // 默认生成截图框宽度
+        autoCropHeight: 200, // 默认生成截图框高度
+        fixedBox: true // 固定截图框大小 不允许改变
+      },
+      previews: {}
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.$modal.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.options.img = store.getters.avatar
+      this.visible = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  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>

src/views/system/employeenInfo/profile/userInfo.vue

@@ -0,0 +1,75 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="user.nickName" maxlength="30" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="user.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="user.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="user.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/system/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>