From 410ec378d80800fe26fc822059acd0575c85f635 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 17 八月 2026 11:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/finance/payment/data.ts | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/views/erp/finance/payment/data.ts b/src/views/erp/finance/payment/data.ts
index 85cf9ad..5e15d1e 100644
--- a/src/views/erp/finance/payment/data.ts
+++ b/src/views/erp/finance/payment/data.ts
@@ -163,6 +163,7 @@
labelField: 'name',
valueField: 'id',
},
+ help: '浠樻璐︽埛鏁版嵁鏉ヨ嚜銆愯储鍔＄鐞� 鈫� 缁撶畻璐︽埛銆戣彍鍗曠淮鎶ょ殑寮�鍚姸鎬佽处鎴凤紝鏃犻�夐」鏃惰鍏堝湪缁撶畻璐︽埛椤甸潰鏂板銆�',
},
{
fieldName: 'totalPrice',
@@ -180,6 +181,7 @@
fieldName: 'discountPrice',
label: '浼樻儬閲戦',
component: 'InputNumber',
+ defaultValue: 0,
componentProps: {
class: '!w-full',
disabled: formType === 'detail',
@@ -212,15 +214,13 @@
];
}
-/** 琛ㄥ崟鐨勬槑缁嗚〃鏍煎垪 */
-export function useFormItemColumns(
- disabled: boolean,
-): VxeTableGridOptions['columns'] {
+/** 琛ㄥ崟鐨勬槑缁嗚〃鏍煎垪锛堜粯娆惧熀浜庢潵绁紝鏄庣粏鐢辨潵绁ㄨ嚜鍔ㄧ敓鎴愶紝涓嶅彲鍒犻櫎锛� */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'seq', title: '搴忓彿', minWidth: 50, fixed: 'left' },
{
field: 'bizNo',
- title: '閲囪喘鍗曟嵁缂栧彿',
+ title: '鏉ョエ缂栧彿',
minWidth: 200,
},
{
@@ -247,13 +247,6 @@
title: '澶囨敞',
minWidth: 150,
slots: { default: 'remark' },
- },
- {
- title: '鎿嶄綔',
- width: 50,
- fixed: 'right',
- slots: { default: 'actions' },
- visible: !disabled,
},
];
}
--
Gitblit v1.9.3