待使用订单搜索

admin/src/views/order/index.vue

@@ -108,7 +108,7 @@
       >
         <el-option key="1" label="30天待使用" value="1" />
         <el-option key="2" label="60天待使用" value="2" />
-        <el-option key="3" label="60天待使用" value="3" />
+        <el-option key="3" label="80天待使用" value="3" />
       </el-select>
 
 

service/app/admin/controller/OrderController.php

@@ -78,7 +78,6 @@ class OrderController extends base
             }
         }
         if ($unUseType = $request->get('un_use_type', 0)) {
-            $query->whereRaw(Orders::AllOssStatusSql[1]);
             switch ($unUseType) {
                 case 1:
                     list($start, $end) = calculateDateRange(30, 60);
@@ -165,6 +164,9 @@ class OrderController extends base
         }else{
             $orders = $query->paginate($request->get('limit',10));
         }
+        if ($unUseType > 0) {
+            Log::info('sql:' . $query->getLastSql());
+        }
 
         foreach($orders as &$order) {
             if(empty($order->personnel)) {

service/app/functions.php

@@ -83,7 +83,7 @@ function calculateDateRange($startDays, $endDays) {
 
     // 返回格式化后的日期
     return [
+        $endDate->format('Y-m-d H:i:s'), // 结束日期
         $startDate->format('Y-m-d'),  // 开始日期
-        $endDate->format('Y-m-d H:i:s')       // 结束日期
     ];
 }

service/public/static/css/chunk-f6348360.5a2e6ac6.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-37ee8c4e]{position:relative;padding-bottom:60px}.el-table[data-v-37ee8c4e],.filter-container[data-v-37ee8c4e]{padding-bottom:5px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-34046ddb]{position:relative;padding-bottom:60px}.el-table[data-v-34046ddb],.filter-container[data-v-34046ddb]{padding-bottom:5px}