From 77e4c3d0201a83cf41b73d7bd7a79255759575f4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 17 十月 2026 11:19:23 +0800
Subject: [PATCH] fix(mdm): 修正计量单位类型选项和API文档
---
src/views/mes/pro/bagCode/index.vue | 144 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 56 deletions(-)
diff --git a/src/views/mes/pro/bagCode/index.vue b/src/views/mes/pro/bagCode/index.vue
index 58621ab..9f0df83 100644
--- a/src/views/mes/pro/bagCode/index.vue
+++ b/src/views/mes/pro/bagCode/index.vue
@@ -1,4 +1,5 @@
<script lang="ts" setup>
+ import { ref } from 'vue';
import type { VxeTableGridOptions } from "#/adapter/vxe-table";
import type { MesProBagCodeApi } from "#/api/mes/pro/bagCode";
@@ -6,30 +7,44 @@
import { MesProBagCodeStatusEnum } from "@vben/constants";
import { downloadFileFromBlobPart } from "@vben/utils";
- import { message, Modal } from "ant-design-vue";
+ import { Button, message, Modal } from "ant-design-vue";
import { ACTION_ICON, TableAction, useVbenVxeGrid } from "#/adapter/vxe-table";
import {
deleteBagCodesByUuid,
exportBagCodeExcel,
exportBagQr,
+ exportBagBusinessQr,
+ generateBagBusinessCodes,
getBagCodePage,
bindBagCodeBatch,
unbindBagCodePallet,
} from "#/api/mes/pro/bagCode";
+ import { IconifyIcon } from "@vben/icons";
+ import { countQrExport, submitQrExport } from '#/api/mes/pro/qrExport';
import { $t } from "#/locales";
import { useGridColumns, useGridFormSchema } from "./data";
import BindBatchModal from "./modules/bind-batch.vue";
import BindPalletModal from "./modules/bind-pallet.vue";
import GenerateModal from "./modules/generate-form.vue";
+ import RawGenerateModal from "./modules/raw-generate-form.vue";
import ReplaceModal from "./modules/replace-form.vue";
import QrTraceModal from "../components/qr-trace-modal.vue";
+ import BusinessQrModal from "../components/business-qr.vue";
+ import QrExportTaskModal from '../components/qr-export-task-modal.vue';
defineOptions({ name: "MesProBagCode" });
+ const qrExportTaskModal = ref<InstanceType<typeof QrExportTaskModal>>();
+
const [GenerateFormModal, generateFormModalApi] = useVbenModal({
connectedComponent: GenerateModal,
+ destroyOnClose: true,
+ });
+
+ const [RawGenerateFormModal, rawGenerateFormModalApi] = useVbenModal({
+ connectedComponent: RawGenerateModal,
destroyOnClose: true,
});
@@ -53,6 +68,29 @@
destroyOnClose: true,
});
+ const [BusinessQrViewModal, businessQrApi] = useVbenModal({
+ connectedComponent: BusinessQrModal, destroyOnClose: true,
+ });
+
+ function handleBusinessQr(row: MesProBagCodeApi.BagCode) {
+ if (!row.businessCode) { message.warning('璇峰厛琛ョ敓鎴愪笟鍔＄爜'); return; }
+ businessQrApi.setData({ code: row.businessCode }).open();
+ }
+
+ async function handleGenerateBusinessCodes() {
+ const records = getSelectedRecords();
+ if (!records) return;
+ if (records.length > 200) { message.warning('鍗曟鏈�澶氳ˉ鐢熸垚 200 鏉�'); return; }
+ if (records.some(row => row.status === MesProBagCodeStatusEnum.CANCELED)) {
+ message.warning('宸蹭綔搴熻鐮佷笉鍙ˉ鐢熸垚涓氬姟鐮�'); return;
+ }
+ const ids = records.map(row => row.id).filter((id): id is number => id != null);
+ if (ids.length !== records.length) { message.warning('鎵�閫夎鐮佺己灏戠紪鍙�'); return; }
+ const count = await generateBagBusinessCodes(ids);
+ message.success(`宸茶ˉ鐢熸垚 ${count} 浠戒笟鍔＄爜锛屽凡鏈夌爜鍊间繚鎸佷笉鍙榒);
+ handleRefresh();
+ }
+
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
gridApi.query();
@@ -61,6 +99,11 @@
/** 鐢熸垚鏁版嵁鍖� */
function handleGenerate() {
generateFormModalApi.open();
+ }
+
+ /** 鐢熸垚鍘熷琚嬬爜 */
+ function handleRawGenerate() {
+ rawGenerateFormModalApi.open();
}
/** 鏇挎崲鎴愬姛鍚庡睍绀虹粨鏋滃苟鍒锋柊鍒楄〃 */
@@ -80,7 +123,7 @@
}
/** 瀵煎嚭浜岀淮鐮� ZIP锛堟寜褰撳墠鏌ヨ鏉′欢鐨勭敓鎴愮粍/鎵规锛� */
- async function handleExportQr() {
+ async function handleExportQr(kind: 'trace' | 'business' = 'trace') {
const values = await gridApi.formApi.getValues();
const params: { uuid?: string; batchId?: number } = {};
if (values.uuid) {
@@ -93,8 +136,16 @@
message.warning("璇峰厛鎸夌敓鎴愮粍鎴栨壒娆＄瓫閫夊悗鍐嶅鍑轰簩缁寸爜");
return;
}
- const data = await exportBagQr(params);
- downloadFileFromBlobPart({ fileName: "琚嬬爜浜岀淮鐮�.zip", source: data });
+ const bizType = kind === 'business' ? 'BAG_BUSINESS' : 'BAG_LABEL';
+ const count = await countQrExport({ bizType, ...params });
+ if (count.mode === 'ASYNC') {
+ const task = await submitQrExport({ bizType, ...params });
+ qrExportTaskModal.value?.show(task);
+ message.success(`宸叉彁浜� ${count.totalCount} 寮犱簩缁寸爜鐨勫悗鍙板鍑轰换鍔);
+ return;
+ }
+ const data = await (kind === 'business' ? exportBagBusinessQr : exportBagQr)(params);
+ downloadFileFromBlobPart({ fileName: kind === 'business' ? '琚嬬爜涓氬姟浜岀淮鐮�.zip' : '琚嬬爜杩芥函浜岀淮鐮�.zip', source: data });
}
/** 瀵煎嚭琚嬬爜 Excel锛堜氦浠樺嵃鍒凤級锛屽鍑哄悗琚嬬爜鐘舵�佸彉涓哄凡鍗板埛锛岄渶鍒锋柊鍒楄〃 */
@@ -303,71 +354,46 @@
<template>
<Page auto-content-height>
<GenerateFormModal @success="handleRefresh" />
+ <RawGenerateFormModal @success="handleRefresh" />
<BindBatchFormModal @success="handleRefresh" />
<BindPalletFormModal @success="handleRefresh" />
<ReplaceFormModal @success="handleReplaceSuccess" />
<QrTraceQueryModal />
+ <BusinessQrViewModal />
+ <QrExportTaskModal ref="qrExportTaskModal" />
<Grid table-title="琚嬬爜鍒楄〃锛堜竴琚嬩竴鐮侊級">
+ <template #table-title><span class="text-[1rem] font-bold" style="white-space:nowrap">琚嬬爜鍒楄〃锛堜竴琚嬩竴鐮侊級</span></template>
<template #toolbar-tools>
- <TableAction :actions="[
- {
- label: '鐢熸垚鏁版嵁鍖�',
- type: 'primary',
- icon: ACTION_ICON.ADD,
- auth: ['mes:pro-bag-code:create'],
- onClick: handleGenerate,
- },
- {
- label: '褰曞叆鎵规',
- type: 'primary',
- auth: ['mes:pro-bag-code:update'],
- onClick: handleBindBatch,
- },
- {
- label: '缁戝畾鎵樼洏',
- type: 'primary',
- auth: ['mes:pro-bag-code:update'],
- onClick: handleBindPallet,
- },
- {
- label: '鐮存崯鏇挎崲',
- type: 'primary',
- auth: ['mes:pro-bag-code:replace'],
- onClick: handleReplace,
- },
- {
- label: '瑙ｇ粦鎵樼洏',
- auth: ['mes:pro-bag-code:update'],
- onClick: handleUnbindPallet,
- },
- {
- label: '鎵爜杩芥函',
- icon: ACTION_ICON.SEARCH,
- auth: ['mes:pro-bag-code:query'],
- onClick: handleTrace,
- },
- {
- label: '瀵煎嚭浜岀淮鐮�',
- icon: ACTION_ICON.DOWNLOAD,
- auth: ['mes:pro-bag-code:export'],
- onClick: handleExportQr,
- },
- {
- label: $t('ui.actionTitle.export'),
- type: 'primary',
- icon: ACTION_ICON.DOWNLOAD,
- auth: ['mes:pro-bag-code:export'],
- onClick: handleExport,
- },
- ]" />
+ <div class="mes-code-toolbar">
+ <TableAction :actions="[{ label: '鐢熸垚鏁版嵁鍖�', type: 'primary', icon: ACTION_ICON.ADD, auth: ['mes:pro-bag-code:create'], onClick: handleGenerate },
+ { label: '褰曞叆鎵规', auth: ['mes:pro-bag-code:update'], onClick: handleBindBatch },
+ { label: '缁戝畾鎵樼洏', auth: ['mes:pro-bag-code:update'], onClick: handleBindPallet },
+ { label: '鎵爜杩芥函', icon: ACTION_ICON.SEARCH, auth: ['mes:pro-bag-code:query'], onClick: handleTrace }]" />
+ <TableAction :dropdown-trigger="['click']" :drop-down-actions="[{ label: '杩芥函浜岀淮鐮�', auth: ['mes:pro-bag-code:export'], onClick: () => handleExportQr('trace') },
+ { label: '涓氬姟浜岀淮鐮�', auth: ['mes:pro-bag-code:export'], onClick: () => handleExportQr('business') },
+ { label: 'Excel 鏁版嵁鍖�', auth: ['mes:pro-bag-code:export'], onClick: handleExport }]">
+ <template #more><Button>瀵煎嚭 <IconifyIcon icon="lucide:chevron-down" /></Button></template>
+ </TableAction>
+ <Button @click="qrExportTaskModal?.showLast()">鍚庡彴瀵煎嚭浠诲姟</Button>
+ <TableAction :dropdown-trigger="['click']" :drop-down-actions="[{ label: '鐢熸垚鍘熷琚嬬爜', auth: ['mes:pro-bag-code:create'], onClick: handleRawGenerate },
+ { label: '琛ョ敓鎴愪笟鍔＄爜', auth: ['mes:pro-bag-code:create'], onClick: handleGenerateBusinessCodes },
+ { label: '鐮存崯鏇挎崲', auth: ['mes:pro-bag-code:replace'], onClick: handleReplace },
+ { label: '瑙ｇ粦鎵樼洏', auth: ['mes:pro-bag-code:update'], onClick: handleUnbindPallet }]">
+ <template #more><Button>鏇村鎿嶄綔 <IconifyIcon icon="lucide:chevron-down" /></Button></template>
+ </TableAction>
+ </div>
</template>
<template #actions="{ row }">
<TableAction :actions="[
{
- label: '鏌ョ湅浜岀淮鐮�',
+ label: '杩芥函浜岀淮鐮�',
type: 'link',
auth: ['mes:pro-bag-code:query'],
onClick: handleViewQr.bind(null, row),
+ },
+ {
+ label: '涓氬姟浜岀淮鐮�', type: 'link', auth: ['mes:pro-bag-code:query'],
+ ifShow: !!row.businessCode, onClick: handleBusinessQr.bind(null, row),
},
{
label: $t('common.delete'),
@@ -389,3 +415,9 @@
</Grid>
</Page>
</template>
+
+<style scoped>
+.mes-code-toolbar { display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;gap:8px; }
+.mes-code-toolbar :deep(.ant-btn) { white-space:nowrap; }
+.mes-code-toolbar :deep(.ant-btn > .iconify) { display:inline-block;width:14px;height:14px;vertical-align:middle; }
+</style>
--
Gitblit v1.9.3