优化所属公司搜索

application/admin/controller/Entrust.php

@@ -83,6 +83,19 @@ class Entrust extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+    /**
+     * 所属公司搜索
+     */
+    public function company()
+    {
+        $company = Db::name('company')->select();
+        $data = [];
+        for ($i=0;$i<count($company);$i++){
+            $data[$i]['id'] = $company[$i]['name'];
+            $data[$i]['name'] = $company[$i]['name'];
+        }
+        return json(['list'=>$data,'total'=>count($data)]);
+    }
     /**
      * 搜索栏检测项目下拉列表
      */

application/admin/controller/Res.php

@@ -86,6 +86,20 @@ class Res extends Backend
         return json($result);
     }
 
+    /**
+     * 所属公司搜索
+     */
+    public function company()
+    {
+        $company = Db::name('company')->select();
+        $data = [];
+        for ($i=0;$i<count($company);$i++){
+            $data[$i]['id'] = $company[$i]['name'];
+            $data[$i]['name'] = $company[$i]['name'];
+        }
+        return json(['list'=>$data,'total'=>count($data)]);
+    }
+
     //检测数据编辑
     public function edit($ids = null)
     {

public/assets/js/backend/entrust.js

@@ -61,6 +61,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'sample_status', title: __('Sample_status'), operate:false, formatter: Table.api.formatter.status},
                         {field: 'create', title: __('Create'), operate:false, addclass:'datetimerange', autocomplete:false},
                         {field: 'remark', title: __('Remark'), operate:false},
+                        // {field: 'work_name',title: '所属公司',operate: 'IN',addclass: 'selectpage',data:'data-multiple="true"'+'data-source=[{"id":"浙江美浓","name":"浙江美浓"},{"id":"涂料","name":"涂料"},{"id":"亚欣","name":"亚欣"}]'},
+                        {field: 'work_name',title: '所属公司',operate: 'IN',addclass: 'selectpage',data:'data-multiple="true"'+'data-source="Entrust/company"'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
                             buttons: [
                                 // {

public/assets/js/backend/res.js

@@ -61,7 +61,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'userid', title: __('Userid')},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         // {field: 'delete_time', title: __('Delete_time'), operate: 'LIKE'},
-                        {field: 'work_name',title: '所属公司',operate: 'IN',addclass: 'selectpage',data:'data-multiple="true"'+'data-source=[{"id":"浙江美浓","name":"浙江美浓"},{"id":"涂料","name":"涂料"},{"id":"亚欣","name":"亚欣"}]'},
+                        // {field: 'work_name',title: '所属公司',operate: 'IN',addclass: 'selectpage',data:'data-multiple="true"'+'data-source=[{"id":"浙江美浓","name":"浙江美浓"},{"id":"涂料","name":"涂料"},{"id":"亚欣","name":"亚欣"}]'},
+                        {field: 'work_name',title: '所属公司',operate: 'IN',addclass: 'selectpage',data:'data-multiple="true"'+'data-source="res/company"'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
                             buttons: [
                                 {