order add order_sn search

application/index/controller/Order.php

@@ -152,11 +152,14 @@ class Order extends Base
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['order_status'] = $order_status[$vo['order_status']];
+            $selectResult[$key]['enter_time'] = date("m-d H:i",strtotime($vo['enter_time']));
             if($vo['out_time'] == null){
                 $selectResult[$key]['out_time'] = '';
+            }else{
+                $selectResult[$key]['out_time'] = date("m-d H:i",strtotime($vo['out_time']));
             }
         }
-        $return['total'] = $OrderModel->getAllCounts();  //总数量
+        $return['total'] = $OrderModel->getAllCounts($where);  //总数量
         $return['rows'] = $selectResult;
         json_success($return);
     }

application/index/model/OrderModel.php

@@ -97,8 +97,8 @@ class OrderModel extends Model{
     /**
      * 根据搜索条件获取所有的箱子数量
      */
-    public function getAllCounts()
+    public function getAllCounts($where)
     {
-        return $this->count();
+        return $this->where($where)->count();
     }
 }