liuhairui 2 жил өмнө
parent
commit
f0e27f628f

+ 14 - 9
application/admin/controller/item/Judge.php

@@ -22,6 +22,7 @@ class Judge extends Backend
      * @var \app\admin\model\item\Judge
      */
     protected $model = null;
+    protected $searchFields = 'id,no,name,list_name';
 
     public function _initialize()
     {
@@ -51,14 +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['list_name'] = '';
+//        $params['list_name'] = '';
         foreach ($data as $key => $val){
-            $params['list_name'] .= $val['0'].',';
+//            $params['list_name'] .= $val['0'].',';
+            $params['list_name'] = $val['0'];
         }
-        $params['list_name'] = rtrim($params['list_name'],",");
+//        $params['list_name'] = rtrim($params['list_name'],",");
 
         //基础数据
         $params['userid'] = $baseData[0];
@@ -66,6 +69,7 @@ class Judge extends Backend
         $params['name'] = $baseData[2];
         $params['create'] = $baseData[3];
         $params['update'] = $baseData[4];
+
         $result = true;
         Db::startTrans();
         try {
@@ -77,9 +81,9 @@ class Judge extends Backend
                 $insertData = [];
                 foreach ($data as $key => $value){
                     $insertData[$key]['pid'] = $pid;
-                    $insertData[$key]['no'] = $baseData[0];
-                    $insertData[$key]['name'] = $baseData[1];
-                    $insertData[$key]['userid'] = $baseData[2];
+                    $insertData[$key]['userid'] = $baseData[0];
+                    $insertData[$key]['no'] = $baseData[1];
+                    $insertData[$key]['name'] = $baseData[2];
                     $insertData[$key]['pro_name'] = $value[0];
                     $insertData[$key]['params'] = $value[1];
                     $insertData[$key]['standard'] = $value[2];
@@ -145,11 +149,12 @@ class Judge extends Backend
         $params['no'] = $baseData[1];       //判定标准编号
         $params['name'] = $baseData[2];     //判定标准名称
         $params['update'] = $baseData[3];   //修改时间
-        $params['list_name'] = '';          //检测项目集
+//        $params['list_name'] = '';          //检测项目集
         foreach ($data as $ke => $val){
-            $params['list_name'] .= $val['0'].',';
+//            $params['list_name'] .= $val['0'].',';
+            $params['list_name'] = $val['0'];
         }
-        $params['list_name'] = rtrim($params['list_name'],",");
+//        $params['list_name'] = rtrim($params['list_name'],",");
 
         $validate =  $this->validate($params,'admin/item/judge.edit');
         if (true !== $validate){

+ 3 - 3
application/admin/view/item/judge/add.html

@@ -68,10 +68,10 @@
             <tr>
                 <td><input class="form-control pro_name" name="row[remark]" type="text"></td>
                 <td><input class="form-control params" name="row[remark]" type="text"></td>
-                <td><input class="form-control standard" name="row[remark]" type="text"></td>
-                <td><input class="form-control max_character" name="row[remark]" type="text" value=">"></td>
+                <td><input class="form-control standard" name="row[remark]" type="text" value="数值型"></td>
+                <td><input class="form-control max_character" name="row[remark]" type="text" value="<"></td>
                 <td><input class="form-control max" name="row[remark]" type="text"></td>
-                <td><input class="form-control min_character" name="row[remark]" type="text" value="<"></td>
+                <td><input class="form-control min_character" name="row[remark]" type="text" value=">"></td>
                 <td><input class="form-control min" name="row[remark]" type="text"></td>
                 <td style="text-align: center">
                     <button type="button" class="btn btn-success add">添加</button>&nbsp;&nbsp;

+ 10 - 8
public/assets/js/backend/item/judge.js

@@ -30,8 +30,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'list_name', title: __('List_name'), operate: 'LIKE'},
                         // {field: 'userid', title: __('Userid')},
-                        {field: 'create', title: __('Create'), operate: 'LIKE'},
-                        {field: 'update', title: __('Update'), operate: 'LIKE'},
+                        {field: 'create', title: __('Create'), operate: 'LIKE',addclass:'datetimerange', autocomplete:false},
+                        {field: 'update', title: __('Update'), operate: 'LIKE',addclass:'datetimerange', autocomplete:false},
                         // {field: 'delete', title: __('Delete'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
@@ -52,10 +52,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 var html = '';
                 html += '<tr><td><input class="form-control pro_name" name="row[pro_name]" type="text"></td>';
                 html += '<td><input class="form-control params" name="row[params]" type="text"></td>';
-                html += '<td><input class="form-control standard" name="row[standard]" type="text"></td>';
-                html += '<td><input class="form-control max_character" name="row[max_character]" type="text" value=">"></td>';
+                html += '<td><input class="form-control standard" name="row[standard]" type="text" value="数值型"></td>';
+                html += '<td><input class="form-control max_character" name="row[max_character]" type="text" value="<"></td>';
                 html += '<td><input class="form-control max" name="row[max]" type="text"></td>';
-                html += '<td><input class="form-control min_character" name="row[min_character]" type="text" value="<"></td>';
+                html += '<td><input class="form-control min_character" name="row[min_character]" type="text" value=">"></td>';
                 html += '<td><input class="form-control min" name="row[min]" type="text"></td>';
                 html += '<td style="text-align: center"> <button type="button" class="btn btn-success add">添加</button>&nbsp;&nbsp; <button type="button" class="btn btn-danger del">删除</button></td>';
                 html += '</tr>';
@@ -138,11 +138,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         data:{baseData:baseData,data:data}
                     },function (data,ret) {
                         //成功回调
+
                         parent.Toastr.success("添加成功");
                         Fast.api.close();
                         parent.Fast.api.refreshmenu();
                         return false;
                     },function (data,ret) {
+
                         parent.Toastr.error("添加失败");
                         Fast.api.close();
                         return false;
@@ -157,10 +159,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 var html = '';
                 html += '<tr><td><input class="form-control pro_name" name="row[][pro_name]" type="text"></td>';
                 html += '<td><input class="form-control params" name="row[][params]" type="text"></td>';
-                html += '<td><input class="form-control standard" name="row[][standard]" type="text"></td>';
-                html += '<td><input class="form-control max_character" name="row[][max_character]" type="text" value=">"></td>';
+                html += '<td><input class="form-control standard" name="row[][standard]" type="text" value="数值型"></td>';
+                html += '<td><input class="form-control max_character" name="row[][max_character]" type="text" value="<"></td>';
                 html += '<td><input class="form-control max" name="row[][max]" type="text"></td>';
-                html += '<td><input class="form-control min_character" name="row[][min_character]" type="text" value="<"></td>';
+                html += '<td><input class="form-control min_character" name="row[][min_character]" type="text" value=">"></td>';
                 html += '<td><input class="form-control min" name="row[][min]" type="text"></td>';
                 html += '<td style="text-align: center"><input type="hidden" value=""> <button type="button" class="btn btn-success add">添加</button>&nbsp;&nbsp; <button type="button" class="btn btn-danger del">删除</button></td>';
                 html += '</tr>';