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" and open_bank = #{openBank} and open_account = #{openAccount} and customer_id = #{customerId} + and customer_name = #{customerName} and contract_number = #{contractNumber} and currency_type = #{currencyType} and business_members = #{businessMembers} 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 @@ -
  • - - -
  • + + + +
  • - +
  • @@ -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 = ''; + customerList.forEach(function (user) { + selectHtml += ''; + }); + selectCustomer.html(selectHtml); + } + }); + } \ No newline at end of file