优化搜索功能

application/admin/controller/Res.php

@@ -189,6 +189,21 @@ class Res extends Backend
             return $this->error('参数错误');
         }
     }
+
+    /**
+     * 搜索栏检测项目下拉列表
+     */
+    public function companyselect(){
+        $company = Db::name('item_judge')->where('delete',null)->order('weigh asc')->column('name,name');
+        if (empty($company)){
+            return $this->error('没有检测项目数据');
+        }else{
+            return json($company);
+        }
+
+    }
+
+
     //数据报告导出
     public function report(){
         if ($this->request->isGet()){

public/assets/js/backend/res.js

@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id'),operate: false},
-                        {field: 'entrust_no', title: __('Entrust_no'), operate: 'LIKE'},
+                        {field: 'entrust_no', title: __('Entrust_no'), operate: false},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'bach', title: __('Bach'), operate: 'LIKE'},
                         {field: 'dis', title: __('Dis'),operate: false},
@@ -38,7 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'ben_total', title: __('Ben_total'),operate: false},
                         {field: 'ben', title: __('Ben'),operate: false},
                         {field: 'unit', title: __('Unit'),operate: false},
-                        {field: 'judge', title: __('Judge'),operate: false,formatter: function (value,row,index) {
+                        {field: 'judge', title: __('Judge'), operate: 'LIKE',custom: {0 :'red', 1:'green'},searchList: {"0":'不合格',"1":'合格'}, formatter: Table.api.formatter.status, function (value,row,index) {
                                 if (value == 1){
                                     value = '合格';
                                     return '<span style="color: #18bc9c">' +value+ '</span>';
@@ -48,11 +48,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 }
                             }},
                         {field: 'sample_info', title: '样品信息',operate: false},
-                        {field: 'send_sample', title: '送样人',operate: 'LIKE'},
-                        {field: 'machine', title: __('Machine'), operate: 'LIKE'},
+                        {field: 'send_sample', title: '送样人',operate:false},
+                        {field: 'machine', title: __('Machine'), operate: ''},
                         {field: 'sample_no', title: __('Sample_no'), operate: 'LIKE'},
                         // {field: 'standard_id', title: __('Standard_id')},
-                        {field: 'standard_name', title: __('Standard_name'), operate: 'LIKE'},
+                        {field: 'standard_name', title: __('Standard_name'), operate: 'LIKE',searchList: $.getJSON("res/companyselect")},
                         {field: 'create', title: __('Create'),operate: 'RANGE_DATE', addclass: 'datetimerange', formatter: Table.api.formatter.date,datetimeFormat:'YYYY-MM-DD'},
                         {field: 'maker', title: __('Maker'),operate: false},
                         {field: 'remark', title: __('Remark'),operate: false},