2 Commits 65fc82bc76 ... bf2ca52165

Author SHA1 Message Date
  曹鹤洋 bf2ca52165 t :`Merge branch 'master' of https://git.7in6.com/wuwenqiang/dm-v3.7in6.com 1 year ago
  曹鹤洋 8f1fb315b5 优化分页 1 year ago

+ 4 - 4
application/admin/controller/QcodeBach.php

@@ -134,8 +134,8 @@ class QcodeBach extends Backend
             }
             $req['sort'] == 'id' ? $sort = '_id' : $sort = $req['sort'];
             $order = $req['order'];
-            $offset = $req['offset'];
-            $limit = $req['limit'];
+//            $offset = $req['offset'];
+//            $limit = $req['limit'];
 
             // 构造模糊查询条件
 //            $regex = new MongoDB\BSON\Regex('.*abc.*', 'i');
@@ -150,8 +150,8 @@ class QcodeBach extends Backend
             $total = $db->name($company_id.'_'."qcode_large")->where($where)->count();
             $list = $db->name($company_id.'_'."qcode_large")->where($where)
                 ->order($sort,$order)
-                ->limit($limit)
-                ->skip($offset)
+//                ->limit($limit)
+//                ->skip($offset)
                 ->select();
             $qcodeSmall = new QcodeSmall();
             foreach ($list as $k=>$v) {

+ 2 - 3
public/assets/js/backend/qcode_bach.js

@@ -558,14 +558,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'LodopFuncs'], functi
                     toolbar: '#toolbar2',
                     pk: 'id',
                     sortName: 'id',
-                    pageSize: 'All',
-                    pageList: [],
+                    pagination: false,
                     search: false,
                     showExport: false,
                     columns: [
                         [
                             {checkbox: true},
-                            {field: 'l_flow', title: __('当前托盘'), operate: 'LIKE'},
+                            {field: 'l_flow', title: __('当前托盘'), operate: false},
                             {field: 'code', title: __('Code'), operate: 'LIKE'},
                             {field: 'print_date', title: __('Print_date'), operate: false},
                             {field: 'p_nums', title: __('P_nums'), operate: false},