Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
285ae2a8 1 parent f4219806

feat: 新增功能

Inline Side-by-side
Showing 4 changed files with 112 additions and 92 deletions
...@@ -117,8 +117,6 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { ...@@ -117,8 +117,6 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
117 } 117 }
118 118
119 function filterChildren(childrenMap, lastRouter = false) { 119 function filterChildren(childrenMap, lastRouter = false) {
120 - console.log(childrenMap);
121 -
122 var children = []; 120 var children = [];
123 childrenMap.forEach((el, index) => { 121 childrenMap.forEach((el, index) => {
124 if (el.children && el.children.length) { 122 if (el.children && el.children.length) {
......
1 -import { login, logout } from '@/api/login' 1 +import { login, logout } from "@/api/login";
2 -import { getInfo } from '@/api/system/user.js' 2 +import { getInfo } from "@/api/system/user.js";
3 -import { getLogisticsCodeLis, getDictData } from '@/api/system/dict-api.js' 3 +import { getDictData } from "@/api/system/dict-api.js";
4 -import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth' 4 +import {
5 -import { getParamsObj } from '@/utils/parseUrlParams' 5 + getToken,
6 -import { alertWarningMsg } from '@/utils/index.js' 6 + setToken,
7 + removeToken,
8 + removeUserId,
9 + removeTime,
10 +} from "@/utils/auth";
11 +import { removeAuthCode } from "../../utils/auth";
7 12
8 const user = { 13 const user = {
9 state: { 14 state: {
10 token: getToken(), 15 token: getToken(),
11 userData: null, 16 userData: null,
12 - name: '', 17 + name: "",
13 - avatar: '', 18 + avatar: "",
14 roles: [], 19 roles: [],
15 permissions: [], 20 permissions: [],
16 linkList: [], 21 linkList: [],
17 dict: { 22 dict: {
18 - DECLARE_TRAFMODE: [{ itemCode: 'DECLARE_TRAFMODE_AVIATION', itemChineseName: '航空运输', itemValue: '5' }] 23 + DECLARE_TRAFMODE: [
24 + {
25 + itemCode: "DECLARE_TRAFMODE_AVIATION",
26 + itemChineseName: "航空运输",
27 + itemValue: "5",
28 + },
29 + ],
19 }, 30 },
20 loading: { 31 loading: {
21 type: false, 32 type: false,
22 - text: '拼命加载中"' 33 + text: '拼命加载中"',
23 - } 34 + },
24 }, 35 },
25 36
26 mutations: { 37 mutations: {
27 SET_TOKEN: (state, token) => { 38 SET_TOKEN: (state, token) => {
28 - state.token = token 39 + state.token = token;
29 }, 40 },
30 SET_USERDATA: (state, data) => { 41 SET_USERDATA: (state, data) => {
31 - state.userData = data 42 + state.userData = data;
32 }, 43 },
33 SET_NAME: (state, name) => { 44 SET_NAME: (state, name) => {
34 - state.name = name 45 + state.name = name;
35 }, 46 },
36 SET_AVATAR: (state, avatar) => { 47 SET_AVATAR: (state, avatar) => {
37 - state.avatar = avatar 48 + state.avatar = avatar;
38 }, 49 },
39 SET_ROLES: (state, roles) => { 50 SET_ROLES: (state, roles) => {
40 - state.roles = roles 51 + state.roles = roles;
41 }, 52 },
42 SET_PERMISSIONS: (state, permissions) => { 53 SET_PERMISSIONS: (state, permissions) => {
43 - state.permissions = permissions 54 + state.permissions = permissions;
44 }, 55 },
45 SET_LINKLIST: (state, linkList) => { 56 SET_LINKLIST: (state, linkList) => {
46 - state.linkList = linkList 57 + state.linkList = linkList;
47 }, 58 },
48 SET_DICT: (state, dict) => { 59 SET_DICT: (state, dict) => {
49 - state.dict = dict 60 + state.dict = dict;
50 }, 61 },
51 SET_LOAD: (state, loading) => { 62 SET_LOAD: (state, loading) => {
52 - state.loading.type = loading.type 63 + state.loading.type = loading.type;
53 - state.loading.text = loading.text 64 + state.loading.text = loading.text;
54 }, 65 },
55 }, 66 },
56 67
57 actions: { 68 actions: {
58 // 登录 69 // 登录
59 Login({ commit, state }, userInfo) { 70 Login({ commit, state }, userInfo) {
60 - const loginName = userInfo.userName.trim() 71 + const loginName = userInfo.userName.trim();
61 - const password = userInfo.password 72 + const password = userInfo.password;
62 - const rememberMe = userInfo.rememberMe 73 + const rememberMe = userInfo.rememberMe;
63 return new Promise((resolve, reject) => { 74 return new Promise((resolve, reject) => {
64 - login(loginName, password, rememberMe).then(res => { 75 + login(loginName, password, rememberMe)
65 - if (res.code != '200') { 76 + .then((res) => {
66 - reject(res) 77 + if (res.code != "200") {
78 + reject(res);
67 } else { 79 } else {
68 if (!getToken()) { 80 if (!getToken()) {
69 - setToken(res.data) 81 + setToken(res.data);
70 - commit('SET_TOKEN', res.data) 82 + commit("SET_TOKEN", res.data);
71 - resolve(res) 83 + resolve(res);
72 } else { 84 } else {
73 - resolve(res) 85 + resolve(res);
74 } 86 }
75 } 87 }
76 - }).catch(error => {
77 - reject(error)
78 - })
79 }) 88 })
89 + .catch((error) => {
90 + reject(error);
91 + });
92 + });
80 }, 93 },
81 //非账号密码登录 94 //非账号密码登录
82 LoginWithoutPassword({ commit }, token) { 95 LoginWithoutPassword({ commit }, token) {
83 return new Promise((resolve) => { 96 return new Promise((resolve) => {
84 if (!getToken()) { 97 if (!getToken()) {
85 - setToken(token) 98 + setToken(token);
86 - commit('SET_TOKEN', token) 99 + commit("SET_TOKEN", token);
87 - resolve(token) 100 + resolve(token);
88 } else { 101 } else {
89 - resolve(token) 102 + resolve(token);
90 } 103 }
91 - }) 104 + });
92 }, 105 },
93 106
94 // 获取用户信息 107 // 获取用户信息
95 async GetInfo({ commit, state }) { 108 async GetInfo({ commit, state }) {
96 return new Promise((resolve, reject) => { 109 return new Promise((resolve, reject) => {
97 - getInfo().then(res => { 110 + getInfo()
98 - if (res.code === '200') { 111 + .then((res) => {
112 + if (res.code === "200") {
99 commit("SET_USERDATA", res.data); 113 commit("SET_USERDATA", res.data);
100 - resolve(res) 114 + resolve(res);
101 } else { 115 } else {
102 - reject(res) 116 + reject(res);
103 } 117 }
104 - }).catch(error => {
105 - reject(error)
106 - })
107 }) 118 })
119 + .catch((error) => {
120 + reject(error);
121 + });
122 + });
108 }, 123 },
109 124
110 //获取字典数据 125 //获取字典数据
111 async GetDict({ commit, state }, codeList) { 126 async GetDict({ commit, state }, codeList) {
112 - let obj = state.dict 127 + let obj = state.dict;
113 codeList.forEach((item, idx) => { 128 codeList.forEach((item, idx) => {
114 if (obj[item] == undefined || obj[item].length == 0) { 129 if (obj[item] == undefined || obj[item].length == 0) {
115 - obj[item] = [] 130 + obj[item] = [];
116 - getDictData({ doctCode: item }).then(res => { 131 + getDictData({ doctCode: item })
117 - if (res.code === '200') { 132 + .then((res) => {
118 - obj[item] = res.data 133 + if (res.code === "200") {
134 + obj[item] = res.data;
119 } 135 }
120 - }).catch(err => { 136 + })
137 + .catch((err) => {
121 console.log(err); 138 console.log(err);
122 - }).finally(() => { 139 + })
140 + .finally(() => {
123 if (idx == codeList.length - 1) { 141 if (idx == codeList.length - 1) {
124 console.log(obj); 142 console.log(obj);
125 - commit('SET_DICT', obj) 143 + commit("SET_DICT", obj);
126 } 144 }
127 - }) 145 + });
128 } else { 146 } else {
129 if (idx == codeList.length - 1) { 147 if (idx == codeList.length - 1) {
130 console.log(obj); 148 console.log(obj);
131 - commit('SET_DICT', obj) 149 + commit("SET_DICT", obj);
132 } 150 }
133 } 151 }
134 - }) 152 + });
135 }, 153 },
136 154
137 //退出系统 155 //退出系统
138 LogOut({ commit, state }) { 156 LogOut({ commit, state }) {
139 return new Promise((resolve, reject) => { 157 return new Promise((resolve, reject) => {
140 - logout(state.token).then(() => { 158 + logout(state.token)
141 - commit('SET_TOKEN', '') 159 + .then(() => {
142 - commit('SET_USERDATA', null) 160 + commit("SET_TOKEN", "");
143 - removeToken() 161 + commit("SET_USERDATA", null);
144 - removeTime() 162 + removeToken();
145 - resolve() 163 + removeTime();
146 - }).catch(error => { 164 + removeAuthCode();
147 - reject(error) 165 + resolve();
148 - })
149 }) 166 })
167 + .catch((error) => {
168 + reject(error);
169 + });
170 + });
150 }, 171 },
151 172
152 // 前端 登出 173 // 前端 登出
153 FedLogOut({ commit, state }) { 174 FedLogOut({ commit, state }) {
154 - return new Promise(resolve => { 175 + return new Promise((resolve) => {
155 - commit('SET_TOKEN', '') 176 + commit("SET_TOKEN", "");
156 - commit('SET_USERDATA', null) 177 + commit("SET_USERDATA", null);
157 - removeToken() 178 + removeToken();
158 - removeTime() 179 + removeTime();
159 - removeUserId() 180 + removeUserId();
160 location.replace(process.env.VUE_APP_BASE_ROUTE); 181 location.replace(process.env.VUE_APP_BASE_ROUTE);
161 - resolve() 182 + resolve();
162 - }) 183 + });
163 - } 184 + },
164 - } 185 + },
165 -} 186 +};
166 187
167 function getLogisticsCode() { 188 function getLogisticsCode() {
168 return new Promise((resolve, reject) => { 189 return new Promise((resolve, reject) => {
169 - getLogisticsCodeList().then(res => { 190 + getLogisticsCodeList()
170 - if (res.code === '200') { 191 + .then((res) => {
171 - resolve(res.data) 192 + if (res.code === "200") {
193 + resolve(res.data);
172 } else { 194 } else {
173 - reject() 195 + reject();
174 } 196 }
175 - }).catch(err => {
176 - console.log(err);
177 - reject()
178 - })
179 }) 197 })
198 + .catch((err) => {
199 + console.log(err);
200 + reject();
201 + });
202 + });
180 } 203 }
181 204
182 - 205 +export default user;
183 -export default user
184 -
......
...@@ -85,7 +85,7 @@ export function removeAuthCode() { ...@@ -85,7 +85,7 @@ export function removeAuthCode() {
85 export function isHasAuth(code) { 85 export function isHasAuth(code) {
86 const authCode = localStorage.getItem(auth_code); 86 const authCode = localStorage.getItem(auth_code);
87 const stored = authCode ? JSON.parse(authCode) : []; 87 const stored = authCode ? JSON.parse(authCode) : [];
88 - console.log(stored); 88 + // console.log(stored);
89 89
90 if (stored.includes(code)) { 90 if (stored.includes(code)) {
91 return true; 91 return true;
......
...@@ -702,7 +702,7 @@ ...@@ -702,7 +702,7 @@
702 </el-button> 702 </el-button>
703 </div> 703 </div>
704 <div> 704 <div>
705 - <template v-show="isHasAuth('queryMgr:exportList:add')"> 705 + <template v-if="isHasAuth('queryMgr:exportList:add')">
706 <el-button 706 <el-button
707 class="entrySaveButton" 707 class="entrySaveButton"
708 icon="el-icon-plus" 708 icon="el-icon-plus"
...@@ -872,6 +872,7 @@ export default { ...@@ -872,6 +872,7 @@ export default {
872 this.fetchReceiptStatus(); 872 this.fetchReceiptStatus();
873 }, 873 },
874 methods: { 874 methods: {
875 + isHasAuth,
875 fetchReceiptStatus() { 876 fetchReceiptStatus() {
876 getDictData({ doctCode: "RECEIPT_TYPE" }) 877 getDictData({ doctCode: "RECEIPT_TYPE" })
877 .then((res) => { 878 .then((res) => {
......