From 7457271638984423ac3b6c2fd136f8c0fe970d40 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:39 +0800
Subject: [PATCH] feat(mes):盘号字段支持 添加和报工时间功能
---
src/views/mes/pro/mps/index.vue | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/views/mes/pro/mps/index.vue b/src/views/mes/pro/mps/index.vue
index f481b13..cde46bf 100644
--- a/src/views/mes/pro/mps/index.vue
+++ b/src/views/mes/pro/mps/index.vue
@@ -8,7 +8,7 @@
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
-import { Button, message, Tag } from 'ant-design-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -17,7 +17,7 @@
exportMps,
getMpsPage,
issueMps,
- mergeIssueMps,
+ batchIssueMps,
} from '#/api/mes/pro/mps';
import { $t } from '#/locales';
@@ -95,35 +95,35 @@
}
}
-/** 鍚堝苟涓嬪彂 */
-async function handleMergeIssue() {
- if (checkedIds.value.length < 2) {
- message.warning('璇疯嚦灏戦�夋嫨2鏉¤褰�');
- return;
- }
- // 鏍¢獙锛氱浉鍚屼骇鍝併�佽崏绋跨姸鎬�
- const firstRow = checkedRows.value[0];
- const isSameProduct = checkedRows.value.every(
- (row) => row.productId === firstRow.productId,
- );
- if (!isSameProduct) {
- message.error('鍙兘閫夋嫨鐩稿悓浜у搧鐨凪PS杩涜鍚堝苟涓嬪彂');
+/** 鎵归噺閫愭潯涓嬪彂锛屾瘡鏉¤鍒掔敓鎴愮嫭绔嬪伐鍗曘�� */
+async function handleBatchIssue() {
+ if (checkedIds.value.length === 0) {
+ message.warning('璇疯嚦灏戦�夋嫨涓�鏉¤褰�');
return;
}
const isAllDraft = checkedRows.value.every(
(row) => row.status === MpsStatusEnum.DRAFT,
);
if (!isAllDraft) {
- message.error('鍙兘閫夋嫨鑽夌鐘舵�佺殑MPS杩涜鍚堝苟涓嬪彂');
+ message.error('璇烽�夋嫨鑽夌鐘舵�佺殑鐢熶骇璁″垝');
return;
}
const hideLoading = message.loading({
- content: '鍚堝苟涓嬪彂涓�...',
+ content: '鎵归噺涓嬪彂涓�...',
duration: 0,
});
try {
- await mergeIssueMps(checkedIds.value);
- message.success('鍚堝苟涓嬪彂鎴愬姛');
+ const results = await batchIssueMps(checkedIds.value);
+ const failures = results.filter((item) => item.error);
+ if (failures.length) {
+ const names = new Map(checkedRows.value.map((row) => [row.id, row.code]));
+ Modal.warning({
+ title: `鎴愬姛 ${results.length - failures.length} 鏉★紝澶辫触 ${failures.length} 鏉,
+ content: failures.map((item) => `${names.get(item.mpsId) || item.mpsId}锛�${item.error}`).join('锛�'),
+ });
+ } else {
+ message.success(`宸蹭笅鍙� ${results.length} 鏉$敓浜ц鍒抈);
+ }
handleRefresh();
} finally {
hideLoading();
@@ -222,14 +222,14 @@
onClick: handleExport,
},
{
- label: '鍚堝苟涓嬪彂',
+ label: '鎵归噺涓嬪彂',
type: 'primary',
- disabled: isEmpty(checkedIds) || checkedIds.length < 2,
+ disabled: isEmpty(checkedIds),
icon: ACTION_ICON.AUDIT,
- auth: ['mes:pro-mps:merge-issue'],
+ auth: ['mes:pro-mps:issue'],
popConfirm: {
- title: '纭鍚堝苟涓嬪彂閫変腑鐨凪PS鍚楋紵',
- confirm: handleMergeIssue,
+ title: '纭閫愭潯涓嬪彂閫変腑鐨勭敓浜ц鍒掑悧锛熸瘡鏉¤鍒掑皢鐢熸垚鐙珛宸ュ崟銆�',
+ confirm: handleBatchIssue,
},
},
]"
@@ -267,7 +267,6 @@
label: $t('common.detail'),
type: 'link',
icon: ACTION_ICON.VIEW,
- auth: ['mes:pro-mps:query'],
onClick: handleDetail.bind(null, row),
},
{
--
Gitblit v1.9.3