diff --git a/src/pages_function/pages/keypart/detail.vue b/src/pages_function/pages/keypart/detail.vue index 63f15a5..9b8476c 100644 --- a/src/pages_function/pages/keypart/detail.vue +++ b/src/pages_function/pages/keypart/detail.vue @@ -39,27 +39,34 @@ import request from '@/utils/request' import AppTitleHeader from '@/components/common/AppTitleHeader.vue' const keypartId = ref(undefined) +const keypartCode = ref(undefined) +const keypartType = ref(undefined) const loading = ref(false) const detailData = ref(null) onLoad((query) => { - const rawId = query && (query.id !== undefined ? query.id : query.code) + const rawId = query && query.id const decoded = rawId ? decodeURIComponent(String(rawId)) : '' keypartId.value = decoded ? decoded : undefined + keypartType.value = query && query.type + keypartCode.value = query && query.code fetchDetail() }) async function fetchDetail() { - if (!keypartId.value) { + if (!keypartId.value && !keypartCode.value) { uni.showToast({ title: '缺少关键件ID', icon: 'none' }) return } loading.value = true try { + const isScan = keypartType.value === 'scan' + const params = isScan ? { id: keypartId.value } : { code: keypartCode.value } + const res = await request({ url: '/admin-api/mes/critical-component/get', method: 'get', - params: { id: keypartId.value } + params: params }) detailData.value = res && res.data !== undefined ? res.data : res } catch (e) { diff --git a/src/pages_function/pages/keypart/index.vue b/src/pages_function/pages/keypart/index.vue index f5a1014..f78e5f6 100644 --- a/src/pages_function/pages/keypart/index.vue +++ b/src/pages_function/pages/keypart/index.vue @@ -120,12 +120,18 @@ function confirmInput() { return; } - navigateToDetail(keypartCode.value.trim()); + navigateToDetail(keypartCode.value.trim(), 'input'); } -function navigateToDetail(id) { +function navigateToDetail(id, type = 'scan') { + let url + if (type === 'scan') { + url = `/pages_function/pages/keypart/detail?id=${encodeURIComponent(id)}&type=${type}` + } else { + url = `/pages_function/pages/keypart/detail?code=${id}&type=${type}` + } uni.navigateTo({ - url: `/pages_function/pages/keypart/detail?id=${encodeURIComponent(id)}` + url: url }); }