From a0b04cf81e6994f2340600b596fce59a9a725809 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 7 Jul 2020 15:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E5=8F=B8=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExcelPaymentController.class.php          |  2 +-
 .../Payment/View/ExcelPayment/lists.html      | 28 ++-----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/Application/Payment/Controller/ExcelPaymentController.class.php b/Application/Payment/Controller/ExcelPaymentController.class.php
index 4b54892f1..15173f0b4 100644
--- a/Application/Payment/Controller/ExcelPaymentController.class.php
+++ b/Application/Payment/Controller/ExcelPaymentController.class.php
@@ -65,7 +65,7 @@ class ExcelPaymentController extends BaseController
         }
 
         if(isset($_REQUEST['company_name'])){
-            $map['i.company_name'] = $_REQUEST['company_name'];
+            $map['i.company_name'] = ['LIKE',"%".$_REQUEST['company_name']."%"];
         }
 
         if(isset($_REQUEST['pay_status'])){
diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html
index d1a4e3f32..e15ece7a4 100644
--- a/Application/Payment/View/ExcelPayment/lists.html
+++ b/Application/Payment/View/ExcelPayment/lists.html
@@ -106,13 +106,10 @@
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list" style="margin-bottom: 0">
 
-            <div class="input-list input-list-promote search_label_rehab">
-                <select id="company_name" name="company_name" class="select_gallery" style="width: 220px;">
-                    <option value="">请先选择公司类型</option>
-                </select>
+            <div class="input-list">
+                <input type="text" name="company_name" placeholder="请输入公司名称模糊搜索" value="{:I('company_name')}" style="width: 180px;">
             </div>
 
-
             <div class="input-list">
                 <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="结算开始时间" />
                 &nbsp;-&nbsp;
@@ -261,27 +258,6 @@
         }
 
         $(function(){
-
-            var company_name = "{$_GET['company_name']??0}";
-            companySelect();
-            function companySelect(){
-                var url = "{:U('Ajax/getCompanyList')}"+"&company_type=2";
-                $.get(url,function(data){
-                    var company = data;
-                    var companystr = '<option value="">请选择合作公司</option>';
-                    for (var i in company) {
-                        if(company[i].name == company_name){
-                            companystr += "<option value='" + company[i].name + "' selected='selected'>" + company[i].name + "</option>"
-                        }else{
-                            companystr += "<option value='" + company[i].name + "'>" + company[i].name + "</option>"
-                        }
-                    }
-                    $("#company_name").html(companystr);
-                    $("#company_name").select2();
-                })
-            }
-            
-
             $(".viewPool").click(function () {
                 var id = $(this).data("id");
                 var url = "{:U('viewPool')}"+"&id="+id