diff --git a/src/pages/picking/review/details.vue b/src/pages/picking/review/details.vue index f585d98..35d49eb 100644 --- a/src/pages/picking/review/details.vue +++ b/src/pages/picking/review/details.vue @@ -210,24 +210,21 @@ const type = ref(1) const userId = uni.getStorageSync('id') const origin = window.location.href -// 页面加载完毕 +const isLoaded = ref(false) // 新增标志位 onLoad(async(options) => { - if (origin.indexOf('params') != -1) { - queryParams.value = JSON.parse(options.params) - auditingParams.value.taskId = queryParams.value.taskId - type.value = queryParams.value.type - }else{ //工单跳转 - const urlParams = new URLSearchParams(origin); - queryParams.value.taskId = urlParams.get('taskId'); - queryParams.value.id = urlParams.get('id'); - auditingParams.value.taskId =urlParams.get('taskId') - const ticketMatch = origin.match(/ticket=([^&]*)/); - const ticket = ticketMatch ? ticketMatch[1] : ''; - // uni.showModal({ - // title: '当前页面路径', - // content: ticket, - // showCancel: false - // }) + try { + if (origin.indexOf('params') != -1) { + queryParams.value = JSON.parse(options.params) + auditingParams.value.taskId = queryParams.value.taskId + type.value = queryParams.value.type + } else { // 工单跳转 + const urlParams = new URLSearchParams(origin); + queryParams.value.taskId = urlParams.get('taskId'); + queryParams.value.id = urlParams.get('id'); + auditingParams.value.taskId = urlParams.get('taskId') + const ticketMatch = origin.match(/ticket=([^&]*)/); + const ticket = ticketMatch ? ticketMatch[1] : ''; + const { data: result } = await iwsLoginAPI({ ticket: ticket, sysType: 1, @@ -237,27 +234,26 @@ onLoad(async(options) => { // 2 . 获取用户信息并存储 const res = await getUserInfoAPI() memberStore.setUserInfo(res.user) - // uni.showToast({ title: '登录成功!', icon: 'none' }) - // uni.setStorageSync('username', loginForm.username) - // uni.setStorageSync('password', loginForm.password) uni.setStorageSync('id', res.user.userId) userId.value = res.user.userId uni.setStorageSync('deptName', res.user?.dept?.deptName) - uni.setStorageSync('urlPermissions',res.urlPermissions?res.urlPermissions:[]) - - // setTimeout(() => { - // uni.switchTab({ - // url: '/pages/picking/details', - // }) - // }, 500) + uni.setStorageSync('urlPermissions', res.urlPermissions ? res.urlPermissions : []) + } + } catch (error) { + console.error('登录或获取用户信息失败:', error) + uni.showToast({ title: '登录失败,请重试', icon: 'none' }) + } finally { + isLoaded.value = true // 标记加载完成 } }) onShow(() => { - console.log(queryParams.value) - // getCodeDetailData(queryParams.value.id,queryParams.value.publishTask,queryParams.value.typeId)//获取详情 - getReviewInfo(queryParams.value.id) - fetchAuditInfo() + if (isLoaded.value) { + console.log(queryParams.value) + // getCodeDetailData(queryParams.value.id,queryParams.value.publishTask,queryParams.value.typeId)//获取详情 + getReviewInfo(queryParams.value.id) + fetchAuditInfo() + } }) // 获取详情列表 const getReviewInfo = async (id) => {