From 187dfac80f131250ceceb05ba5efd697ae76819a Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Tue, 11 Jul 2023 19:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 182 ++++++++++++++++++++++++++++--- 1 file changed, 168 insertions(+), 14 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 625b401..701a76b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -9,12 +9,11 @@ @@ -119,21 +193,37 @@ import RuoYiDoc from '@/components/RuoYi/Doc' import store from "@/store"; import {filterAllByUser} from "@/api/system/invWarehouse"; import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse"; -import {updateInv} from "@/api/auth/authAdmin"; +import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin"; import {isRelogin} from "@/utils/request"; import router from "@/router"; export default { data() { + // let validatePass2 = (rule, value, callback) => { + // if (value === "") { + // callback(new Error("请再次输入密码")); + // } else if (value !== this.inputQuery.password) { + // callback(new Error("两次输入密码不一致!")); + // } else { + // callback(); + // } + // }; return { - deptName: store.getters.locDeptName, inv: store.getters.locInvName, + deptName: store.getters.locDeptName, selInvVisible: false, + isVisible: false, userInfo: {}, + inputQuery: { + passWord: "", + newPassword: "", + confirmPassword: "", + userName: "", + locInvCode: "", + + }, deptList: [], invList: [], - userName: '', - companyName: '', formRules: { locDeptCode: [ {required: true, message: "请选择当前部门", trigger: "blur"} @@ -141,6 +231,19 @@ export default { locInvCode: [ {required: true, message: "请选择当前仓库", trigger: "blur"} ], + password: [{required: true, message: "请输入密码", trigger: "blur"}], + newPassword: [{required: true, message: "请输入密码", trigger: "blur"}], + confirmPassword: [ + {required: true, message: "请确认密码", trigger: "blur"}, + // {validator: validatePass2, trigger: "blur"}, + ], + }, + rules: { + password: [{required: true, message: "请输入密码", trigger: "blur"}], + confirmPassword: [ + {required: true, message: "请确认密码", trigger: "blur"}, + // {validator: validatePass2, trigger: "blur"}, + ], }, }; @@ -179,6 +282,41 @@ export default { } }, methods: { + onSubmit() { + if (this.inputQuery.newPassword != this.inputQuery.confirmPassword) { + this.$message.error("新密码与确认密码不一致！！！！"); + return + } + if (this.inputQuery.passWord == this.inputQuery.newPassword) { + this.$message.error("旧密码与新密码不能相同！！！！"); + return + } + this.$refs["dataForm"].validate((valid) => { + if (valid) { + this.loading = true; + modifyPasswd(this.inputQuery).then((response) => { + if (response.code === 20000) { + this.loading = false; + this.$confirm('密码重置成功，请点击确定重新登录', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$store.dispatch('LogOut').then(() => { + location.href = process.env.VUE_APP_CONTEXT_PATH; + }) + }).catch(() => { + }); + } else { + this.$message.error(response.message); + } + }); + } else { + return false; + } + }); + }, + toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, @@ -197,7 +335,9 @@ export default { changeInv() { this.selInvVisible = true; - this.getDeptList(); + }, + modifyPassword() { + this.isVisible = true; }, getDeptList() { @@ -210,6 +350,16 @@ export default { .catch(() => { }); }, + // getInputQuery() { + // this.inputQuery = []; + // filterByUser() + // .then((response) => { + // this.inputQuery = response.data || []; + // // this.getInvList(); + // }) + // .catch(() => { + // }); + // }, deptChange() { this.getInvList(); @@ -219,8 +369,7 @@ export default { getInvList() { this.invList = []; let query = { - deptCode: this.userInfo.locDeptCode, - type:1 + deptCode: this.userInfo.locDeptCode }; findByDeptUser(query) .then((response) => { @@ -266,6 +415,8 @@ export default { closeDialog() { this.selInvVisible = false; + this.isVisible = false; + this.getDeptList() this.resetForm(); }, @@ -283,14 +434,17 @@ export default { }, created() { this.userName = this.$store.getters.name; - this.companyName = this.$store.getters.companyName; this.userInfo = { id: store.getters.adminId, locInvCode: store.getters.locInvCode, locDeptCode: store.getters.locDeptCode, }; + this.inputQuery = { + userName: this.userName, + id: this.userInfo.id, - + }; + // this.getInputQuery(); this.getDeptList(); //this.getInvList()