From f984f80ff5d6c36af7860a17d762fe92731e28bd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:04 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
src/views/mes/md/item/components/product-bom-select-dialog.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/md/item/components/product-bom-select-dialog.vue b/src/views/mes/md/item/components/product-bom-select-dialog.vue
index 9718d32..785fc1a 100644
--- a/src/views/mes/md/item/components/product-bom-select-dialog.vue
+++ b/src/views/mes/md/item/components/product-bom-select-dialog.vue
@@ -15,19 +15,29 @@
const emit = defineEmits<{
selected: [row: MesMdProductBomApi.ProductBom];
+ 'selected-many': [rows: MesMdProductBomApi.ProductBom[]];
}>();
const open = ref(false); // 寮圭獥鏄惁鎵撳紑
const list = ref<MesMdProductBomApi.ProductBom[]>([]); // BOM 瀛愮墿鏂欏垪琛�
const selectedRow = ref<MesMdProductBomApi.ProductBom>(); // 褰撳墠閫変腑鐨� BOM 琛�
+const multiple = ref(false); // 鏄惁澶氶��
+const disabledItemIds = ref<number[]>([]); // 宸叉坊鍔犮�佺姝㈤噸澶嶉�夋嫨鐨勭墿鏂�
+
+const baseColumns = useProductBomGridColumns(true) || [];
const [Grid, gridApi] = useVbenVxeGrid({
gridOptions: {
border: true,
columns: [
{ type: 'radio', width: 55, align: 'center' },
- ...(useProductBomGridColumns(true) || []),
+ ...baseColumns,
],
+ checkboxConfig: {
+ highlight: true,
+ checkMethod: ({ row }: { row: MesMdProductBomApi.ProductBom }) =>
+ !disabledItemIds.value.includes(row.bomItemId!),
+ },
data: list.value,
height: 500,
keepSource: true,
@@ -49,6 +59,9 @@
} as VxeTableGridOptions<MesMdProductBomApi.ProductBom>,
gridEvents: {
cellDblclick: ({ row }: { row: MesMdProductBomApi.ProductBom }) => {
+ if (multiple.value || disabledItemIds.value.includes(row.bomItemId!)) {
+ return;
+ }
selectedRow.value = row;
gridApi.grid.setRadioRow(row);
handleConfirm();
@@ -59,16 +72,35 @@
},
});
+/** 鍒囨崲鍗曢��/澶氶�夊垪 */
+function applySelectMode() {
+ gridApi.setGridOptions({
+ columns: [
+ multiple.value
+ ? { type: 'checkbox', width: 55, align: 'center' }
+ : { type: 'radio', width: 55, align: 'center' },
+ ...baseColumns,
+ ],
+ });
+}
+
/** 鎵撳紑 BOM 鐗╂枡閫夋嫨寮圭獥 */
-async function openModal(itemId: number, selectedBomItemId?: number) {
+async function openModal(
+ itemId: number,
+ selectedBomItemId?: number,
+ options?: { disabledItemIds?: number[]; multiple?: boolean },
+) {
open.value = true;
selectedRow.value = undefined;
+ multiple.value = options?.multiple === true;
+ disabledItemIds.value = options?.disabledItemIds ?? [];
+ applySelectMode();
gridApi.setLoading(true);
try {
list.value = await getProductBomListByItemId(itemId);
gridApi.setGridOptions({ data: list.value });
await nextTick();
- if (selectedBomItemId !== null) {
+ if (!multiple.value && selectedBomItemId !== null) {
const match = list.value.find(
(row) => row.bomItemId === selectedBomItemId,
);
@@ -87,10 +119,21 @@
open.value = false;
selectedRow.value = undefined;
await gridApi.grid.clearRadioRow();
+ await gridApi.grid.clearCheckboxRow();
}
/** 纭閫夋嫨 BOM 鐗╂枡 */
function handleConfirm() {
+ if (multiple.value) {
+ const rows = gridApi.grid.getCheckboxRecords();
+ if (!rows.length) {
+ message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�');
+ return;
+ }
+ emit('selected-many', rows);
+ open.value = false;
+ return;
+ }
if (!selectedRow.value) {
message.warning('璇烽�夋嫨涓�鏉℃暟鎹�');
return;
--
Gitblit v1.9.3