wesmiler

public/themes/admin_simpleboot3/admin/order/prints.html

@@ -33,7 +33,7 @@
                style="width: 140px;" autocomplete="off" placeholder="结束时间">
         关键字：
         <input class="form-control" type="text" name="keyword" style="width: 200px;" value="{:input('request.keyword')}"
-               placeholder="下单人名称/订单号">
+               placeholder="下单人名称/订单号/设备号">
         <input type="submit" class="btn btn-primary" value="搜索"/>
         <a class="btn btn-default" href="{:url('order/prints')}">清空</a>
         <a class="btn btn-warning" href="{:url('order/printExport')}">导出</a>
@@ -75,7 +75,7 @@
                     <td>{$vo['order_sn']?$vo['order_sn']:''}</td>
                     <td>{$vo['real_name']?$vo['real_name']:''}</td>
                     <td>
-                        {$vo['device_name']?$vo['device_name']:''}
+                        {$vo['device_name']?$vo['device_name']:''}（{$vo.device_code}）
                     </td>
                     <td>{$vo['price']?$vo['price']:0.00}</td>
                     <td>{$vo['nums']?$vo['nums']:0}</td>

vendor/thinkcmf/cmf-app/src/admin/controller/OrderController.php

@@ -98,12 +98,12 @@ class OrderController extends AdminBaseController
         $list = Db::name('orders')->alias('o')
             ->join('user u', 'u.id=o.user_id', 'left')
             ->join('devices d', 'd.id=o.device_id', 'left')
-            ->field('o.id,o.order_sn,o.shop_uid,o.user_id,o.print_type,o.type,o.device_id,d.name as device_name,o.price,o.nums,o.pages,o.total,o.pay_type,o.created_at,o.remark,o.pay_at,o.status,o.cluster_status,u.user_login,u.real_name,u.user_nickname')
+            ->field('o.id,o.order_sn,o.shop_uid,o.user_id,o.print_type,o.type,o.device_id,d.name as device_name,o.price,o.nums,o.pages,o.total,o.pay_type,o.created_at,o.remark,o.pay_at,o.device_code,o.status,o.cluster_status,u.user_login,u.real_name,u.user_nickname')
             ->where('o.status', 'in', $status)
             ->where(function (Query $query) use ($data) {
                 if (!empty($data['keyword'])) {
                     $keyword = trim($data['keyword']);
-                    $query->where('o.order_sn|u.real_name', 'like', "%$keyword%");
+                    $query->where('o.order_sn|u.real_name|o.device_code', 'like', "%$keyword%");
                 }
 
                 $startTime = isset($data['start_time'])? $data['start_time'] : '';