判定标准新增类别字段

application/admin/controller/item/Judge.php

@@ -52,17 +52,16 @@ class Judge extends Backend
         }
         $baseData = $this->request->post('baseData/a');////判断标准详情数据
         $data = $this->request->post('data/a');////判断标准数据
-
         if (empty($baseData)) {
             $this->error(__('Parameter %s can not be empty', ''));
         }
-
         //基础数据
         $params['userid'] = $baseData[0];
         $params['no'] = $baseData[1];
         $params['name'] = $baseData[2];
         $params['create'] = $baseData[3];
         $params['update'] = $baseData[4];
+        $params['class'] = $baseData[5];
         //1.项目名称值不同有重复合并一个=>列：测试,测试,测试1 转换为 测试,测试1
         $params['list_name'] = '';
         foreach ($data as $k => $val){
@@ -148,12 +147,12 @@ class Judge extends Backend
         if (empty($baseData)) {
             $this->error(__('Parameter %s can not be empty', ''));
         }
-
         //基础数据
         $pid = $baseData[0];                //项目id
         $params['no'] = $baseData[1];       //判定标准编号
         $params['name'] = $baseData[2];     //判定标准名称
         $params['update'] = $baseData[3];   //修改时间
+        $params['class'] = $baseData[5];   //判定类别
         //1.项目名称值不同有重复合并一个=>列：测试,测试,测试1 转换为 测试,测试1
         $params['list_name'] = '';          //检测项目集
         foreach ($data as $k => $val){

application/admin/view/item/judge/add.html

@@ -33,6 +33,7 @@
             <input id="c-create" class="form-control datetimepicker" name="row[create]" type="text" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+
     <div class="form-group" style="display:none;">
         <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -46,7 +47,12 @@
             <input id="c-delete" class="form-control" name="row[delete]" type="text">
         </div>
     </div>
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">判定标准类别:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_select('row[class]', ['1'=>'常规类(残留总量:26项-乙醇,杂质总量:14项)', '2'=>'特殊类1(残留总量:26项-乙醇-乙酸乙酯-甲醇,杂质总量:14项-甲醇)', '3'=>'特殊类2(残留总量:26项-乙醇,杂质总量:14项-甲醇)'], null,['class'=>'form-control class'])}
+        </div>
+    </div>
 
     <div id="detail">
         <label class="control-label col-xs-12 col-sm-2">检测项目集:</label>

application/admin/view/item/judge/edit.html

@@ -34,6 +34,7 @@ table.gridtable td { border-width: 1px; padding: 8px; border-style: solid; borde
             <input id="c-create" class="form-control datetimepicker" name="row[create]" type="text" value="{$row.create|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
         <div class="col-xs-12 col-sm-3">
@@ -46,7 +47,12 @@ table.gridtable td { border-width: 1px; padding: 8px; border-style: solid; borde
             <input id="c-delete" class="form-control" name="row[delete]" type="text" value="{$row.delete|htmlentities}">
         </div>
     </div>
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">判定标准类别:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_select('class', ['1'=>'常规类(残留总量:26项-乙醇,杂质总量:14项)', '2'=>'特殊类1(残留总量:26项-乙醇-乙酸乙酯-甲醇,杂质总量:14项-甲醇)', '3'=>'特殊类2(残留总量:26项-乙醇,杂质总量:14项-甲醇)'], $row.class,['class'=>'form-control class'])}
+        </div>
+    </div>
     <div id="detail">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8" style="">

public/assets/js/backend/item/judge.js

@@ -101,7 +101,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var create = $('#c-create').val(); //创建时间
                     var update = $('#c-update').val(); //修改时间
                     // var delete_date = $('#c-delete').val(); //删除时间
-
+                    var cl = $('.class').val();//判定标准类别
                     //基础数据
                     var baseData = [];
                     baseData.push(userid);
@@ -109,6 +109,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(name);
                     baseData.push(create);
                     baseData.push(update);
+                    baseData.push(cl);
 
                     var data = [];
                     var formulaTrList = $("#check_child").find("tr");//行数
@@ -209,6 +210,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var update = $('#c-update').val(); //修改时间
                     // var delete_date = $('#c-delete').val(); //删除时间
                     var pid = $('#pid').val();//id
+                    var cl = $('.class').val();//判定标准类别
                     //基础数据
                     var baseData = [];
                     baseData.push(pid);             //项目id
@@ -216,6 +218,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(name);            //判定标准名称
                     baseData.push(update);          //修改时间
                     baseData.push(userid);          //用户id
+                    baseData.push(cl);
 
                     var data = [];
                     var formulaTrList = $("#check_child").find("tr");//行数