From 4e65306c1ea5f9b19529625bb89330035cafdc4a Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新高电力' into dev_新疆_新高电力
---
src/views/mes/qc/template/data.ts | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
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',
--
Gitblit v1.9.3