Compare commits

..

No commits in common. "0a3451cd4f45585e135d8513f96a8322a74c7bb6" and "59cf4660cf2c87fea12efdd75336c0430e02128c" have entirely different histories.

3 changed files with 11 additions and 6 deletions

View File

@ -39,9 +39,8 @@ const useUserStore = defineStore({
//转为json
let userinfo = JSON.parse(accessToken)
console.info(userinfo)
// localStorage.setItem('userId', userinfo.USERNAME);
localStorage.setItem('userId', userinfo.USERCNNAME || userinfo.USERNAME);
localStorage.setItem('userName', userinfo.USERCNNAME || "");
localStorage.setItem('userId', userinfo.USERNAME);
localStorage.setItem('userName', userinfo.USERNAME || "");
localStorage.setItem('session', userinfo.session);
localStorage.setItem('token', userinfo.token);
this.ut = userinfo.userId;

View File

@ -180,7 +180,7 @@ function audit() {
CHECKPLANNAME : state.queryParams.CHECKPLANNAME,
PLANDATE : state.queryParams.PLANDATE,
commitDate : state.commitDate,
user : localStorage.get('userName')
user : localStorage.get('userId')
}
Auditcheckmark(query).then((res : any) => {

View File

@ -429,13 +429,19 @@ async function handleReserve() {
}
await allocateStockInCommit(param)
.then((res: any) => {
if (res.code == 'UndefinedCode' || res.code == '500') {
if (res.code == '500') {
ElMessageBox.alert(res.data.RETURNMESSAGE, '提示框', {
confirmButtonText: 'OK'
})
state.loading = false
state.Button_state = false
} else if (res.code == 0 || res.code == 200) {
} else if (res.code == 'UndefinedCode') {
ElMessageBox.alert(res.data.RETURNMESSAGE, '提示框', {
confirmButtonText: 'OK'
})
state.loading = false
state.Button_state = false
} else if (res.code == '0') {
ElMessageBox.alert('入库成功', '提示框', {
confirmButtonText: 'OK'
})