From 5f3dea3fd930afde720677fba10b6bfb2e836a18 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 24 七月 2026 09:54:17 +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 | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/views/wls/arrivalnotice/data.ts b/src/views/wls/arrivalnotice/data.ts
index bbed3bb..812b6dd 100644
--- a/src/views/wls/arrivalnotice/data.ts
+++ b/src/views/wls/arrivalnotice/data.ts
@@ -5,14 +5,14 @@
import { h, markRaw } from 'vue';
-import { DICT_TYPE, MesAutoCodeRuleCode } from '../../../packages/constants/src';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
import { Button } from 'ant-design-vue';
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';
@@ -77,11 +77,26 @@
rules: 'required',
},
{
+ fieldName: 'vendorName',
+ label: '',
+ component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
+ },
+ },
+ {
fieldName: 'purchaseOrderId',
label: '閲囪喘璁㈠崟',
component: markRaw(ErpPurchaseOrderSelect),
componentProps: {
placeholder: '璇烽�夋嫨閲囪喘璁㈠崟',
+ onChange: (item: any) => {
+ if (item?.supplierId && formApi) {
+ formApi.setFieldValue('vendorId', item.supplierId);
+ formApi.setFieldValue('vendorName', item.supplierName);
+ }
+ },
},
},
{
@@ -90,6 +105,15 @@
component: markRaw(MdVendorSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ disabled: true,
+ },
+ dependencies: {
+ triggerFields: ['vendorName'],
+ componentProps: (values) => ({
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ disabled: true,
+ vendorName: values.vendorName as string,
+ }),
},
rules: 'selectRequired',
},
@@ -283,6 +307,12 @@
},
},
{
+ field: 'iqcCheckResult',
+ title: '璐ㄦ缁撴灉',
+ width: 100,
+ slots: { default: 'iqcCheckResult' },
+ },
+ {
field: 'qualifiedQuantity',
title: '鍚堟牸鏁伴噺',
width: 100,
@@ -291,6 +321,7 @@
field: 'iqcCode',
title: '妫�楠屽崟鍙�',
minWidth: 140,
+ slots: { default: 'iqcCode' },
},
{
field: 'remark',
@@ -316,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