test

application/em/controller/Payment.php

@@ -111,15 +111,15 @@ class Payment extends Base
         $dateEnd = strtotime(Request::get('date_end'));
         //区间查询
         if( !empty($dateStart) && !empty($dateEnd) ){
-            $map[] = ['pay.pay_date','between',[$dateStart,$dateEnd]];
+            $map[] = ['pay.create_time','between',[$dateStart,$dateEnd]];
             $this->assign('date_start',Request::get('date_start'));
             $this->assign('date_end',Request::get('date_end'));
         } elseif (!empty($dateStart) && empty($dateEnd)){
-            $map[] = ['pay.pay_date','>',$dateStart];
+            $map[] = ['pay.create_time','>',$dateStart];
             $this->assign('date_start',Request::get('date_start'));
             $this->assign('date_end','');
         } elseif (empty($dateStart) && !empty($dateEnd)){
-            $map[] = ['pay.pay_date','<',$dateEnd];
+            $map[] = ['pay.create_time','<',$dateEnd];
             $this->assign('date_end',Request::get('date_end'));
             $this->assign('date_start','');
         }else{

application/em/controller/Settle.php

@@ -86,15 +86,15 @@ class Settle extends Base
         $dateEnd = strtotime(Request::get('date_end'));
         //区间查询
         if( !empty($dateStart) && !empty($dateEnd) ){
-            $map[] = ['settle.settle_date','between',[$dateStart,$dateEnd]];
+            $map[] = ['settle.create_time','between',[$dateStart,$dateEnd]];
             $this->assign('date_start',Request::get('date_start'));
             $this->assign('date_end',Request::get('date_end'));
         } elseif (!empty($dateStart) && empty($dateEnd)){
-            $map[] = ['settle.settle_date','>',$dateStart];
+            $map[] = ['settle.create_time','>',$dateStart];
             $this->assign('date_start',Request::get('date_start'));
             $this->assign('date_end','');
         } elseif (empty($dateStart) && !empty($dateEnd)){
-            $map[] = ['settle.settle_date','<',$dateEnd];
+            $map[] = ['settle.create_time','<',$dateEnd];
             $this->assign('date_end',Request::get('date_end'));
             $this->assign('date_start','');
         }else{

application/em/model/EmSettle.php

@@ -40,8 +40,6 @@ class EmSettle extends Base
         ->page($Nowpage, $limits)
         ->select()
         ->toarray();
-
-    dd($this->getLastSql());
     return $data;
 }
     public function getSettleCount($map){

application/em/view/useage/detail.html

@@ -175,7 +175,7 @@
                                     </label>
                                     <div class="layui-input-inline">
                                         {if $useage.photo.src== ''}
-                                            <div style="height: 30px;line-height: 30px">未上传凭证</div>
+                                            <div style="line-height: 20px;padding: 9px 15px;">未上传凭证</div>
                                         {else /}
                                         <a href="{$useage.photo.src}" target="_blank" class="layui-btn" disabled="disabled">
                                             <i class="layui-icon">&#xe64a;</i>预览

application/em/view/useage/detail_special.html

@@ -172,9 +172,13 @@
                                         <span class="x-red">*</span>抄表凭证
                                     </label>
                                     <div class="layui-input-inline">
+                                        {if $useage.photo.src== ''}
+                                        <div style="line-height: 20px;padding: 9px 15px;">未上传凭证</div>
+                                        {else /}
                                         <a href="{$useage.photo.src}" target="_blank" class="layui-btn" disabled="disabled">
                                             <i class="layui-icon">&#xe64a;</i>预览
                                         </a>
+                                        {/if}
                                     </div>
                                 </div>
                             </div>