From 6ebcfebf58fe23ea401de1050b15ba85e41763a9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 17 十月 2026 18:36:52 +0800
Subject: [PATCH] feat(wls): 仓储物流单据跨模块关联字段改为手工填写
---
src/views/wls/returnvendor/data.ts | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/src/views/wls/returnvendor/data.ts b/src/views/wls/returnvendor/data.ts
index 5d2b324..2504e58 100644
--- a/src/views/wls/returnvendor/data.ts
+++ b/src/views/wls/returnvendor/data.ts
@@ -13,8 +13,6 @@
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 {
@@ -88,45 +86,23 @@
rules: 'required',
},
{
- fieldName: 'vendorName',
- label: '',
+ fieldName: 'purchaseOrderCode',
+ 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);
- }
- },
+ disabled: isHeaderReadonly(formType),
+ placeholder: '璇疯緭鍏ラ噰璐鍗曞彿',
},
},
{
- fieldName: 'vendorId',
+ fieldName: 'vendorName',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: 'Input',
componentProps: {
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
- disabled: true,
+ disabled: isHeaderReadonly(formType),
+ placeholder: '璇疯緭鍏ヤ緵搴斿晢',
},
- dependencies: {
- triggerFields: ['vendorName'],
- componentProps: (values) => ({
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
- disabled: true,
- vendorName: values.vendorName as string,
- }),
- },
- rules: 'selectRequired',
+ rules: 'required',
},
{
fieldName: 'returnDate',
@@ -134,10 +110,10 @@
component: 'DatePicker',
componentProps: {
class: '!w-full',
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨閫�璐ф棩鏈�',
- showTime: true,
- valueFormat: 'x',
+ showTime: false,
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
},
@@ -211,11 +187,12 @@
},
},
{
- fieldName: 'vendorId',
+ fieldName: 'vendorName',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: 'Input',
componentProps: {
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ allowClear: true,
+ placeholder: '璇疯緭鍏ヤ緵搴斿晢',
},
},
];
@@ -254,7 +231,7 @@
field: 'returnDate',
title: '閫�璐ф棩鏈�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'status',
@@ -439,7 +416,10 @@
}
/** 鎷ｈ揣鏄庣粏鏂板/淇敼鐨勮〃鍗� */
-export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useDetailFormSchema(
+ formApi?: VbenFormApi,
+ onStockChange?: (stock?: MesWmMaterialStockApi.MaterialStock) => void,
+): VbenFormSchema[] {
return [
{
fieldName: 'quantityMax',
@@ -464,10 +444,10 @@
componentProps: {
// 閫夋嫨搴撳瓨璁板綍鍚庯紝鑷姩鍥炲～浠撳簱/搴撳尯/搴撲綅/鎵规/鏁伴噺
onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+ onStockChange?.(stock);
await formApi?.setValues({
areaId: stock?.areaId,
batchCode: stock?.batchCode,
- batchId: stock?.batchId,
locationId: stock?.locationId,
quantity: stock?.quantity,
quantityMax: stock?.quantity,
--
Gitblit v1.9.3