From d83860d6839daaf7dccda5cbd68e865ba7e679ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 17:48:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/receiptPaymentHistory/index.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 0462d1a..4bd3fcb 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -4,8 +4,25 @@
<el-form-item label="瀹㈡埛鍚嶇О">
<el-input
v-model="searchForm.searchText"
- style="width: 240px"
placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
+ @change="handleQuery"
+ clearable
+ :prefix-icon="Search"
+ />
+ </el-form-item>
+ <el-form-item label="鍚堝悓鍙�">
+ <el-input
+ v-model="searchForm.customerContractNo"
+ placeholder="杈撳叆鍚堝悓鍙�"
+ @change="handleQuery"
+ clearable
+ :prefix-icon="Search"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰鍚嶇О">
+ <el-input
+ v-model="searchForm.projectName"
+ placeholder="杈撳叆椤圭洰鍚嶇О"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -20,6 +37,7 @@
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
clearable
+ style="width: 300px"
@change="changeDateRange"
@clear="clearRange"
/>
@@ -30,16 +48,17 @@
</el-form>
<div class="table_list">
<PIMTable
+ rowKey="id"
:column="tableColumn"
:tableData="tableData"
:page="page"
:isSelection="true"
:isShowSummary="isShowSummarySon"
:summaryMethod="summarizeMainTable1"
- :handleSelectionChange="handleSelectionChange"
:tableLoading="tableLoading"
- @pagination="pagination"
:total="total"
+ @pagination="pagination"
+ @selection-change="handleSelectionChange"
></PIMTable>
</div>
</div>
@@ -55,6 +74,14 @@
const { proxy } = getCurrentInstance();
const tableColumn = ref([
{
+ label: "閿�鍞悎鍚屽彿",
+ prop: "salesContractNo",
+ },
+ {
+ label: "瀹㈡埛鍚堝悓鍙�",
+ prop: "customerContractNo",
+ },
+ {
label: "鍥炴鏃ユ湡",
prop: "receiptPaymentDate",
},
@@ -67,10 +94,14 @@
prop: "projectName",
},
{
+ label: "椤圭洰鍚嶇О",
+ prop: "projectName",
+ },
+ {
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
@@ -118,6 +149,8 @@
.startOf("month")
.format("YYYY-MM-DD 00:00:00"),
receiptPaymentDateEnd: dayjs().endOf("month").format("YYYY-MM-DD 23:59:59"),
+ customerContractNo: undefined,
+ projectName: undefined,
});
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
const isShowSummarySon = ref(true);
--
Gitblit v1.9.3