From f08a81f01bc4a4104dd9ef04e071bb0bd0eb8afe Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 23 七月 2026 10:50:19 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/wls/arrivalnotice/data.ts | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/views/wls/arrivalnotice/data.ts b/src/views/wls/arrivalnotice/data.ts
index 136ed26..812b6dd 100644
--- a/src/views/wls/arrivalnotice/data.ts
+++ b/src/views/wls/arrivalnotice/data.ts
@@ -11,8 +11,8 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getItemPage } from '#/api/mdm/item';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdVendorSelect } from '#/views/mes/md/vendor/components';
import { ErpPurchaseOrderSelect } from '#/views/erp/purchase/order/components';
@@ -307,6 +307,12 @@
},
},
{
+ field: 'iqcCheckResult',
+ title: '璐ㄦ缁撴灉',
+ width: 100,
+ slots: { default: 'iqcCheckResult' },
+ },
+ {
field: 'qualifiedQuantity',
title: '鍚堟牸鏁伴噺',
width: 100,
@@ -341,11 +347,21 @@
{
fieldName: 'itemId',
label: '鐗╂枡',
- component: markRaw(MdItemSelect),
+ component: 'ApiSelect',
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}`;
+ },
},
- rules: 'selectRequired',
+ rules: 'required',
},
{
fieldName: 'arrivalQuantity',
--
Gitblit v1.9.3