From 4d95e323179543c1359cf58e2c31507e9e62d09f Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期一, 23 六月 2025 10:19:52 +0800
Subject: [PATCH] feat: 回款登记回款流水完成表单调整。

---
 src/views/salesManagement/invoiceLedger/index.vue         |    2 
 src/views/salesManagement/receiptPayment/index.vue        |   77 ++++++++++++++++++++++++++++++++------
 src/views/salesManagement/salesLedger/index.vue           |    8 ++--
 src/views/salesManagement/receiptPaymentHistory/index.vue |   30 ++++++++++++++
 4 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 4ee4854..98f28f3 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -77,7 +77,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="invoicePerson"
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 0525c8b..0ed5d22 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -3,11 +3,10 @@
     <div class="search_form">
       <el-form :inline="true" :model="searchForm" style="width: 100%">
         <el-row justify="space-between">
-          <el-col :span="20">
+          <el-col :span="24">
             <el-form-item label="鍥炴鐧昏">
               <el-input
                 v-model="searchForm.searchText"
-                style="width: 240px"
                 placeholder="杈撳叆瀹㈡埛鍚嶇О/鍚堝悓鍙锋悳绱�"
                 clearable
                 prefix-icon="Search"
@@ -21,21 +20,50 @@
                 @change="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="瀹㈡埛鍚嶇О">
+              <el-input
+                v-model="searchForm.customerName"
+                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"
+              />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item style="float: right; margin-right: unset">
-              <el-button type="primary" @click="openForm('add')">
-                鏂板鍥炴
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="table_list">
+      <div class="actions">
+        <div></div>
+        <div>
+          <el-button type="primary" icon="Plus" @click="openForm('add')">
+            鏂板鍥炴
+          </el-button>
+          <el-button icon="Download" @click="handleOut"> 瀵煎嚭 </el-button>
+        </div>
+      </div>
       <el-table
         :data="tableData"
         border
@@ -322,7 +350,7 @@
 
 <script setup>
 import pagination from "@/components/PIMTable/Pagination.vue";
-import { ref } from "vue";
+import { onMounted, ref } from "vue";
 import {
   receiptPaymentSaveOrUpdate,
   bindInvoiceNoRegPage,
@@ -351,7 +379,10 @@
 const data = reactive({
   searchForm: {
     searchText: "",
-    status: false,
+    status: true,
+    customerName: "",
+    customerContractNo: "",
+    projectName: "",
   },
   form: {
     salesContractNo: "",
@@ -543,7 +574,24 @@
   });
 };
 
-getList();
+// 瀵煎嚭
+const handleOut = () => {
+  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+    .then(() => {
+      proxy.download("/receiptPayment/export", {}, "鍥炴鐧昏妗f.xlsx");
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
+};
+
+onMounted(() => {
+  getList();
+});
 </script>
 
 <style scoped lang="scss">
@@ -553,4 +601,9 @@
 ::v-deep(.el-checkbox__label) {
   font-weight: bold;
 }
+.actions {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 0462d1a..9e7ad7d 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"
         />
@@ -61,6 +79,14 @@
   {
     label: "瀹㈡埛鍚嶇О",
     prop: "customerName",
+  },
+  {
+    label: "椤圭洰鍚嶇О",
+    prop: "projectName",
+  },
+  {
+    label: "鍚堝悓鍙�",
+    prop: "customerContractNo",
   },
   {
     label: "椤圭洰鍚嶇О",
@@ -118,6 +144,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);
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 87ff92e..c401650 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -613,10 +613,10 @@
 const dialogFormVisible = ref(false);
 const data = reactive({
   searchForm: {
-    customerName: "",
-    customerContractNo: "",
-    salesContractNo: "",
-    projectName: "",
+    customerName: "", // 瀹㈡埛鍚嶇О
+    customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
+    salesContractNo: "",  // 閿�鍞悎鍚岀紪鍙�
+    projectName: "",  // 椤圭洰鍚嶇О
   },
   form: {
     salesContractNo: "",

--
Gitblit v1.9.3