From 5709db9dc8d689cdbb7a17842998de185b4a6b91 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 13:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/receiptPaymentHistory/index.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 7dd8f18..f0dc1de 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -10,10 +10,10 @@
:prefix-icon="Search"
/>
</el-form-item>
- <el-form-item label="鍚堝悓鍙�">
+ <el-form-item label="瀹㈡埛鍚堝悓鍙�">
<el-input
v-model="searchForm.customerContractNo"
- placeholder="杈撳叆鍚堝悓鍙�"
+ placeholder="杈撳叆瀹㈡埛鍚堝悓鍙�"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -74,30 +74,36 @@
const { proxy } = getCurrentInstance();
const tableColumn = ref([
{
+ label: "閿�鍞悎鍚屽彿",
+ prop: "salesContractNo",
+ width:240
+ },
+ {
+ label: "瀹㈡埛鍚堝悓鍙�",
+ prop: "customerContractNo",
+ width:240
+ },
+ {
label: "鍥炴鏃ユ湡",
prop: "receiptPaymentDate",
+ width:100
},
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
+ width:240
},
{
label: "椤圭洰鍚嶇О",
prop: "projectName",
- },
- {
- label: "鍚堝悓鍙�",
- prop: "customerContractNo",
- },
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
+ width:200
},
{
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
+ width:200,
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
@@ -124,6 +130,7 @@
{
label: "鐧昏鏃ユ湡",
prop: "createTime",
+ width:100
},
]);
const tableData = ref([]);
--
Gitblit v1.9.3