Quellcode durchsuchen

检测项目管理

huangsanjia vor 2 Jahren
Ursprung
Commit
9f5a79b0fc

+ 2 - 3
application/admin/controller/item/Check.php

@@ -18,7 +18,7 @@ class Check extends Backend
      * @var \app\admin\model\item\Check
      */
     protected $model = null;
-
+    protected $searchFields = 'name,check_no,check_name';
     public function _initialize()
     {
         parent::_initialize();
@@ -126,7 +126,7 @@ class Check extends Backend
                 $this->error(__('You have no permission'));
             }
             if ($row['is_child'] == 1){
-                $childData = Db::name('item_check_detail')->where('pid',$row['id'])->where('status',1)->select();
+                $childData = Db::name('item_check_detail')->where('pid',$row['id'])->where('status',1)->order('sort asc')->select();
                 $this->view->assign('childData', $childData);
             }
             $this->view->assign('row', $row);
@@ -218,5 +218,4 @@ class Check extends Backend
         $this->success();
     }
 
-
 }

+ 7 - 7
public/assets/js/backend/item/check.js

@@ -27,17 +27,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: '序号'},
+                        {field: 'id', title: '序号',operate: false},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'check_no', title: __('Check_no'), operate: 'LIKE'},
                         {field: 'check_name', title: __('Check_name'), operate: 'LIKE'},
-                        {field: 'unit', title: __('Unit'), operate: 'LIKE'},
-                        {field: 'check_max', title: __('Check_max'), operate: 'LIKE'},
-                        {field: 'check_min', title: __('Check_min'), operate: 'LIKE'},
+                        {field: 'unit', title: __('Unit'), operate: false},
+                        {field: 'check_max', title: __('Check_max'), operate: false},
+                        {field: 'check_min', title: __('Check_min'), operate: false},
                         {field: 'class', title: __('Class'), operate: 'LIKE'},
                         {field: 'scope', title: __('Scope'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
-                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {field: 'status', title: __('Status'), operate: false,searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
+                        {field: 'remark', title: __('Remark'), operate: false},
                         {field: 'is_child', title: __('Is_child'), searchList: {"0":__('Is_child 0'),"1":__('Is_child 1')}, formatter: Table.api.formatter.normal},
                         // {field: 'create', title: __('Create'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
@@ -70,7 +70,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: '序号'},
                         {field: 'name', title: __('Name'), align: 'left'},
                         {
                             field: 'deletetime',