From 849607617bd527f438d79df4ef4ddc400b2dd9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 1 Jan 2025 16:09:15 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8B=E6=8B=89=E6=A1=86=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=BA=94?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A6=E6=AC=BE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?mapper=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/FinancialReceivablesMapper.xml  |  1 +
 .../financial/receivables/receivables.html    | 29 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/financial/FinancialReceivablesMapper.xml b/ruoyi-admin/src/main/resources/mapper/financial/FinancialReceivablesMapper.xml
index 51f83db2..51969d22 100644
--- a/ruoyi-admin/src/main/resources/mapper/financial/FinancialReceivablesMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/financial/FinancialReceivablesMapper.xml
@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openBank != null  and openBank != ''"> and open_bank = #{openBank}</if>
             <if test="openAccount != null  and openAccount != ''"> and open_account = #{openAccount}</if>
             <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name = #{customerName}</if>
             <if test="contractNumber != null  and contractNumber != ''"> and contract_number = #{contractNumber}</if>
             <if test="currencyType != null  and currencyType != ''"> and currency_type = #{currencyType}</if>
             <if test="businessMembers != null  and businessMembers != ''"> and business_members = #{businessMembers}</if>
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 c3f39770..2660a9ba 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html
@@ -25,13 +25,13 @@
                             <label>关联单号：</label>
                             <input type="text" name="salesOrderCode"/>
                         </li>
-                        <li>
-                            <label>客户ID：</label>
-                            <input type="text" name="customerId"/>
-                        </li>
+<!--                        <li>-->
+<!--                            <label>客户ID：</label>-->
+<!--                            <input type="text" name="customerId"/>-->
+<!--                        </li>-->
                         <li>
                             <label>客户名称：</label>
-                            <input type="text" name="customerName"/>
+                            <select type="text" name="customerName"></select>
                         </li>
                         <li>
                             <label>借方科目：</label>
@@ -103,6 +103,7 @@
     var currencyTypeDatas = [[${@dict.getType('sys_common_currency')}]];
     var financialDeliverStatusDatas = [[${@dict.getType('financial_deliver_status')}]];
     var prefix = ctx + "financial/receivables";
+    var prefix1 = ctx + "system/customer";
     var selectedChildRows = []; // 用于存储各个子表的选中行
     var activeTableId = null;
     $(function() {
@@ -208,6 +209,7 @@
 
         };
         $.table.init(options);
+        selectCustomerAll();
     });
 
     initChildTable = function(index, row, $detail) {
@@ -435,6 +437,23 @@
             });
         });
     }
+
+    function selectCustomerAll(){
+        $.ajax({
+            url: prefix1 + '/matchCustomerList',
+            type: 'post',
+            async: false,
+            success: function (result) {
+                customerList = result.data;
+                var selectCustomer = $("select[name='customerName']");
+                var selectHtml = '<option value="">所有</option>';
+                customerList.forEach(function (user) {
+                    selectHtml += '<option value="' + user.enterpriseName + '">' + user.enterpriseName + '</option>';
+                });
+                selectCustomer.html(selectHtml);
+            }
+        });
+    }
 </script>
 </body>
 </html>
\ No newline at end of file