@@ -386,6 +386,9 @@ class OrderMainService | |||||
if (!empty($param['supplier_id'])) { | if (!empty($param['supplier_id'])) { | ||||
$where[] = "(b.supplier_id = {$param['supplier_id']} or c.supplier_id = {$param['supplier_id']})"; | $where[] = "(b.supplier_id = {$param['supplier_id']} or c.supplier_id = {$param['supplier_id']})"; | ||||
} | } | ||||
if (!empty($param['customer_name'])) { | |||||
$where[] = "(b.customer_name like '%{$param['customer_name']}%' or c.customer_name like '%{$param['customer_name']}%')"; | |||||
} | |||||
//子订单查询条件 离店时间 | //子订单查询条件 离店时间 | ||||
if (!empty($param['startOutDate'])) { | if (!empty($param['startOutDate'])) { | ||||
$where[] = " c.check_out_date >= '{$param['startOutDate']} 00:00:00' "; | $where[] = " c.check_out_date >= '{$param['startOutDate']} 00:00:00' "; | ||||
@@ -98,6 +98,8 @@ | |||||
<el-input-number v-model="search.endProfit" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number> | <el-input-number v-model="search.endProfit" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number> | ||||
</div> | </div> | ||||
<div class="header-search" style="width: 100%;margin-bottom: 10px"> | <div class="header-search" style="width: 100%;margin-bottom: 10px"> | ||||
<span>出游人:</span> | |||||
<el-input v-model="search.customer_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input> | |||||
<span>供应商</span> | <span>供应商</span> | ||||
<el-select v-model="search.supplier_id" style="width: 150px;" placeholder="请选择" clearable> | <el-select v-model="search.supplier_id" style="width: 150px;" placeholder="请选择" clearable> | ||||
<el-option | <el-option | ||||
@@ -330,6 +332,7 @@ | |||||
"endTime":"", | "endTime":"", | ||||
"pageNum":1, | "pageNum":1, | ||||
"pageSize":10, | "pageSize":10, | ||||
"customer_name":"", | |||||
"startInDate":"", | "startInDate":"", | ||||
"endInDate":"", | "endInDate":"", | ||||
"startOutDate":"", | "startOutDate":"", | ||||