检测结果管理及委托管理优化

application/admin/controller/Entrust.php

@@ -18,7 +18,7 @@ class Entrust extends Backend
      * @var \app\admin\model\Entrust
      */
     protected $model = null;
-
+    protected $searchFields = 'no,name,bach,sell_bach,company';
     public function _initialize()
     {
         parent::_initialize();
@@ -106,13 +106,19 @@ class Entrust extends Backend
          * 生成检测结果
         */
         $entrust = Db::name('entrust')->where('id',$id)->find();
-        $gather = Db::name('gather_txt')->where('bach',$entrust['bach'])->find();
+        /***
+         * 无法确认是哪台机器（GC、GCMS）检测
+         * 1、先去找gc表     没有查到数据    再找gcms表
+        */
+        $gather = Db::name('gather_txt_gcms')->where('bach',$entrust['bach'])->find();
         if (empty($gather)){
             $this->error('未获取到检测数据');
         }
-        $is_qualified = 1;//默认合格，当有一项不合格时，判定此次检测不合格
-        $detail_data = Db::name('gather_txt_check')->where('pid',$gather['id'])->select();
+        $detail_data = Db::name('gather_txt_check_gcms')->where('pid',$gather['id'])->field('chemical_compound,potency')->select();
+
+        $gather_tab = 'gather_txt_gcms';//默认gcms表，后续根据实际查到的数据  更改
 
+        $is_qualified = 1;//默认合格，当有一项不合格时，判定此次检测不合格
         $dis= 0;//溶剂残留总量
         $dis_impurity_data = [];//溶剂杂质总量
         $ben_total_data = [];//苯系物总量
@@ -142,8 +148,8 @@ class Entrust extends Backend
         $dis_impurity = array_sum($dis_impurity_data);  //杂质总量
         $ben_total = array_sum($ben_total_data);    //苯系物重量
         foreach ($judge as $k=>$v){
-            $v['min'] = $v['min'] * 10000;
-            $v['max'] = $v['max'] * 10000;
+//            $v['min'] = $v['min'] * 10000;
+//            $v['max'] = $v['max'] * 10000;
             if ($v['params'] == '溶剂残留总量'){
                 if ( $dis < $v['max']){
                     $is_qualified = 1;
@@ -196,7 +202,7 @@ class Entrust extends Backend
         $entrust_update['standard_name'] =$judge[0]['name'];
         $entrust_update['status'] =2;
         $entrust_update['gather_id'] =$gather['id'];
-        $entrust_update['gather_tab'] ='gather_txt';
+        $entrust_update['gather_tab'] = $gather_tab;
         //日志记录
         $log = [];
         $log['userid'] = Session::get('admin')['id'];
@@ -264,13 +270,23 @@ class Entrust extends Backend
         }
         $gather_id = Db::name('entrust')->where('id',$params)->find();
         if (empty($gather_id['gather_id'])){
-            $this->error('此委托单还未提交检测,暂无检测数据');
+            $this->error('此委托单还未提交检测,暂无检测数据','entrust/index');
         }
-        $gather = Db::name('gather_txt')->where('id',$gather_id['gather_id'])->find();
-        $data = Db::name('gather_txt_check')->where('pid',$gather_id['gather_id'])->select();
-        $this->view->assign('gather', $gather);
-        $this->view->assign('data', $data);
-        return $this->view->fetch();
+        //此处根据实际获取到的采集表的数据 gather_tab  去对应表里查数据  重新写一个gc表格页面  js加代码
+        if ($gather_id['gather_tab'] == 'gather_txt_gcms'){
+            $gather = Db::name('gather_txt_gcms')->where('id',$gather_id['gather_id'])->find();
+            $data = Db::name('gather_txt_check_gcms')->where('pid',$gather_id['gather_id'])->select();
+            $this->view->assign('gather', $gather);
+            $this->view->assign('data', $data);
+            return $this->view->fetch();
+        }else{
+            $gather = Db::name('gather_txt')->where('id',$gather_id['gather_id'])->find();
+            $data = Db::name('gather_txt_check')->where('pid',$gather_id['gather_id'])->select();
+            $this->view->assign('gather', $gather);
+            $this->view->assign('data', $data);
+            return $this->view->fetch('data_gc.html');//此处页面没写
+        }
+
     }
     //委托单
     public function commissionSheet(){

application/admin/controller/Res.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 检测结果管理管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Res extends Backend
+{
+
+    /**
+     * Res模型对象
+     * @var \app\admin\model\Res
+     */
+    protected $model = null;
+    protected $searchFields = 'entrust_no,name,bach,standard_name';
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Res;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

application/admin/lang/zh-cn/res.php

@@ -0,0 +1,30 @@
+<?php
+
+return [
+    'Entrust_no'    => '委托编号',
+    'Entrust_id'    => '关联委托单id',
+    'Machine'       => '检测设备',
+    'Name'          => '样品名称',
+    'Bach'          => '生产批次号',
+    'Sample_no'     => '样品编号',
+    'Standard_id'   => '限量标准id',
+    'Standard_name' => '选用限量标准名称',
+    'Dis'           => '溶剂残留总量',
+    'Dis_impurity'  => '溶剂杂质总量',
+    'Ben_total'     => '苯系物总量',
+    'Ben'           => '苯含量',
+    'Unit'          => '单位',
+    'Judge'         => '判定',
+    'Judge 0'       => '不合格',
+    'Judge 1'       => '合格',
+    'Create'        => '检测日期',
+    'Maker'         => '检测提交人员',
+    'Remark'        => '备注',
+    'Params'        => '参数名称目标化合物26条',
+    'Userid'        => '用户id',
+    'Status'        => '审核状态',
+    'Status 0'      => '未审核',
+    'Status 1'      => '审核通过',
+    'Status 2'      => '审核不通过',
+    'Delete_time'   => '删除时间'
+];

application/admin/model/Res.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Res extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'res';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text',
+        'delete_time_text'
+    ];
+    
+
+    
+    public function getStatusList()
+    {
+        return ['0' => __('Status 0'), '1' => __('Status 1'), '2' => __('Status 2')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getDeleteTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['delete_time']) ? $data['delete_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setDeleteTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

application/admin/validate/Res.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Res extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/entrust/commission_sheet.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

application/admin/view/entrust/data.html

@@ -7,7 +7,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-3">样品:</label>
         <div class="col-xs-12 col-sm-7">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$gather['product_name']}    {$gather['bach']} ">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$gather['name']}    {$gather['bach']} ">
         </div>
     </div>
     <div class="form-group">

application/admin/view/res/add.html

@@ -0,0 +1,142 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Entrust_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-entrust_no" data-rule="required" class="form-control" name="row[entrust_no]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Entrust_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-entrust_id" data-rule="required" data-source="entrust/index" class="form-control selectpage" name="row[entrust_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Machine')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-machine" class="form-control" name="row[machine]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bach" class="form-control" name="row[bach]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sample_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sample_no" data-rule="required" class="form-control" name="row[sample_no]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Standard_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-standard_id" data-rule="required" data-source="standard/index" class="form-control selectpage" name="row[standard_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Standard_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-standard_name" data-rule="required" class="form-control" name="row[standard_name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dis')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dis" class="form-control" name="row[dis]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dis_impurity')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dis_impurity" class="form-control" name="row[dis_impurity]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ben_total')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ben_total" class="form-control" name="row[ben_total]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ben')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ben" class="form-control" name="row[ben]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Unit')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-unit" class="form-control" name="row[unit]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Judge')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-judge" data-rule="required" class="form-control" name="row[judge]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" data-rule="required" class="form-control" name="row[create]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Maker')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-maker" data-rule="required" class="form-control" name="row[maker]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Params')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-params" data-rule="required" class="form-control" name="row[params]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Userid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-userid" data-rule="required" class="form-control" name="row[userid]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delete_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-delete_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[delete_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/res/edit.html

@@ -0,0 +1,118 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Entrust_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-entrust_no" data-rule="required" class="form-control" name="row[entrust_no]" type="text" value="{$row.entrust_no|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Machine')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-machine" class="form-control" name="row[machine]" type="text" value="{$row.machine|htmlentities}" >
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$row.bach|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sample_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sample_no" data-rule="required" class="form-control" name="row[sample_no]" type="text" value="{$row.sample_no|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Standard_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-standard_name" data-rule="required" class="form-control" name="row[standard_name]" type="text" value="{$row.standard_name|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dis')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dis" class="form-control" name="row[dis]" type="text" value="{$row.dis|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dis_impurity')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dis_impurity" class="form-control" name="row[dis_impurity]" type="text" value="{$row.dis_impurity|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ben_total')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ben_total" class="form-control" name="row[ben_total]" type="text" value="{$row.ben_total|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ben')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ben" class="form-control" name="row[ben]" type="text" value="{$row.ben|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Unit')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-unit" class="form-control" name="row[unit]" type="text" value="{$row.unit|htmlentities}" >
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Judge')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-judge" data-rule="required" class="form-control" name="row[judge]" type="number" value="{$row.judge|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" data-rule="required" class="form-control" name="row[create]" type="text" value="{$row.create|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Maker')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-maker" data-rule="required" class="form-control" name="row[maker]" type="text" value="{$row.maker|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Params')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-params" data-rule="required" class="form-control" name="row[params]" type="text" value="{$row.params|htmlentities}" readonly>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/res/index.html

@@ -0,0 +1,45 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('res/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('res/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('res/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('res/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('res/edit')}"
+                           data-operate-del="{:$auth->check('res/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

public/assets/js/backend/entrust.js

@@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'),operate:false},
                         {field: 'no', title: __('No'), operate: 'LIKE'},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'bach', title: __('Bach'), operate: 'LIKE'},
@@ -35,11 +35,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'company', title: __('Company')},
                         {field: 'sample_no', title: __('Sample_no'), operate: 'LIKE'},
                         // {field: 'standard_id', title: __('Standard_id')},
-                        {field: 'standard_name', title: __('Standard_name'), operate: 'LIKE'},
-                        {field: 'sample_status', title: __('Sample_status'), operate: 'LIKE', formatter: Table.api.formatter.status},
-                        {field: 'create', title: __('Create'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'standard_name', title: __('Standard_name'), operate:false},
+                        {field: 'sample_status', title: __('Sample_status'), operate:false, formatter: Table.api.formatter.status},
+                        {field: 'create', title: __('Create'), operate:false, addclass:'datetimerange', autocomplete:false},
                         {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: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {field: 'remark', title: __('Remark'), operate:false},
                         // {field: 'report_id', title: __('Report_id')},
                         // {field: 'user_id', title: __('User_id')},
                         // {field: 'user_name', title: __('User_name'), operate: 'LIKE'},

public/assets/js/backend/res.js

@@ -0,0 +1,84 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'res/index' + location.search,
+                    add_url: 'res/add',
+                    edit_url: 'res/edit',
+                    // del_url: 'res/del',
+                    multi_url: 'res/multi',
+                    import_url: 'res/import',
+                    table: 'res',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id'),operate: false},
+                        {field: 'entrust_no', title: __('Entrust_no'), operate: 'LIKE'},
+                        // {field: 'entrust_id', title: __('Entrust_id')},
+                        {field: 'machine', title: __('Machine'), operate: 'LIKE'},
+                        {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'bach', title: __('Bach'), operate: 'LIKE'},
+                        {field: 'sample_no', title: __('Sample_no'), operate: 'LIKE'},
+                        // {field: 'standard_id', title: __('Standard_id')},
+                        {field: 'standard_name', title: __('Standard_name'), operate: 'LIKE'},
+                        {field: 'dis', title: __('Dis'),operate: false},
+                        {field: 'dis_impurity', title: __('Dis_impurity'),operate: false},
+                        {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) {
+                                if (value == 1){
+                                    value = '合格';
+                                    return '<span style="color: #18bc9c">' +value+ '</span>';
+                                }else{
+                                    value = '不合格';
+                                    return '<span style="color: #f75444">' +value+ '</span>';
+                                }
+                            }},
+                        {field: 'create', title: __('Create'),operate: false},
+                        {field: 'maker', title: __('Maker'),operate: false},
+                        {field: 'remark', title: __('Remark'),operate: false},
+                        {field: 'params', title: __('Params'),operate: false},
+                        // {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+            $(".btn-edit").data("area", ["100%","100%"]);
+            table.on('post-body.bs.table', function (e, settings, json, xhr) {
+                $(".btn-editone").data("area", ["100%", "100%"]);
+            });
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});