From 77066a73e57b26ff20a2512a6db35f8e08231c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 20:15:46 +0800
Subject: [PATCH] feat(qc): 实现质检模板物料防重复选择功能
---
src/views/basicData/mdm/components/select-dialog.vue | 5 ++++-
src/views/mes/qc/template/modules/item-form.vue | 23 ++++++++++++++++++-----
src/views/mes/qc/template/data.ts | 16 ++++------------
src/views/basicData/mdm/components/select.vue | 3 ++-
src/api/mdm/item/index.ts | 1 +
5 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/api/mdm/item/index.ts b/src/api/mdm/item/index.ts
index 414a2e2..e8ab242 100644
--- a/src/api/mdm/item/index.ts
+++ b/src/api/mdm/item/index.ts
@@ -53,6 +53,7 @@
/** 鐗╂枡鍒嗛〉鏌ヨ鍙傛暟 */
export interface PageParams extends PageParam {
+ excludeIds?: string;
code?: string;
name?: string;
categoryId?: number;
diff --git a/src/views/basicData/mdm/components/select-dialog.vue b/src/views/basicData/mdm/components/select-dialog.vue
index f42875f..1fbcd24 100644
--- a/src/views/basicData/mdm/components/select-dialog.vue
+++ b/src/views/basicData/mdm/components/select-dialog.vue
@@ -27,6 +27,7 @@
const selectedRows = ref<MdmItemApi.Item[]>([]); // 宸查�夌墿鏂欏垪琛�
const preSelectedIds = ref<number[]>([]); // 棰勯�夌墿鏂欑紪鍙峰垪琛�
const categoryList = ref<MesMdItemTypeApi.ItemType[]>([]); // 鍒嗙被鍒楄〃缂撳瓨
+const excludeIds = ref<number[]>([]);
const TAG_COLORS = ['green', 'orange', 'blue', 'purple', 'cyan', 'magenta', 'geekblue', 'volcano', 'gold', 'lime'] as const;
@@ -149,6 +150,7 @@
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
+ excludeIds: excludeIds.value.length ? excludeIds.value.join(',') : undefined,
});
},
},
@@ -184,11 +186,12 @@
/** 鎵撳紑鐗╂枡閫夋嫨寮圭獥 */
async function openModal(
selectedIds?: number[],
- options?: { multiple?: boolean },
+ options?: { multiple?: boolean; excludeIds?: number[] },
) {
open.value = true;
multiple.value = options?.multiple ?? true;
preSelectedIds.value = selectedIds || [];
+ excludeIds.value = options?.excludeIds || [];
await nextTick();
gridApi.setGridOptions({
columns: useMdmItemSelectGridColumns(multiple.value),
diff --git a/src/views/basicData/mdm/components/select.vue b/src/views/basicData/mdm/components/select.vue
index 6149196..4ad51f3 100644
--- a/src/views/basicData/mdm/components/select.vue
+++ b/src/views/basicData/mdm/components/select.vue
@@ -20,6 +20,7 @@
modelValue?: number;
placeholder?: string;
label?: string;
+ excludeIds?: number[];
}>(),
{
allowClear: true,
@@ -88,7 +89,7 @@
const selectedIds = (
props.modelValue === null ? [] : [props.modelValue]
) as number[];
- dialogRef.value?.open(selectedIds, { multiple: false });
+ dialogRef.value?.open(selectedIds, { multiple: false, excludeIds: props.excludeIds });
}
/** 鍥炲~閫変腑鐨勭墿鏂� */
diff --git a/src/views/mes/qc/template/data.ts b/src/views/mes/qc/template/data.ts
index 1f5add0..9f37548 100644
--- a/src/views/mes/qc/template/data.ts
+++ b/src/views/mes/qc/template/data.ts
@@ -17,7 +17,7 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getItemPage } from '#/api/mdm/item';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
import { QcIndicatorSelect } from '#/views/mes/qc/indicator/components';
@@ -408,7 +408,7 @@
}
/** 浜у搧鍏宠仈瀛愯〃鐨勮〃鍗� */
-export function useItemFormSchema(): VbenFormSchema[] {
+export function useItemFormSchema(excludeIds: number[] = []): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -421,19 +421,11 @@
{
fieldName: 'itemId',
label: '浜у搧鐗╂枡',
- component: 'ApiSelect',
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
allowClear: true,
- showSearch: true,
- api: getItemPage,
- resultField: 'list',
- labelField: 'name',
- valueField: 'id',
- optionRender: (option: any) => {
- const item = option.data;
- return `${item.code} - ${item.name}`;
- },
+ excludeIds,
},
formItemClass: 'col-span-3',
rules: 'required',
diff --git a/src/views/mes/qc/template/modules/item-form.vue b/src/views/mes/qc/template/modules/item-form.vue
index 8acc6c3..9c7e369 100644
--- a/src/views/mes/qc/template/modules/item-form.vue
+++ b/src/views/mes/qc/template/modules/item-form.vue
@@ -11,6 +11,7 @@
import {
createTemplateItem,
getTemplateItem,
+ getTemplateItemPage,
updateTemplateItem,
} from '#/api/mes/qc/template/item';
import { $t } from '#/locales';
@@ -74,14 +75,26 @@
MesQcTemplateItemApi.TemplateItem & { templateId: number }
>();
templateId.value = data.templateId;
- if (!data?.id) {
- return;
- }
modalApi.lock();
try {
- formData.value = await getTemplateItem(data.id);
+ formData.value = data.id ? await getTemplateItem(data.id) : undefined;
+ const boundItems: MesQcTemplateItemApi.TemplateItem[] = [];
+ let pageNo = 1;
+ const pageSize = 200;
+ let total: number;
+ do {
+ const page = await getTemplateItemPage({ templateId: data.templateId, pageNo, pageSize });
+ boundItems.push(...page.list);
+ total = page.total;
+ pageNo++;
+ if (page.list.length === 0) break;
+ } while (boundItems.length < total);
+ const excludeIds = boundItems
+ .filter(item => item.id !== data.id && item.itemId != null)
+ .map(item => item.itemId!);
+ await formApi.updateSchema(useItemFormSchema(excludeIds));
// 璁剧疆鍒� values
- await formApi.setValues(formData.value);
+ if (formData.value) await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3