From 6f19f99a5c08b932401ac38609fcb156aabc9bd4 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 9 May 2024 14:37:36 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BA=94=E6=94=B6=E8=B4=A6=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E6=8A=8A=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E5=AD=97=E5=80=BC=E8=BD=AC=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=B1=89=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/financial/domain/FinancialReceivables.java  | 8 ++++----
 .../templates/financial/receivables/receivables.html      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialReceivables.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialReceivables.java
index 0f657dcf..5282706e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialReceivables.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialReceivables.java
@@ -28,8 +28,8 @@ public class FinancialReceivables extends BaseEntity
     @Excel(name = "应收单号")
     private String financialReceivablesCode;
 
-    /** 收款结案状态 */
-    @Excel(name = "收款结案状态")
+    /** 收款结案状态 (0 待付款，1 部分付款，2 已结案) */
+    @Excel(name = "收款结案状态",readConverterExp = "0=待付款,1=部分付款,2=已结案")
     private String receivablesClosingStatus;
 
     /** 关联销售订单号 */
@@ -91,8 +91,8 @@ public class FinancialReceivables extends BaseEntity
     @Excel(name = "业务人员")
     private String businessMembers;
 
-    /** 发货状态 */
-    @Excel(name = "发货状态")
+    /** 发货状态(0 待发货,1 部分发货,2 全部发货,3 客户已验收) */
+    @Excel(name = "发货状态",readConverterExp = "0=待发货,1=部分发货,2=全部发货,3=客户已验收")
     private String financialDeliverStatus;
 
     /** 收款日期 */
diff --git a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html
index 41a1ef32..62c3c562 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html
@@ -90,7 +90,7 @@
                     <i class="fa fa-plus"></i> 添加应收账款
                 </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:receivables:export">
-                    <i class="fa fa-download"></i> 导出
+                    <i class="fa fa-download"></i> 导出应收账单
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">