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/receiptPayment/index.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 0ed5d22..80cb7f8 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -4,22 +4,6 @@
<el-form :inline="true" :model="searchForm" style="width: 100%">
<el-row justify="space-between">
<el-col :span="24">
- <el-form-item label="鍥炴鐧昏">
- <el-input
- v-model="searchForm.searchText"
- placeholder="杈撳叆瀹㈡埛鍚嶇О/鍚堝悓鍙锋悳绱�"
- clearable
- prefix-icon="Search"
- @change="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-checkbox
- v-model="searchForm.status"
- label="涓嶆樉绀哄緟鍥炴涓�0"
- @change="handleQuery"
- />
- </el-form-item>
<el-form-item label="瀹㈡埛鍚嶇О">
<el-input
v-model="searchForm.customerName"
@@ -45,6 +29,13 @@
@change="handleQuery"
clearable
prefix-icon="Search"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-checkbox
+ v-model="searchForm.status"
+ label="涓嶆樉绀哄緟鍥炴涓�0"
+ @change="handleQuery"
/>
</el-form-item>
<el-form-item>
@@ -164,6 +155,7 @@
label="瀹㈡埛鍚嶇О"
prop="customerName"
show-overflow-tooltip
+ width="240"
/>
<el-table-column
label="椤圭洰鍚嶇О"
@@ -186,7 +178,7 @@
show-overflow-tooltip
:formatter="formattedNumber"
/>
- <el-table-column label="绋庣巼" prop="taxRate" show-overflow-tooltip />
+ <el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
<el-table-column
label="鍥炴閲戦(鍏�)"
prop="receiptPaymentAmountTotal"
@@ -582,7 +574,12 @@
type: "warning",
})
.then(() => {
- proxy.download("/receiptPayment/export", {}, "鍥炴鐧昏妗ｆ.xlsx");
+ const ids = selectedRows.value.map((item) => item.id);
+ proxy.download(
+ `/receiptPayment/export`,
+ { ids: `${ids}` },
+ "鍥炴鐧昏妗ｆ.xlsx"
+ );
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3