pc

application/admin/controller/Orders.php

@@ -59,9 +59,9 @@ class Orders extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            $filter=json_decode(input('filter'));
             $list = $this->model
-                ->with(['user','logistics','voucher'])
+                ->with(['user','logistics','voucher','admin'])
                     ->where($where)
                 ->where(function (Query $query){
                     if($this->admin('is_seller')){
@@ -75,7 +75,7 @@ class Orders extends Backend
 
             }*/
 
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            $result = array("total" => $list->total(), "rows" => $list->items(),'filter'=>$filter);
 
             return json($result);
         }

application/admin/model/Orders.php

@@ -20,4 +20,7 @@ class Orders extends \app\common\model\Orders
     {
         return $this->belongsTo(OrderVoucher::class,'order_voucher_id','id',[],'left');
     }
+    public function admin(){
+        return $this->belongsTo(Admin::class,'admin_id','id',[],'left')->setEagerlyType(0);
+    }
 }

public/assets/js/backend/orders.js

@@ -41,6 +41,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                       /*  {field: 'amount_install', title: __('Amount_install'), operate:'BETWEEN'},
                         {field: 'num', title: __('Num'),operate: 'between'},
                         {field: 'num_install', title: __('Num_install'),operate: 'between'},*/
+                        {field: 'admin.nickname', title: __('销售人员'), operate:'like'},
+                        {field: 'tax_link', title: __('发票状态'), operate:'=',searchList: {'NULL':'未开票','NOT NULL':'已开票'},formatter(a){
+                            if(a){
+                                return `<span class="label label-success">已开票</span>`
+                            }
+                                return `<span class="label label-default">未开票</span>`
+                            }},
                         {field: 'create_time', title: __('Create_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
                         //{field: 'update_time', title: __('Update_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
                         {field: 'pay_type', title: __('Pay_type'),formatter: Table.api.formatter.label,searchList:payTypes},