Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -118,6 +118,8 @@
             aoData.proposerName = $('[name="proposerName"]').val() || '';
             aoData.phoneNumber = $('[name="phoneNumber"]').val() || '';
             aoData.role = $('[name="role"]').val() || '';
+            aoData.code = $('[name="code"]').val() || '';
+            aoData.repayStatus = $('[name="repayStatus"]').val() || '';
         },
     });
 

 <div class="date mb-20">
-    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> -
-    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate">
+    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
+    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})" id="max" class="input-text Wdate">
 </div>
 <div class="row cl mb-20">
     <div class="col-xs-2">
         <span class="select-box">
-            <select class="select table_search" column="17">
+            <select class="select table_search" column="17" name="repayStatus">
                 <option value="" selected>还款状态</option>
                 <?php foreach ($this->session->repayStatus as $k=>$v):?>
                     <option value="<?=$v->id?>"><?=$v->name?></option>

-<div class="date mb-20">
+<div class="date mb-20 row">
     <div class="col-xs-2">
         <span class="select-box">
             <select class="select table_search" column="17" name="code">
                 <option value=""></option>
-                <option value="0" >进件时间</option>
-                <option value="1" >放款时间</option>
-                <option value="2" >计划还款日期</option>
-
+                <option value="0">进件时间</option>
+                <option value="1">放款时间</option>
+                <option value="2">计划还款日期</option>
             </select>
         </span>
     </div>
 
     <input type="text"
-           onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'enterMaxDate\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
-           id="enterMinDate" class="input-text Wdate"> -
+           onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})"
+           id="min" class="input-text Wdate"> -
     <input type="text"
-           onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'enterMinDate\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
-           id="enterMaxDate" class="input-text Wdate">
+           onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})"
+           id="max" class="input-text Wdate">
 </div>
 <div class="row cl mb-20">
     <div class="col-xs-2">

 <div class="date mb-20">
-    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> -
-    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate">
+    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
+    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d')" id="max" class="input-text Wdate">
 </div>
 <div class="row cl mb-20">
     <div class="col-xs-2">

 <div class="date mb-20">
-    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> -
-    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate">
+    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}'})" id="min" class="input-text Wdate"> -
+    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d'})" id="max" class="input-text Wdate">
 </div>
 <div class="row cl mb-20">
     <div class="col-xs-2">

@@ -180,4 +180,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>