修改检测数据打印页面

application/admin/controller/Res.php

@@ -159,6 +159,21 @@ class Res extends Backend
         }
         $entrust_id = Db::name('res')->where('id',$params)->find();
         $gather_id = Db::name('entrust')->where('id',$entrust_id['entrust_id'])->find();
+        //检测标准标准值获取
+        $judge = Db::name('item_judge_detail')->where('pid',$entrust_id['standard_id'])->select();
+        $data = [];
+        foreach ($judge as $k=>$v){
+            if ($v['params'] == '溶剂残留总量'){
+                $data['dis'] = $v['max'];
+            }elseif ($v['params'] == '溶剂杂质总量' || $v['params'] == '总量'){
+                $data['dis_impurity'] = $v['max'];
+            }elseif ($v['params'] == '溶剂杂质苯系物' || $v['params'] == '苯系物总量' || $v['params'] == '苯系物'){
+                $data['ben_total'] = $v['max'];
+            }elseif ($v['params'] == '溶剂杂质苯' || $v['params'] == '苯含量' || $v['params'] == '苯'){
+                $data['ben'] = $v['max'];
+            }
+        }
+        $this->view->assign('judge',$data);
         $this->view->assign('row',$entrust_id);
         if (empty($gather_id['gather_id'])){
             $this->error('此委托单还未提交检测,暂无检测数据');

application/admin/view/res/data.html

@@ -174,30 +174,35 @@
         <thead>
         <tr>
             <th  colspan="2"  class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
-            <th class="col-xs-12 col-sm-2" style="width: 10%;text-align: center">化合物</th>
-            <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">浓度</th>
+            <th class="col-xs-12 col-sm-2" style="width: 10%;text-align: center">项目</th>
+            <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">标准值</th>
+            <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">检测值</th>
             <th class="col-xs-12 col-sm-2" style="width: 6%;text-align: center">单位</th>
         </tr>
         </thead>
         <tbody>
         <tr>
             <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
-            <td>溶剂残留总值</td>
+            <td>溶剂残留总量</td>
+            <td>{$judge['dis']}</td>
             <td>{$row['dis']}</td>
             <td>{$row['unit']}</td>
         </tr>
         <tr>
             <td>溶剂杂质总量</td>
+            <td>{$judge['dis_impurity']}</td>
             <td>{$row['dis_impurity']}</td>
             <td>{$row['unit']}</td>
         </tr>
         <tr>
             <td>苯系物总量</td>
+            <td>{$judge['ben_total']}</td>
             <td>{$row['ben_total']}</td>
             <td>{$row['unit']}</td>
         </tr>
         <tr>
             <td>苯含量</td>
+            <td>{$judge['ben']}</td>
             <td>{$row['ben']}</td>
             <td>{$row['unit']}</td>
         </tr>
@@ -208,7 +213,7 @@
             {else if}
             <td style="font-weight: 700; text-align: center">合格</td>
             {/if}
-            <td colspan="3">{$row['remark']}</td>
+            <td colspan="4">{$row['remark']}</td>
         </tr>
         </tbody>
     </table>

application/admin/view/res/datagc.html

@@ -25,32 +25,36 @@
         <table class="col-xs-12 col-sm-8 gridtable" style="text-align: center">
             <thead>
             <tr>
-                <th colspan="2"  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>
-                <th class="col-xs-12 col-sm-2">单位</th>
+                <th  colspan="2"  class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
+                <th class="col-xs-12 col-sm-2" style="width: 10%;text-align: center">项目</th>
+                <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">标准值</th>
+                <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">检测值</th>
+                <th class="col-xs-12 col-sm-2" style="width: 6%;text-align: center">单位</th>
             </tr>
             </thead>
             <tbody>
             <tr>
                 <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
-                <td>溶剂残留总值</td>
+                <td>溶剂残留总量</td>
+                <td>{$judge['dis']}</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
                 <td>溶剂杂质总量</td>
+                <td>{$judge['dis_impurity']}</td>
                 <td>{$row['dis_impurity']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
                 <td>苯系物总量</td>
+                <td>{$judge['ben_total']}</td>
                 <td>{$row['ben_total']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯含量</td>
+                <td>{$judge['ben']}</td>
                 <td>{$row['ben']}</td>
                 <td>{$row['unit']}</td>
             </tr>
@@ -61,7 +65,7 @@
                 {else if}
                 <td style="font-weight: 700; text-align: center">合格</td>
                 {/if}
-                <td colspan="3">{$row['remark']}</td>
+                <td colspan="4">{$row['remark']}</td>
             </tr>
             </tbody>
         </table>