From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:00:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/salesManagement/receiptPayment/index.vue |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 0ed5d22..430823e 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>
@@ -74,6 +65,7 @@
         :summary-method="summarizeMainTable"
         :expand-row-keys="expandedRowKeys"
         @expand-change="expandChange"
+
         height="calc(100vh - 18.5em)"
       >
         <el-table-column align="center" type="selection" width="55" />
@@ -154,49 +146,59 @@
           label="閿�鍞悎鍚屽彿"
           prop="salesContractNo"
           show-overflow-tooltip
+          width="240"
         />
         <el-table-column
           label="瀹㈡埛鍚堝悓鍙�"
           prop="customerContractNo"
           show-overflow-tooltip
+          width="240"
+
         />
         <el-table-column
           label="瀹㈡埛鍚嶇О"
           prop="customerName"
           show-overflow-tooltip
+          width="240"
         />
         <el-table-column
           label="椤圭洰鍚嶇О"
           prop="projectName"
           show-overflow-tooltip
+          width="200"
         />
         <el-table-column
           label="浜у搧澶х被"
           prop="productCategory"
           show-overflow-tooltip
+          width="100"
         />
         <el-table-column
           label="鍙戠エ鍙�"
           prop="invoiceNo"
           show-overflow-tooltip
+          width="200"
         />
         <el-table-column
           label="鍙戠エ閲戦(鍏�)"
           prop="invoiceTotal"
           show-overflow-tooltip
           :formatter="formattedNumber"
+          width="150"
         />
-        <el-table-column label="绋庣巼" prop="taxRate" show-overflow-tooltip />
+        <el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
         <el-table-column
           label="鍥炴閲戦(鍏�)"
           prop="receiptPaymentAmountTotal"
           show-overflow-tooltip
           :formatter="formattedNumber"
+          width="150"
         />
         <el-table-column
           label="寰呭洖娆鹃噾棰�(鍏�)"
           prop="noReceiptAmount"
           show-overflow-tooltip
+          width="150"
         >
           <template #default="{ row, column }">
             <el-text type="danger">
@@ -283,12 +285,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="鏈鍥炴閲戦锛�" prop="receiptPaymentAmount">
-              <el-input
-                type="number"
-                min="0"
+              <el-input-number :step="0.01" :min="0" style="width: 100%" 
                 v-model="form.receiptPaymentAmount"
                 placeholder="璇疯緭鍏�"
-                :step="0.01"
                 clearable
               />
             </el-form-item>
@@ -582,7 +581,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