检测报告

application/admin/controller/Res.php

@@ -84,7 +84,11 @@ class Res extends Backend
         return json($result);
     }
 
-
+    //检测数据编辑
+//    public function edit()
+//    {
+//
+//    }
 
     //检测数据查看
     public function data(){
@@ -92,8 +96,9 @@ class Res extends Backend
         if (empty($params)){
             $this->error('参数错误');
         }
-        $entrust_id = Db::name('res')->where('id',$params)->value('entrust_id');
-        $gather_id = Db::name('entrust')->where('id',$entrust_id)->find();
+        $entrust_id = Db::name('res')->where('id',$params)->find();
+        $gather_id = Db::name('entrust')->where('id',$entrust_id['entrust_id'])->find();
+        $this->view->assign('row',$entrust_id);
         if (empty($gather_id['gather_id'])){
             $this->error('此委托单还未提交检测,暂无检测数据');
         }
@@ -136,8 +141,8 @@ class Res extends Backend
                     'name' => $entrust['name'],
                     'sell_bach' => $entrust['sell_bach'],
                     'bach' => $entrust['bach'],
-                    'massage' => '',
-                    'user_name' => $entrust['user_name'],
+                    'massage' => $entrust['sample_info'],
+                    'user_name' => $entrust['send_sample'],
                     'create' => $res['create'],
                     'resname' => $entrust['sample_no'],
                     'dis' => $res['dis'],
@@ -145,7 +150,7 @@ class Res extends Backend
                     'ben_total' => $res['ben_total'],
                     'ben' => $res['ben'],
                     'judge' => $judge,
-                    'maker' => $res['maker'],
+                    'maker' => $entrust['receive_sample'],
                     'remark' => '',
                     '0' => isset($gather['甲醇']) ? $gather['甲醇'] : '',
                     '1' => isset($gather['乙醇']) ? $gather['乙醇'] : '',

application/admin/view/res/data.html

@@ -1,90 +1,57 @@
 <style type="text/css">
     table.gridtable { font-family: verdana,arial,sans-serif; font-size:11px; color:#333333; border-width: 1px; border-color: #666666; border-collapse: collapse; }
-    table.gridtable th { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #dedede;text-align: center }
-    table.gridtable td { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #ffffff; }
+    table.gridtable th { border-width: 1px; padding: 2px; border-style: solid; border-color: #666666; background-color: #dedede;text-align: center }
+    table.gridtable td { border-width: 1px; padding: 2px; border-style: solid; border-color: #666666; background-color: #ffffff; }
 </style>
 <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-3">样品:</label>
-        <div class="col-xs-12 col-sm-7">
+        <label class="control-label col-xs-12 col-sm-2">样品:</label>
+        <div class="col-xs-12 col-sm-2">
             <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">
-        <label class="control-label col-xs-12 col-sm-3">数据文件:</label>
-        <div class="col-xs-12 col-sm-7">
+        <label class="control-label col-xs-12 col-sm-1">数据文件:</label>
+        <div class="col-xs-12 col-sm-2">
             <input id="c-bach" data-rule="required" class="form-control" name="row[bach]" type="text" value="{$gather['data_txt_name']}">
         </div>
-    </div>
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">采集:</label>
-        <div class="col-xs-12 col-sm-7">
+        <label class="control-label col-xs-12 col-sm-1">采集:</label>
+        <div class="col-xs-12 col-sm-2">
             <input data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$gather['gather_time']}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">数据路径:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input  data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$gather['data_txt_path']}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">ALS 样品瓶:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input  data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$gather['ALS']}">
-        </div>
-        <label class="control-label col-xs-12 col-sm-1">样品乘积因子:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input data-rule="required" class="form-control" name="row[sample_no]" type="text" value="{$gather['sample_product_factor']}">
-        </div>
-    </div>
-    <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-sample_no" data-rule="required" class="form-control" name="row[sample_no]" type="text" value="{$gather['author']}">
-        </div>
-    </div>
-    <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-no" data-rule="required" class="form-control" name="row[no]" type="text" value="{$gather['other']}">
-        </div>
-    </div>
-    <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-sample_status" data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['title']}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">定量时间:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input  data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['quantify_time']}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">定量方法:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input  data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['quantify_method']}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">上一次定量更新:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input  class="form-control" name="row[remark]" type="text" value="{$gather['last_quantify_time']}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">响应方式</label>
-        <div class="col-xs-12 col-sm-7">
-            <input class="form-control" name="row[remark]" type="text" value="{$gather['response']}">
-        </div>
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <table class="col-xs-12 col-sm-8 gridtable">
+            <thead>
+                <tr>
+                    <th class="col-xs-12 col-sm-2">化合物</th>
+                    <th class="col-xs-12 col-sm-2">浓度</th>
+                    <th class="col-xs-12 col-sm-2">单位</th>
+                </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>溶剂残留总值</td>
+                <td>{$row['dis']}</td>
+                <td>{$row['unit']}</td>
+            </tr><tr>
+                <td>溶剂杂质总量</td>
+                <td>{$row['dis_impurity']}</td>
+                <td>{$row['unit']}</td>
+            </tr><tr>
+                <td>苯系物总量</td>
+                <td>{$row['ben_total']}</td>
+                <td>{$row['unit']}</td>
+            </tr><tr>
+                <td>苯含量</td>
+                <td>{$row['ben']}</td>
+                <td>{$row['unit']}</td>
+            </tr>
+            </tbody>
+        </table>
     </div>
-    <input type="hidden" id="id" value="{$id}">
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3"></label>
-        <table class="col-xs-12 col-sm-6 gridtable" id="check_child">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <table class="col-xs-12 col-sm-8 gridtable" id="check_child">
             <thead>
             <tr>
                 <th class="col-xs-12 col-sm-2">化合物</th>
@@ -114,4 +81,55 @@
         </table>
     </div>
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">数据路径:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input  data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$gather['data_txt_path']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">ALS 样品瓶:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input  data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$gather['ALS']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">样品乘积因子:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input data-rule="required" class="form-control" name="row[sample_no]" type="text" value="{$gather['sample_product_factor']}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">操作者:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-sample_no" data-rule="required" class="form-control" name="row[sample_no]" type="text" value="{$gather['author']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">其他:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-no" data-rule="required" class="form-control" name="row[no]" type="text" value="{$gather['other']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">定量方法标题:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-sample_status" data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['title']}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">定量时间:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input  data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['quantify_time']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">定量方法:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input  data-rule="required" class="form-control" name="row[sample_status]" type="text" value="{$gather['quantify_method']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">上一次定量更新:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input  class="form-control" name="row[remark]" type="text" value="{$gather['last_quantify_time']}">
+        </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">
+            <input class="form-control" name="row[remark]" type="text" value="{$gather['response']}">
+        </div>
+    </div>
+    <input type="hidden" id="id" value="{$id}">
+
+
 </form>