From 0f5e64c3d3cb194b6b853b80524a81392b5d04d1 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期三, 21 六月 2023 09:58:42 +0800 Subject: [PATCH] Merge branch 'develop' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01 --- src/views/system/user/index.vue | 383 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 288 insertions(+), 95 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ae87fe4..6f1d6d2 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -29,7 +29,14 @@ </el-col> <!--鐢ㄦ埛鏁版嵁--> <el-col :span="20" :xs="24"> - <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> + <el-form + :model="queryParams" + ref="queryForm" + size="small" + :inline="true" + v-show="showSearch" + label-width="68px" + > <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName"> <el-input v-model="queryParams.userName" @@ -75,8 +82,16 @@ ></el-date-picker> </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-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> @@ -89,7 +104,8 @@ size="mini" @click="handleAdd" v-hasPermi="['system:user:add']" - >鏂板</el-button> + >鏂板</el-button + > </el-col> <el-col :span="1.5"> <el-button @@ -100,7 +116,8 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']" - >淇敼</el-button> + >淇敼</el-button + > </el-col> <el-col :span="1.5"> <el-button @@ -111,7 +128,8 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']" - >鍒犻櫎</el-button> + >鍒犻櫎</el-button + > </el-col> <el-col :span="1.5"> <el-button @@ -121,7 +139,8 @@ size="mini" @click="handleImport" v-hasPermi="['system:user:import']" - >瀵煎叆</el-button> + >瀵煎叆</el-button + > </el-col> <el-col :span="1.5"> <el-button @@ -131,19 +150,67 @@ size="mini" @click="handleExport" v-hasPermi="['system:user:export']" - >瀵煎嚭</el-button> + >瀵煎嚭</el-button + > </el-col> - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> + <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 + v-loading="loading" + :data="userList" + @selection-change="handleSelectionChange" + > <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"> + <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-switch v-model="scope.row.status" @@ -153,7 +220,13 @@ ></el-switch> </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> @@ -171,21 +244,37 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']" - >淇敼</el-button> + >淇敼</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-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-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> @@ -193,7 +282,7 @@ </el-table> <pagination - v-show="total>0" + v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @@ -208,36 +297,71 @@ <el-row> <el-col :span="12"> <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName"> - <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" /> + <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="璇烽�夋嫨褰掑睘閮ㄩ棬" /> + <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-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-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 + 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 + 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> @@ -261,7 +385,8 @@ v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value" - >{{dict.label}}</el-radio> + >{{ dict.label }}</el-radio + > </el-radio-group> </el-form-item> </el-col> @@ -269,7 +394,11 @@ <el-row> <el-col :span="12"> <el-form-item label="宀椾綅"> - <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨宀椾綅"> + <el-select + v-model="form.postIds" + multiple + placeholder="璇烽�夋嫨宀椾綅" + > <el-option v-for="item in postOptions" :key="item.postId" @@ -282,7 +411,11 @@ </el-col> <el-col :span="12"> <el-form-item label="瑙掕壊"> - <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊"> + <el-select + v-model="form.roleIds" + multiple + placeholder="璇烽�夋嫨瑙掕壊" + > <el-option v-for="item in roleOptions" :key="item.roleId" @@ -297,7 +430,11 @@ <el-row> <el-col :span="24"> <el-form-item label="澶囨敞"> - <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input> + <el-input + v-model="form.remark" + type="textarea" + placeholder="璇疯緭鍏ュ唴瀹�" + ></el-input> </el-form-item> </el-col> </el-row> @@ -309,7 +446,12 @@ </el-dialog> <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� --> - <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> + <el-dialog + :title="upload.title" + :visible.sync="upload.open" + width="400px" + append-to-body + > <el-upload ref="upload" :limit="1" @@ -326,10 +468,17 @@ <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>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span> - <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">涓嬭浇妯℃澘</el-link> + <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"> @@ -341,14 +490,23 @@ </template> <script> -import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; +import { + listUser, + getUser, + delUser, + addUser, + updateUser, + resetUserPwd, + changeUserStatus, + deptTreeSelect, +} 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", - dicts: ['sys_normal_disable', 'sys_user_sex'], + dicts: ["sys_normal_disable", "sys_user_sex"], components: { Treeselect }, data() { return { @@ -386,7 +544,7 @@ form: {}, defaultProps: { children: "children", - label: "label" + label: "label", }, // 鐢ㄦ埛瀵煎叆鍙傛暟 upload: { @@ -401,7 +559,7 @@ // 璁剧疆涓婁紶鐨勮姹傚ご閮� headers: { Authorization: "Bearer " + getToken() }, // 涓婁紶鐨勫湴鍧� - url: process.env.VUE_APP_BASE_API + "/system/user/importData" + url: process.env.VUE_APP_BASE_API + "/system/user/importData", }, // 鏌ヨ鍙傛暟 queryParams: { @@ -410,7 +568,7 @@ userName: undefined, phonenumber: undefined, status: undefined, - deptId: undefined + deptId: undefined, }, // 鍒椾俊鎭� columns: [ @@ -420,48 +578,58 @@ { key: 3, label: `閮ㄩ棬`, visible: true }, { key: 4, label: `鎵嬫満鍙风爜`, visible: true }, { key: 5, label: `鐘舵�乣, visible: true }, - { key: 6, label: `鍒涘缓鏃堕棿`, visible: true } + { key: 6, label: `鍒涘缓鏃堕棿`, visible: true }, ], // 琛ㄥ崟鏍¢獙 rules: { userName: [ { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, - { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' } + { + min: 2, + max: 20, + message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", + trigger: "blur", + }, ], nickName: [ - { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" } + { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }, ], password: [ { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, - { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' } + { + min: 5, + max: 20, + message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", + trigger: "blur", + }, ], email: [ { type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", - trigger: ["blur", "change"] - } + trigger: ["blur", "change"], + }, ], phonenumber: [ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", - trigger: "blur" - } - ] - } + trigger: "blur", + }, + ], + }, }; }, watch: { // 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 deptName(val) { this.$refs.tree.filter(val); - } + }, }, created() { this.getList(); this.getDeptTree(); - this.getConfigKey("sys.user.initPassword").then(response => { + this.getConfigKey("sys.user.initPassword").then((response) => { this.initPassword = response.msg; }); }, @@ -469,7 +637,9 @@ /** 鏌ヨ鐢ㄦ埛鍒楄〃 */ getList() { this.loading = true; - listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { + console.log(this.queryParams); + listUser(this.addDateRange(this.queryParams, this.dateRange)).then( + (response) => { this.userList = response.rows; this.total = response.total; this.loading = false; @@ -478,7 +648,7 @@ }, /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ getDeptTree() { - deptTreeSelect().then(response => { + deptTreeSelect().then((response) => { this.deptOptions = response.data; }); }, @@ -495,13 +665,17 @@ // 鐢ㄦ埛鐘舵�佷慨鏀� handleStatusChange(row) { let text = row.status === "0" ? "鍚敤" : "鍋滅敤"; - 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 + .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"; + }); }, // 鍙栨秷鎸夐挳 cancel() { @@ -522,7 +696,7 @@ status: "0", remark: undefined, postIds: [], - roleIds: [] + roleIds: [], }; this.resetForm("form"); }, @@ -541,7 +715,7 @@ }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { - this.ids = selection.map(item => item.userId); + this.ids = selection.map((item) => item.userId); this.single = selection.length != 1; this.multiple = !selection.length; }, @@ -561,7 +735,7 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - getUser().then(response => { + getUser().then((response) => { this.postOptions = response.posts; this.roleOptions = response.roles; this.open = true; @@ -573,7 +747,7 @@ handleUpdate(row) { this.reset(); const userId = row.userId || this.ids; - getUser(userId).then(response => { + getUser(userId).then((response) => { this.form = response.data; this.postOptions = response.posts; this.roleOptions = response.roles; @@ -591,30 +765,32 @@ cancelButtonText: "鍙栨秷", closeOnClickModal: false, inputPattern: /^.{5,20}$/, - inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿" - }).then(({ value }) => { - resetUserPwd(row.userId, value).then(response => { + inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", + }) + .then(({ value }) => { + resetUserPwd(row.userId, value).then((response) => { this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value); }); - }).catch(() => {}); + }) + .catch(() => {}); }, /** 鍒嗛厤瑙掕壊鎿嶄綔 */ - handleAuthRole: function(row) { + handleAuthRole: function (row) { const userId = row.userId; this.$router.push("/system/user-auth/role/" + userId); }, /** 鎻愪氦鎸夐挳 */ - submitForm: function() { - this.$refs["form"].validate(valid => { + submitForm: function () { + this.$refs["form"].validate((valid) => { if (valid) { if (this.form.userId != undefined) { - updateUser(this.form).then(response => { + updateUser(this.form).then((response) => { this.$modal.msgSuccess("淇敼鎴愬姛"); this.open = false; this.getList(); }); } else { - addUser(this.form).then(response => { + addUser(this.form).then((response) => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); @@ -626,18 +802,26 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const userIds = row.userId || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function() { - return delUser(userIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + 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`) + this.download( + "system/user/export", + { + ...this.queryParams, + }, + `user_${new Date().getTime()}.xlsx` + ); }, /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { @@ -646,8 +830,11 @@ }, /** 涓嬭浇妯℃澘鎿嶄綔 */ importTemplate() { - this.download('system/user/importTemplate', { - }, `user_template_${new Date().getTime()}.xlsx`) + this.download( + "system/user/importTemplate", + {}, + `user_template_${new Date().getTime()}.xlsx` + ); }, // 鏂囦欢涓婁紶涓鐞� handleFileUploadProgress(event, file, fileList) { @@ -658,13 +845,19 @@ this.upload.open = false; this.upload.isUploading = false; this.$refs.upload.clearFiles(); - this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true }); + this.$alert( + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + + response.msg + + "</div>", + "瀵煎叆缁撴灉", + { dangerouslyUseHTMLString: true } + ); this.getList(); }, // 鎻愪氦涓婁紶鏂囦欢 submitFileForm() { this.$refs.upload.submit(); - } - } + }, + }, }; -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3