Compare commits

..

No commits in common. 'c9cec6a276e2e6e4295f41c9751f5ac2187668bf' and '2a647bc36516c8b2922be0acda513f5e4d92aec5' have entirely different histories.

@ -503,13 +503,11 @@ 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($type == '1' ? 'orders' : 'orders_yuyue');
$list = DB::table('orders');
$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]);
}

@ -137,12 +137,6 @@
<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>
@ -168,7 +162,6 @@
</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>
@ -760,11 +753,9 @@
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,
});
@ -1212,7 +1203,6 @@
return {
order_start,
order_end,
orderSearchType,
order_dialog_show,
order_list,
orderSearchClick,

Loading…
Cancel
Save