From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/itemreceipt/data.ts | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/views/wls/itemreceipt/data.ts b/src/views/wls/itemreceipt/data.ts
index da9708b..4f72501 100644
--- a/src/views/wls/itemreceipt/data.ts
+++ b/src/views/wls/itemreceipt/data.ts
@@ -12,14 +12,14 @@
DICT_TYPE,
MesAutoCodeRuleCode,
MesWmArrivalNoticeStatusEnum,
-} from '../../../packages/constants/src';
+} from '@vben/constants';
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ErpSupplierSelect } from '#/views/erp/purchase/supplier/components';
import {
WmArrivalNoticeLineSelect,
WmArrivalNoticeSelect,
@@ -115,19 +115,38 @@
await formApi?.setValues({
purchaseOrderCode: notice?.purchaseOrderCode,
vendorId: notice?.vendorId,
+ vendorName: notice?.vendorName,
});
},
status: MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
},
},
{
+ fieldName: 'vendorName',
+ component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
+ },
+ },
+ {
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(ErpSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ onChange: async (supplier?: any) => {
+ await formApi?.setFieldValue('vendorName', supplier?.name);
+ },
},
rules: 'selectRequired',
+ dependencies: {
+ triggerFields: ['vendorName'],
+ componentProps: (values) => ({
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ supplierName: values.vendorName as string,
+ }),
+ },
},
{
fieldName: 'purchaseOrderCode',
@@ -174,7 +193,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(ErpSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
--
Gitblit v1.9.3