From 71fab3d42e7e4852387743ce63b52dbd694e8247 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Fri, 28 Apr 2023 10:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=82=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 187 ++++++++++-------- .../purchase/purOrder/purOrderSearch.vue | 9 +- 2 files changed, 106 insertions(+), 90 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9fdc643..245e430 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,12 +1,18 @@ -import {login, logout, getInfo} from '@/api/login' -import {getToken, setToken, removeToken, removeAdminId, setAdminId} from '@/utils/auth' +import { login, logout, getInfo } from "@/api/login"; +import { + getToken, + setToken, + removeToken, + removeAdminId, + setAdminId, +} from "@/utils/auth"; const user = { state: { adminId: "", token: getToken(), - name: '', - avatar: '', + name: "", + avatar: "", roles: [], permissions: [], employeeName: "", @@ -19,128 +25,135 @@ const user = { }, mutations: { - SET_ADMINID: (state, adminId) => { - state.adminId = adminId + state.adminId = adminId; }, SET_TOKEN: (state, token) => { - state.token = token + state.token = token; }, SET_NAME: (state, name) => { - state.name = name + state.name = name; }, SET_AVATAR: (state, avatar) => { - state.avatar = avatar + state.avatar = avatar; }, SET_ROLES: (state, roles) => { - state.roles = roles + state.roles = roles; }, SET_PERMISSIONS: (state, permissions) => { - state.permissions = permissions + state.permissions = permissions; }, SET_EMPLOYEENAME: (state, employeeName) => { - state.employeeName = employeeName + state.employeeName = employeeName; }, SET_CUSTOMERID: (state, customerId) => { - state.customerId = customerId + state.customerId = customerId; }, SET_COMPANYNAME: (state, companyName) => { - state.companyName = companyName + state.companyName = companyName; }, SET_LOCDEPTCODE: (state, locDeptCode) => { - state.locDeptCode = locDeptCode + state.locDeptCode = locDeptCode; }, SET_LOCIVNCODE: (state, locInvCode) => { - state.locInvCode = locInvCode + state.locInvCode = locInvCode; }, SET_LOCDEPTNAME: (state, locDeptName) => { - state.locDeptName = locDeptName + state.locDeptName = locDeptName; }, SET_LOCIVNNAME: (state, locInvName) => { - state.locInvName = locInvName + state.locInvName = locInvName; }, }, actions: { // 登录 - Login({commit}, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code - const uuid = userInfo.uuid + Login({ commit }, userInfo) { + const username = userInfo.username.trim(); + const password = userInfo.password; + const code = userInfo.code; + const uuid = userInfo.uuid; return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { - if (res.code == 20000) { - setToken(res.data.token) - setAdminId(res.data.id) - commit('SET_TOKEN', res.data.token) - commit('SET_ADMINID', res.data.id) - resolve() - } else { - reject(res.message); - } - - }).catch(error => { - reject(error) - }) - }) + login(username, password, code, uuid) + .then((res) => { + if (res.code == 20000) { + setToken(res.data.token); + setAdminId(res.data.id); + commit("SET_TOKEN", res.data.token); + commit("SET_ADMINID", res.data.id); + resolve(); + } else { + reject(res.message); + } + }) + .catch((error) => { + reject(error); + }); + }); }, // 获取用户信息 - GetInfo({commit, state}) { + GetInfo({ commit, state }) { return new Promise((resolve, reject) => { - getInfo().then(res => { - const user = res.data - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/glxplogo.png") : user.avatar; - if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLES', res.data.roles) - commit('SET_PERMISSIONS', res.data.permissions) - } else { - commit('SET_ROLES', ['ROLE_DEFAULT']) - } - commit('SET_AVATAR', avatar) - commit('SET_NAME', user.userName) - commit('SET_EMPLOYEENAME', user.employeeName) - commit('SET_CUSTOMERID', user.customerId) - commit('SET_COMPANYNAME', user.companyName) - commit('SET_LOCDEPTCODE', user.locDeptCode) - commit('SET_LOCIVNCODE', user.locInvCode) - commit('SET_LOCDEPTNAME', user.locDeptName) - commit('SET_LOCIVNNAME', user.locInvName) - resolve(res) - console.log("获取用户数据成功-=----"); - }).catch(error => { - reject(error) - }) - }) + getInfo() + .then((res) => { + const user = res.data; + const avatar = + user.avatar == "" || user.avatar == null + ? require("@/assets/images/glxplogo.png") + : user.avatar; + if (res.data.roles && res.data.roles.length > 0) { + // 验证返回的roles是否是一个非空数组 + commit("SET_ROLES", res.data.roles); + commit("SET_PERMISSIONS", res.data.permissions); + } else { + commit("SET_ROLES", ["ROLE_DEFAULT"]); + } + commit("SET_AVATAR", avatar); + commit("SET_NAME", user.userName); + commit("SET_EMPLOYEENAME", user.employeeName); + commit("SET_CUSTOMERID", user.customerId); + commit("SET_COMPANYNAME", user.companyName); + commit("SET_LOCDEPTCODE", user.locDeptCode); + commit("SET_LOCIVNCODE", user.locInvCode); + commit("SET_LOCDEPTNAME", user.locDeptName); + commit("SET_LOCIVNNAME", user.locInvName); + resolve(res); + // console.log("获取用户数据成功-=----"); + }) + .catch((error) => { + reject(error); + }); + }); }, // 退出系统 - LogOut({commit, state}) { + LogOut({ commit, state }) { return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('SET_ADMINID', '') - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - commit('SET_PERMISSIONS', []) - commit('SET_EMPLOYEENAME', "") - commit('SET_CUSTOMERID', "") - commit('SET_COMPANYNAME', "") - commit('SET_LOCDEPTCODE', "") - commit('SET_LOCIVNCODE', "") - commit('SET_LOCDEPTNAME', "") - commit('SET_LOCIVNNAME', "") - removeToken() - removeAdminId() - resolve() - }).catch(error => { - reject(error) - }) - }) + logout(state.token) + .then(() => { + commit("SET_ADMINID", ""); + commit("SET_TOKEN", ""); + commit("SET_ROLES", []); + commit("SET_PERMISSIONS", []); + commit("SET_EMPLOYEENAME", ""); + commit("SET_CUSTOMERID", ""); + commit("SET_COMPANYNAME", ""); + commit("SET_LOCDEPTCODE", ""); + commit("SET_LOCIVNCODE", ""); + commit("SET_LOCDEPTNAME", ""); + commit("SET_LOCIVNNAME", ""); + removeToken(); + removeAdminId(); + resolve(); + }) + .catch((error) => { + reject(error); + }); + }); }, + }, +}; - } -} - -export default user +export default user; diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue index b997057..25b285e 100644 --- a/src/views/purchase/purOrder/purOrderSearch.vue +++ b/src/views/purchase/purOrder/purOrderSearch.vue @@ -317,7 +317,7 @@ export default { BASE_URL: process.env.VUE_APP_BASE_API, filterQuery: { billAction: null, - billNo: "", + billNo: "", //采购订单号 originType: null, thirdSysFk: "", page: 1, @@ -333,7 +333,7 @@ export default { Menustatus: null, filePath: "", createTimes: null, - auditTimes: null, + auditTimes: null, //发布时间 选择器 showSearch: true, formName: null, formMap: { @@ -438,6 +438,7 @@ export default { }, methods: { + // 重置按钮点击事件 onReset() { this.$router.push({ path: "", @@ -458,14 +459,16 @@ export default { this.auditTimes = []; this.getList(); }, - + // 查询按钮点击事件 onSubmitFind() { this.filterQuery.page = 1; this.getList(); }, + // 显示/隐藏搜索栏 按钮点击事件 hideSearch() { this.showSearch = !this.showSearch; }, + // 帮助按钮点击事件 help() { this.certFileUrl = this.BASE_URL +