refill _order export update

admin/control/refill_order.php

@@ -13,6 +13,7 @@ class refill_orderControl extends SystemControl
     public function indexOp()
     {
         $fShowStat = $_GET['fShowStat'];
+        $_GET['query_start_time'] = $_GET['query_start_time'] ?? date("Y-m-d H:i:s", strtotime("-1 hours"));
         $this->refill_order($_GET, $fShowStat == 1);
     }
 
@@ -26,7 +27,6 @@ class refill_orderControl extends SystemControl
         $normal_cond = function ($input)
         {
             $cond['inner_status'] = 0;
-            $input['query_start_time'] = $input['query_start_time'] ?? date("Y-m-d H:i:s", strtotime("-1 hours"));
 
             if (!empty($input['order_sn'])) {
                 $cond['refill_order.order_sn'] = $input['order_sn'];
@@ -91,6 +91,10 @@ class refill_orderControl extends SystemControl
             if(in_array($input['is_transfer'], ['0','1'])) {
                 $cond['refill_order.is_transfer'] = $input['is_transfer'];
             }
+            if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40']))
+            {
+                $cond['vr_order.order_state'] = $_GET['order_state'];
+            }
 
             return $cond;
         };
@@ -248,8 +252,6 @@ class refill_orderControl extends SystemControl
         $manager = new task\manager();
 
         $cond = ['normal' => $normal_cond,'time_scope' => $time_scope];
-        $handler = new task\handler();
-        $handler->refill_order_export($cond);
 
         $task = $manager->add_task('refill_order_export',$cond,1,-1,$title);
         if ($task->completed() && $task->success()) {

admin/templates/default/refill.order.index.php

@@ -356,7 +356,7 @@
                 </td>
                 <td>
                     <a href="javascript:void(0);" id="ncexport" class="btns" >
-                        <span><i class="icon-edit"></i>搜索导出</span>
+                        <span><i class="icon-edit"></i>导出Excel</span>
                     </a>
                     <a href="javascript:void(0);" id="ncstat" class="btns">
                         <span>搜索+统计</span>