Browse Source

优化列表搜索

chenyunyun 2 years ago
parent
commit
d6173901d7

+ 3 - 1
application/admin/controller/Cannelorder.php

@@ -17,6 +17,7 @@ class Cannelorder extends Backend
      * @var \app\admin\model\Cannelorder
      */
     protected $model = null;
+    protected $searchFields = 'order_no';
 
     public function _initialize()
     {
@@ -53,7 +54,7 @@ class Cannelorder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user'])
+                    ->with(['user','buser'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -61,6 +62,7 @@ class Cannelorder extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('user')->visible(['username','nickname']);
+                $row->getRelation('buser')->visible(['username','nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

+ 1 - 0
application/admin/controller/Recoveryorder.php

@@ -16,6 +16,7 @@ class Recoveryorder extends Backend
      * @var \app\admin\model\Recoveryorder
      */
     protected $model = null;
+    protected $searchFields = 'order_no';
 
     public function _initialize()
     {

+ 1 - 0
application/admin/controller/TablewareOrder.php

@@ -17,6 +17,7 @@ class TablewareOrder extends Backend
      * @var \app\admin\model\TablewareOrder
      */
     protected $model = null;
+    protected $searchFields = 'order_no';
 
     public function _initialize()
     {

+ 4 - 2
application/admin/lang/zh-cn/cannelorder.php

@@ -26,6 +26,8 @@ return [
     'Timeout'       => '回收超时',
     'Timeout 0'     => '未超时',
     'Timeout 1'     => '超时已提醒',
-    'User.username' => '用户名',
-    'User.nickname' => '昵称'
+    'User.username' => '商家名称',
+    'User.nickname' => '商家昵称',
+    'BUser.username'=> '配送员',
+
 ];

+ 8 - 7
application/admin/model/Cannelorder.php

@@ -10,11 +10,10 @@ class Cannelorder extends Model
 
     use SoftDelete;
 
-    
 
     // 表名
     protected $name = 'user_cancel_order';
-    
+
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'integer';
 
@@ -29,9 +28,8 @@ class Cannelorder extends Model
         'is_offset_text',
         'timeout_text'
     ];
-    
 
-    
+
     public function getStatusList()
     {
         return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3'), '4' => __('Status 4'), '5' => __('Status 5')];
@@ -72,10 +70,13 @@ class Cannelorder extends Model
     }
 
 
-
-
     public function user()
     {
-        return $this->belongsTo('User', 'c_user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('User', 'c_user_id', 'id', [], 'LEFT')->setEagerlyType(1);
+    }
+
+    public function buser()
+    {
+        return $this->belongsTo('User', 'b_user_id', 'id', [], 'LEFT')->setEagerlyType(1);
     }
 }

+ 63 - 14
public/assets/js/backend/cannelorder.js

@@ -29,23 +29,72 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status},
-                        {field: 'c_user_id', title: __('C_user_id')},
-                        {field: 'b_user_id', title: __('B_user_id')},
+                        {
+                            field: 'status',
+                            title: __('Status'),
+                            searchList: {
+                                "1": __('Status 1'),
+                                "2": __('Status 2'),
+                                "3": __('Status 3'),
+                                "4": __('Status 4'),
+                                "5": __('Status 5')
+                            },
+                            formatter: Table.api.formatter.status
+                        },
+                        {field: 'c_user_id', title: __('C_user_id'), operate: false, visible: false,},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: false, visible: false,},
+                        {field: 'b_user_id', title: __('B_user_id'), operate: false, visible: false,},
+                        {field: 'buser.username', title: __('BUser.username'), operate: 'LIKE'},
+                        {
+                            field: 'timeout',
+                            title: __('Timeout'),
+                            searchList: {"0": __('Timeout 0'), "1": __('Timeout 1')},
+                            formatter: Table.api.formatter.normal
+                        },
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'number', title: __('Number')},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'refund_money', title: __('Refund_money'), operate:'BETWEEN'},
-                        {field: 'offset_money', title: __('Offset_money'), operate:'BETWEEN'},
-                        {field: 'after_money', title: __('After_money'), operate:'BETWEEN'},
-                        {field: 'is_offset', title: __('Is_offset'), searchList: {"0":__('Is_offset 0'),"1":__('Is_offset 1')}, formatter: Table.api.formatter.normal},
+                        {
+                            field: 'image',
+                            title: __('Image'),
+                            operate: false,
+                            events: Table.api.events.image,
+                            formatter: Table.api.formatter.image
+                        },
+                        {field: 'refund_money', title: __('Refund_money'), operate: 'BETWEEN'},
+                        {field: 'offset_money', title: __('Offset_money'), operate: 'BETWEEN'},
+                        {field: 'after_money', title: __('After_money'), operate: 'BETWEEN'},
+                        {
+                            field: 'is_offset',
+                            title: __('Is_offset'),
+                            searchList: {"0": __('Is_offset 0'), "1": __('Is_offset 1')},
+                            formatter: Table.api.formatter.normal
+                        },
                         {field: 'remarks', title: __('Remarks'), operate: 'LIKE'},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'timeout', title: __('Timeout'), searchList: {"0":__('Timeout 0'),"1":__('Timeout 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {
+                            field: 'createtime',
+                            title: __('Createtime'),
+                            operate: 'RANGE',
+                            addclass: 'datetimerange',
+                            autocomplete: false,
+                            formatter: Table.api.formatter.datetime
+                        },
+                        {
+                            field: 'updatetime',
+                            title: __('Updatetime'),
+                            operate: false,
+                            addclass: 'datetimerange',
+                            autocomplete: false,
+                            formatter: Table.api.formatter.datetime,
+                            visible: false,
+                        },
+                        {
+                            field: 'operate',
+                            title: __('Operate'),
+                            table: table,
+                            events: Table.api.events.operate,
+                            formatter: Table.api.formatter.operate
+                        }
                     ]
                 ]
             });