From 0f5b1a326bb6a3276d0f7b722164a03b9a13a86c Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Fri, 20 Jun 2025 11:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20WEB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Http/Controllers/API/Web/OrderController.php   |  4 +++-
 Laravel/public/tool/register.html                      | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/Web/OrderController.php b/Laravel/app/Http/Controllers/API/Web/OrderController.php
index 3ec4c20..079fb77 100644
--- a/Laravel/app/Http/Controllers/API/Web/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/Web/OrderController.php
@@ -503,11 +503,13 @@ class OrderController extends Controller
 
   public function SearchOrder(Request $request)
   {
+    $type = $request->post('type');
     $order_start = $request->post('order_start');
     $order_end = $request->post('order_end');
-    $list = DB::table('orders');
+    $list = DB::table($type == '1' ? 'orders' : 'orders_yuyue');
     $list = $list->where('created_at', '>=', $order_start);
     $list = $list->where('created_at', '<=', $order_end);
+    $list = $list->where('source', 'web');
     $list = $list->orderBy('id', 'desc')->get();
     return \Yz::return(true, "操作成功", ['list' => $list]);
   }
diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html
index 7a758fc..be670fc 100644
--- a/Laravel/public/tool/register.html
+++ b/Laravel/public/tool/register.html
@@ -137,6 +137,12 @@
       <div>
         <div class="select_flex_wrapper">
           <el-form label-width="80px" inline @submit.prevent="handleSubmit">
+            <el-form-item label="类型">
+              <el-select style="width: 200px;" v-model="orderSearchType" placeholder="请选择">
+                <el-option label="订单" value="1"></el-option>
+                <el-option label="预约" value="2"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="开始时间">
               <el-date-picker v-model="order_start" type="datetime" placeholder="请选择" format="YYYY-MM-DD HH:mm:ss"
                               value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
@@ -162,6 +168,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="price" label="金额"></el-table-column>
+            <el-table-column prop="appdoctor" label="预约医生"></el-table-column>
             <el-table-column prop="" label="状态">
               <template #default="scope">
                 <span v-if="scope.row.status==1" style="color: #409EFF;">待支付</span>
@@ -753,9 +760,11 @@
       const order_start = ref(formatDatetime(new Date(), "YYYY-MM-DD") + ' 00:00:00')
       const order_end = ref(formatDatetime(new Date(), "YYYY-MM-DD") + ' 23:59:59')
       const order_dialog_show = ref(false)
+      const orderSearchType = ref('1')
       const order_list = ref([])
       const orderSearchClick = async () => {
         const response = await axios.post($api("OrderSearch"), {
+          type: orderSearchType.value,
           order_start: order_start.value,
           order_end: order_end.value,
         });
@@ -1203,6 +1212,7 @@
       return {
         order_start,
         order_end,
+        orderSearchType,
         order_dialog_show,
         order_list,
         orderSearchClick,