diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue index c1487c9..4f1c051 100644 --- a/src/pages/back/backCode.vue +++ b/src/pages/back/backCode.vue @@ -521,8 +521,8 @@ const scanStart = async () => { // 处理扫描成功事件 const handleScanSuccess = (result) => { - qrCode.value = result?.data?.split('?qrcode=')[1] || result?.data - if (qrCode.value === '') { + qrCode.value = result?.data?.split('?qrcode=')[1] || '' + if (qrCode.value === '' || result?.canceled) { uni.showToast({ title: '扫码识别失败', icon: 'none' }) } else { getMaInfoScan() diff --git a/src/pages/back/backCodeAdd.vue b/src/pages/back/backCodeAdd.vue index a44354a..f8f2c74 100644 --- a/src/pages/back/backCodeAdd.vue +++ b/src/pages/back/backCodeAdd.vue @@ -433,8 +433,8 @@ const uploadSignUrlFj = (file) => { // 处理扫描成功事件 const handleScanSuccess = (result) => { - qrCode.value = result?.data?.split('?qrcode=')[1] || result?.data - if (qrCode.value === '') { + qrCode.value = result?.data?.split('?qrcode=')[1] || '' + if (qrCode.value == '' || result?.canceled) { uni.showToast({ title: '扫码识别失败', icon: 'none' }) } else { getMaInfoScan() diff --git a/src/pages/picking/review/details.vue b/src/pages/picking/review/details.vue index 336ba4a..5c00bf8 100644 --- a/src/pages/picking/review/details.vue +++ b/src/pages/picking/review/details.vue @@ -255,6 +255,8 @@ const initPageData = () => { console.log(queryParams.value) getReviewInfo(queryParams.value.id) fetchAuditInfo() + //获取当前人节点状态 + // getNodeAuditStatus() } const getConfig = async () => { @@ -305,6 +307,21 @@ const fetchAuditInfo = async () => { } } +// const getNodeAuditStatus = async () => { +// try { +// // 调用导入的 API 函数 +// const res = await getNodeAuditStatusAPI({taskId:queryParams.value.taskId}) +// console.log('🚀 ~ getNodeAuditStatus ~ res:', res) + + +// console.log('🚀 ~ getNodeAuditStatus ~ auditingList:', auditingList.value) +// } catch (error) { +// // 打印错误信息 +// console.log('🚀 ~ getNodeAuditStatus ~ error:', error) +// } +// } + + // 获取列表 const getCodeDeviceListData = async () => { const res = await getCodeDeviceListAPI(queryCodeParams.value)