diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index ff18aa8..db22df5 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -39,8 +39,9 @@ const useUserStore = defineStore({ //转为json let userinfo = JSON.parse(accessToken) console.info(userinfo) - localStorage.setItem('userId', userinfo.USERNAME); - localStorage.setItem('userName', userinfo.USERNAME || ""); + // localStorage.setItem('userId', userinfo.USERNAME); + localStorage.setItem('userId', userinfo.USERCNNAME || userinfo.USERNAME); + localStorage.setItem('userName', userinfo.USERCNNAME || ""); localStorage.setItem('session', userinfo.session); localStorage.setItem('token', userinfo.token); this.ut = userinfo.userId; diff --git a/src/views/check/auditSheet/index.vue b/src/views/check/auditSheet/index.vue index 97f7deb..4efda70 100644 --- a/src/views/check/auditSheet/index.vue +++ b/src/views/check/auditSheet/index.vue @@ -180,7 +180,7 @@ function audit() { CHECKPLANNAME : state.queryParams.CHECKPLANNAME, PLANDATE : state.queryParams.PLANDATE, commitDate : state.commitDate, - user : localStorage.get('userId') + user : localStorage.get('userName') } Auditcheckmark(query).then((res : any) => { diff --git a/src/views/stockIn/AllocateStockIn/index.vue b/src/views/stockIn/AllocateStockIn/index.vue index 2bac099..c7eb7d8 100644 --- a/src/views/stockIn/AllocateStockIn/index.vue +++ b/src/views/stockIn/AllocateStockIn/index.vue @@ -429,19 +429,13 @@ async function handleReserve() { } await allocateStockInCommit(param) .then((res: any) => { - if (res.code == '500') { + if (res.code == 'UndefinedCode' || res.code == '500') { ElMessageBox.alert(res.data.RETURNMESSAGE, '提示框', { confirmButtonText: 'OK' }) state.loading = false state.Button_state = false - } else if (res.code == 'UndefinedCode') { - ElMessageBox.alert(res.data.RETURNMESSAGE, '提示框', { - confirmButtonText: 'OK' - }) - state.loading = false - state.Button_state = false - } else if (res.code == '0') { + } else if (res.code == 0 || res.code == 200) { ElMessageBox.alert('入库成功', '提示框', { confirmButtonText: 'OK' })