From 5372fa6dfe5c16163880de9f899578af35671e78 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 七月 2026 09:24:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/saleQuotation/data.ts | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/views/crm/saleQuotation/data.ts b/src/views/crm/saleQuotation/data.ts
index 09cf646..ab372f0 100644
--- a/src/views/crm/saleQuotation/data.ts
+++ b/src/views/crm/saleQuotation/data.ts
@@ -124,10 +124,11 @@
fieldName: 'quotationTime',
label: '鎶ヤ环鏃ユ湡',
component: 'DatePicker',
+ rules: 'required',
componentProps: {
showTime: false,
format: 'YYYY-MM-DD',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鎶ヤ环鏃ユ湡',
},
},
@@ -138,7 +139,7 @@
componentProps: {
showTime: false,
format: 'YYYY-MM-DD',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鏈夋晥鏈�',
},
},
@@ -165,7 +166,7 @@
},
{
fieldName: 'items',
- label: '鐗╂枡娓呭崟',
+ label: '浜у搧娓呭崟',
component: 'Input',
formItemClass: 'col-span-3',
},
@@ -340,24 +341,19 @@
];
}
-/** 鐗╂枡鏄庣粏琛ㄦ牸鍒� */
+/** 浜у搧鏄庣粏琛ㄦ牸鍒� */
export function useItemColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'seq', title: '搴忓彿', minWidth: 50, fixed: 'left' },
{
field: 'itemId',
- title: '鐗╂枡鍚嶇О',
+ title: '浜у搧鍚嶇О',
minWidth: 200,
slots: { default: 'itemId' },
},
{
field: 'itemSpecification',
title: '瑙勬牸鍨嬪彿',
- minWidth: 120,
- },
- {
- field: 'itemBarCode',
- title: '鏉＄爜',
minWidth: 120,
},
{
--
Gitblit v1.9.3