From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/returnvendor/data.ts | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/views/wls/returnvendor/data.ts b/src/views/wls/returnvendor/data.ts
index 6844970..5d2b324 100644
--- a/src/views/wls/returnvendor/data.ts
+++ b/src/views/wls/returnvendor/data.ts
@@ -7,13 +7,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 { generateAutoCode } from '#/api/mes/md/autocode/record';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ErpPurchaseOrderSelect } from '#/views/erp/purchase/order/components';
import { WmBatchSelect } from '#/views/wls/batch/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
import {
@@ -87,11 +88,26 @@
rules: 'required',
},
{
- fieldName: 'purchaseOrderCode',
- label: '閲囪喘璁㈠崟鍙�',
+ fieldName: 'vendorName',
+ label: '',
component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
+ },
+ },
+ {
+ fieldName: 'purchaseOrderId',
+ label: '閲囪喘璁㈠崟',
+ component: markRaw(ErpPurchaseOrderSelect),
componentProps: {
- placeholder: '璇疯緭鍏ラ噰璐鍗曞彿',
+ placeholder: '璇烽�夋嫨閲囪喘璁㈠崟',
+ onChange: (item: any) => {
+ if (item?.supplierId && formApi) {
+ formApi.setFieldValue('vendorId', item.supplierId);
+ formApi.setFieldValue('vendorName', item.supplierName);
+ }
+ },
},
},
{
@@ -100,6 +116,15 @@
component: markRaw(MdVendorSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ disabled: true,
+ },
+ dependencies: {
+ triggerFields: ['vendorName'],
+ componentProps: (values) => ({
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ disabled: true,
+ vendorName: values.vendorName as string,
+ }),
},
rules: 'selectRequired',
},
--
Gitblit v1.9.3