From 858df78951d5c29e8d4217cffcf81d2cc4fabcd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 03 八月 2026 14:58:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/packages/data.ts | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/views/wls/packages/data.ts b/src/views/wls/packages/data.ts
index 37e3967..ec8952a 100644
--- a/src/views/wls/packages/data.ts
+++ b/src/views/wls/packages/data.ts
@@ -9,12 +9,13 @@
DICT_TYPE,
MesAutoCodeRuleCode,
MesProWorkOrderStatusEnum,
-} from '../../../packages/constants/src';
+} from '@vben/constants';
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getSimpleUserList } from '#/api/system/user';
+import { ErpSaleOrderSelect } from '#/views/erp/sale/order/components';
import { MdClientSelect } from '#/views/mes/md/client/components';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
@@ -78,7 +79,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨瑁呯鏃ユ湡',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -96,11 +97,27 @@
},
{
fieldName: 'salesOrderCode',
- label: '閿�鍞鍗曠紪鍙�',
component: 'Input',
- componentProps: {
- placeholder: '璇疯緭鍏ラ攢鍞鍗曠紪鍙�',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
},
+ },
+ {
+ fieldName: 'saleOrderId',
+ label: '閿�鍞鍗曠紪鍙�',
+ component: markRaw(ErpSaleOrderSelect),
+ componentProps: {
+ placeholder: '璇烽�夋嫨閿�鍞鍗�',
+ onChange: (item: any) => {
+ if (formApi) {
+ formApi.setFieldValue('salesOrderCode', item?.no ?? '');
+ formApi.setFieldValue('clientId', item?.customerId ?? undefined);
+ formApi.setFieldValue('clientName', item?.customerName ?? '');
+ }
+ },
+ },
+ rules: 'selectRequired',
},
{
fieldName: 'invoiceCode',
@@ -112,10 +129,19 @@
},
{
fieldName: 'clientId',
+ component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
+ },
+ },
+ {
+ fieldName: 'clientName',
label: '瀹㈡埛',
- component: markRaw(MdClientSelect),
+ component: 'Input',
componentProps: {
- placeholder: '璇烽�夋嫨瀹㈡埛',
+ placeholder: '閫夋嫨閿�鍞鍗曞悗鑷姩鍙嶆樉',
+ disabled: true,
},
},
{
@@ -455,7 +481,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鏈夋晥鏈�',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
},
{
--
Gitblit v1.9.3