From 9afafd62badb3e0f6e9475f348447ca6a042c2ae Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Mon, 17 Jul 2023 20:08:18 +0800 Subject: [PATCH] tokentoken --- .env.development | 2 +- src/store/modules/user.js | 11 ++++----- src/utils/auth.js | 21 ----------------- src/views/dashboard/index.vue | 4 ---- src/views/outbounds/index.vue | 20 ++++++---------- src/views/stocks/component/addRuku.vue | 15 ++++++++---- src/views/stocks/component/detailContract.vue | 23 +++++++++++-------- src/views/stocks/index.vue | 7 ------ 8 files changed, 36 insertions(+), 67 deletions(-) diff --git a/.env.development b/.env.development index 5f3b6b3..3d31e78 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV='development' VUE_APP_BASE_API = http://192.168.60.99:9004/ VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file VUE_APP_OA_URL = http://192.168.60.18:2021 - +VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' #VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ #VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e5eebc1..a3f3db6 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,8 +7,7 @@ import { import { getToken, setToken, - removeToken, - removeWzglUser + removeToken } from '@/utils/auth' import { resetRouter @@ -61,7 +60,7 @@ const actions = { }).then(response => { //console.log(response) - + const { data } = response; @@ -140,8 +139,7 @@ const actions = { console.log("logout",state.token) logout(state.token).then(() => { removeToken() // must remove token first - resetRouter() - removeWzglUser() + resetRouter() commit('RESET_STATE') resolve() }).catch(error => { @@ -155,8 +153,7 @@ const actions = { commit }) { return new Promise(resolve => { - removeToken() // must remove token first - removeWzglUser() + removeToken() // must remove token first commit('RESET_STATE') resolve() }) diff --git a/src/utils/auth.js b/src/utils/auth.js index ccd9d0e..c17854d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,7 +1,6 @@ import Cookies from 'js-cookie' const TokenKey = 'patrol_wzgl_token' -const UserInfo = 'patrol_wzgl_user' export function getToken() { @@ -25,23 +24,3 @@ export function removeToken() { } -export function getWzglUser() { - //return Cookies.get(TokenKey) - - if (Cookies.get(UserInfo)) { - return Cookies.get(UserInfo) - } else { - return sessionStorage.getItem(UserInfo); - } -} - -export function setWzglUser(User) { - sessionStorage.setItem(UserInfo, User); - return Cookies.set(UserInfo, User) -} - -export function removeWzglUser() { - sessionStorage.clear(); - return Cookies.remove(UserInfo) - -} diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index e85b2d5..46cc687 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -40,9 +40,6 @@ import { getInfo } from '../../api/user.js' - import { - setWzglUser - } from '@/utils/auth.js' export default { components: { @@ -186,7 +183,6 @@ getInfo().then(response => { console.log(response) this.user = response - setWzglUser(this.user) }).catch(error => {}) this.start_time = this.recentTime(-14, 'yyyy-MM-dd') this.end_time = this.getNowDate() diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue index d83ddf4..5db776c 100644 --- a/src/views/outbounds/index.vue +++ b/src/views/outbounds/index.vue @@ -56,9 +56,9 @@ getInfo } from "@/api/user.js" import { - getOutboundsStatus - } from "@/api/contract.js" - + getOutboundsStatus, + getOatoken + } from "@/api/contract.js" import addoutbounds from "./component/addoutbounds.vue" import printoutbounds from "./component/printoutbounds.vue" import { @@ -171,14 +171,6 @@ } }).catch(error => {}) - // const res = await JSON.parse(getWzglUser()) - // this.userName = res.username - // this.authName = res.name - // for(var k of res.role){ - // if(k.name=='系统管理员'){ - // this.roleName = k.name - // } - // } }, async getindex() { this.loading = true @@ -210,7 +202,7 @@ this.$refs['printoutbounds'].type = type this.$refs['printoutbounds'].chukuType = this.chukuType }, - tofollow(id,row){ + async tofollow(id,row){ console.log(row) if(row.id_outbounds_items_outbounds_id_relation.length<1){ Message({ @@ -240,13 +232,15 @@ typeid = parseInt(typeObj[k]) } } + let res = await getOatoken() // = this.chukuType=='领用'?31:(this.chukuType=='处置'?32:33) // http://suzhouhedaooa.langye.net/admin/flow/create/31?username=admin&default_json={%22bianhao%22:%22100%22} let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?username=${this.userName}&default_json=${JSON.stringify(default_json)}` + `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${res.oatoken}&username=${this.userName}&default_json=${JSON.stringify(default_json)}` let seeBuy = window.open(url, 'follow', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) + console.log(url) }, deleteChuku(row) { // return diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue index baa5c0f..5417b8e 100644 --- a/src/views/stocks/component/addRuku.vue +++ b/src/views/stocks/component/addRuku.vue @@ -15,7 +15,7 @@ -