Browse Source

优化

dev
nizongfeng 3 years ago
parent
commit
e0be72bb60
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      application/admin/service/OrderMainService.php
  2. +1
    -1
      application/admin/view/payment_order/index.html

+ 2
- 2
application/admin/service/OrderMainService.php View File

@@ -391,10 +391,10 @@ class OrderMainService
}
//子订单查询条件 离店时间
if (!empty($param['startOutDate'])) {
$where[] = " c.check_out_date >= '{$param['startOutDate']} 00:00:00' ";
$where[] = " b.check_out_date >= '{$param['startOutDate']} 00:00:00' ";
}
if (!empty($param['endOutDate']) ) {
$where[] = " c.check_out_date <= '{$param['endOutDate']} 23:59:59' ";
$where[] = " b.check_out_date <= '{$param['endOutDate']} 23:59:59' ";
}




+ 1
- 1
application/admin/view/payment_order/index.html View File

@@ -20,7 +20,7 @@
:value="item.id">
</el-option>
</el-select>
<span>成本</span>
<span>金额</span>
<el-input-number v-model="search.startCost" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
~
<el-input-number v-model="search.endCost" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>


Loading…
Cancel
Save