diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js index feda0746..30340561 100644 --- a/src/api/auth/authAdmin.js +++ b/src/api/auth/authAdmin.js @@ -68,8 +68,16 @@ export function selectUser(query) { export function modifyPasswd(data) { return axios({ - url: "/salewarehouse/r", + url: "/admin/auth/admin/updateUser", method: "post", data: data }); } + +export function filterByUser(query) { + return axios({ + url: "/admin/auth/admin/selectUser", + method: "get", + params: query + }); +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 0d4da56b..fa3df8ad 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -193,7 +193,7 @@ 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,modifyPasswd} from "@/api/auth/authAdmin"; +import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin"; import {isRelogin} from "@/utils/request"; import router from "@/router"; @@ -218,7 +218,7 @@ export default { password: "", confirmPassword: "", userName: "", - locInvCode:"", + locInvCode: "", }, deptList: [], @@ -336,6 +336,16 @@ export default { .catch(() => { }); }, + getInputQuery() { + this.inputQuery = []; + filterByUser() + .then((response) => { + this.inputQuery = response.data || []; + // this.getInvList(); + }) + .catch(() => { + }); + }, deptChange() { this.getInvList(); @@ -415,12 +425,12 @@ export default { locInvCode: store.getters.locInvCode, locDeptCode: store.getters.locDeptCode, }; - this.inputQuery={ - userName:this.$store.getters.name, + this.inputQuery = { + userName: this.$store.getters.name, - locInvCode: store.getters.locInvCode, + // locInvCode: store.getters.locInvCode, }; - + this.getInputQuery(); this.getDeptList(); //this.getInvList()