From 8dd12f3fb9f2c8c8b319bad323209f28429a80ef Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 29 九月 2026 15:04:24 +0800
Subject: [PATCH] feat(mes): 扫码追溯适配16位纯数字编码
---
src/views/mes/pro/components/qr-trace-modal.vue | 78 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/src/views/mes/pro/components/qr-trace-modal.vue b/src/views/mes/pro/components/qr-trace-modal.vue
index f94946a..6d75a88 100644
--- a/src/views/mes/pro/components/qr-trace-modal.vue
+++ b/src/views/mes/pro/components/qr-trace-modal.vue
@@ -3,7 +3,7 @@
import type { MesProBatchApi } from "#/api/mes/pro/batch";
import type { MesProPalletApi } from "#/api/mes/pro/pallet";
- import { ref } from "vue";
+ import { computed, ref } from "vue";
import { Barcode, useVbenModal } from "@vben/common-ui";
import { DICT_TYPE } from "@vben/constants";
@@ -11,9 +11,10 @@
import { Button, Empty, Input, message, Spin, Tag } from "ant-design-vue";
- import { getBagCodeByCode } from "#/api/mes/pro/bagCode";
+ import { getBagCodeByCode, resolveTraceType } from "#/api/mes/pro/bagCode";
import { getBatchByCode } from "#/api/mes/pro/batch";
import { getPalletByCode } from "#/api/mes/pro/pallet";
+ import { getQrConfig } from "#/api/mes/trace/config";
import { useDescription } from "#/components/description";
defineOptions({ name: "MesProQrTraceModal" });
@@ -35,22 +36,40 @@
const traceTypeLabel = ref("");
- /** 璇嗗埆浜岀淮鐮佸唴瀹圭被鍨嬶細鎵规鍙凤紙鍚复鏃舵壒娆$爜锛�/ 鎵樼洏鐮侊紙鍚复鏃舵墭鐩樼爜锛�/ 琚嬬爜 */
- function resolveCodeType(raw: string): TraceType | undefined {
- const value = raw.trim().toUpperCase();
- if (/^PB-\d{8}$/.test(value)) {
- return "batch";
+ /** 婧簮 H5 椤甸潰鍩虹鍦板潃锛堜細璇濆唴鍙媺鍙栦竴娆★級 */
+ const traceBaseUrl = ref<string>("");
+
+ async function ensureTraceBaseUrl() {
+ if (traceBaseUrl.value) return;
+ try {
+ const res = await getQrConfig();
+ traceBaseUrl.value = res.traceBaseUrl || "";
+ } catch {
+ traceBaseUrl.value = "";
}
- if (/^PL-\d{8}$/.test(value)) {
- return "pallet";
+ }
+
+ /** 浜岀淮鐮佸睍绀哄唴瀹癸細閰嶇疆浜嗘函婧愬湴鍧�鍒欐嫾 H5 URL锛屽惁鍒欏洖閫�绾爜鍊硷紙涓庡悗绔� buildQrCodeContent 涓�鑷达級 */
+ const qrContent = computed(() => {
+ if (!currentCode.value) return "";
+ return traceBaseUrl.value
+ ? `${traceBaseUrl.value}?code=${encodeURIComponent(currentCode.value)}`
+ : currentCode.value;
+ });
+
+ /** 浠庡畬鏁� H5 閾炬帴涓彁鍙栬拷婧爜锛堝吋瀹规壂鐮佹灙鎵弿鎵撳嵃鏍囩閾炬帴锛� */
+ function extractCodeFromUrl(raw: string): string {
+ const trimmed = raw.trim();
+ if (/^https?:\/\//i.test(trimmed)) {
+ try {
+ const url = new URL(trimmed);
+ const code = url.searchParams.get("code");
+ if (code) return code;
+ } catch {
+ // 瑙f瀽澶辫触鎸夊師濮嬭緭鍏ュ鐞�
+ }
}
- if (/^.*-P\d{2}$/.test(value)) {
- return "pallet";
- }
- if (/^BAG-\d{8}$/.test(value) || /^.*-\d{4}$/.test(value)) {
- return "bag";
- }
- return "batch";
+ return trimmed;
}
function resetState() {
@@ -66,18 +85,14 @@
/** 鎵爜/杈撳叆浜岀淮鐮佸唴瀹规煡璇㈣拷婧俊鎭� */
async function handleSearch(raw?: string) {
- const value = (raw ?? codeInput.value)?.trim().toUpperCase();
+ const input = (raw ?? codeInput.value)?.trim() ?? "";
+ const value = extractCodeFromUrl(input).toUpperCase();
if (!value) {
message.warning("璇锋壂鎻忔垨杈撳叆浜岀淮鐮佸唴瀹�");
return;
}
if (value.length > MAX_CODE_LENGTH) {
message.warning("浜岀淮鐮佸唴瀹硅繃闀匡紝璇锋鏌ユ槸鍚︽壂鎻忔纭�");
- return;
- }
- const type = resolveCodeType(value);
- if (!type) {
- message.warning("鏃犳硶璇嗗埆浜岀淮鐮佺被鍨�");
return;
}
loading.value = true;
@@ -90,15 +105,21 @@
palletTrace.value = undefined;
batchTrace.value = undefined;
try {
- if (type === "batch") {
- batchTrace.value = await getBatchByCode(value);
- traceTypeLabel.value = "鎵规鍙�";
+ // 缂栫爜宸茬粺涓�涓恒��16 浣嶇函鏁板瓧銆嶏紝鏃犳硶鍐嶆寜鍓嶇紑鍒ゆ柇绫诲瀷锛屾敼鐢卞悗绔寜缂栫爜瑙f瀽绫诲瀷
+ const type = await resolveTraceType(value);
+ if (type === "bag") {
+ bagTrace.value = await getBagCodeByCode(value);
+ traceTypeLabel.value = "琚嬬爜";
} else if (type === "pallet") {
palletTrace.value = await getPalletByCode(value);
traceTypeLabel.value = "鎵樼洏鐮�";
+ } else if (type === "batch") {
+ batchTrace.value = await getBatchByCode(value);
+ traceTypeLabel.value = "鎵规鍙�";
} else {
- bagTrace.value = await getBagCodeByCode(value);
- traceTypeLabel.value = "琚嬬爜";
+ searchError.value = true;
+ currentCode.value = undefined;
+ return;
}
traceType.value = type;
} catch {
@@ -265,6 +286,7 @@
if (!isOpen) {
return;
}
+ ensureTraceBaseUrl();
const data = modalApi.getData<{ code?: string }>() || {};
codeInput.value = data.code ?? undefined;
resetState();
@@ -512,7 +534,7 @@
class="mb-4 flex items-center gap-6 rounded bg-gray-100 p-5"
>
<div class="flex-shrink-0">
- <Barcode ref="barcodeRef" :content="currentCode" :width="200" />
+ <Barcode ref="barcodeRef" :content="qrContent" :width="200" />
</div>
<div class="min-w-0 flex-1">
<p class="text-lg font-bold break-all">{{ currentCode }}</p>
--
Gitblit v1.9.3