优化委托单

application/admin/controller/Entrust.php

@@ -105,10 +105,13 @@ class Entrust extends Backend
         if (empty($params)) {
             $this->error(__('Parameter %s can not be empty', ''));
         }
+
         $params['name'] = preg_replace('/\s+/','',$params['name']);//去掉所有空格
         $params['user_id'] = Session::get('admin')['id'];
         $userinfo = Db::name('admin')->where('id',$params['user_id'])->find();
         $params['project'] = implode(',',$params['project']);
+        $params['report_grant'] = implode(',',$params['report_grant']);
+        $params['sample_stand'] = implode(',',$params['sample_stand']);
         $params['user_name'] = $userinfo['username'];
         $params['work_unit'] = $userinfo['company'];
         $params['work_name'] = Db::name('company')->where('id',$userinfo['company'])->value('name');
@@ -177,7 +180,11 @@ class Entrust extends Backend
             $company_id = Db::name('admin')->where('id',$user_id)->value('company');
             $pid = Db::name('company')->where('id',$company_id)->value('pid');
             $company = Db::name('company')->where('pid',$pid)->column('id,name');
+            $report_grant = explode(',',$row['report_grant']);
+            $sample_stand = explode(',',$row['sample_stand']);
             $this->assign('company',$company);
+            $this->assign('report_grant',$report_grant);
+            $this->assign('sample_stand',$sample_stand);
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -186,6 +193,8 @@ class Entrust extends Backend
             $this->error(__('Parameter %s can not be empty', ''));
         }
         $params['project'] = implode(',',$params['project']);
+        $params['report_grant'] = implode(',',$params['report_grant']);
+        $params['sample_stand'] = implode(',',$params['sample_stand']);
         $params = $this->preExcludeFields($params);
         $result = false;
         Db::startTrans();
@@ -304,8 +313,9 @@ class Entrust extends Backend
             $gather = $gather_gcms;
             $gather_tab = 'gather_txt_check_gcms';
         }
-        $detail_data = Db::name($gather_tab)->where('pid',$gather['id'])->field('chemical_compound,potency')->select();
 
+        $detail_data = Db::name($gather_tab)->where('pid',$gather['id'])->field('chemical_compound,potency')->select();
+        
         $is_qualified = [];//默认合格，当有一项不合格时，判定此次检测不合格
         $dis= 0;//溶剂残留总量
         $dis_impurity_data = [];//溶剂杂质总量
@@ -372,7 +382,7 @@ class Entrust extends Backend
         $params['entrust_no'] = $entrust['no'];
         $params['entrust_id'] = $entrust['id'];
         $params['machine'] = 'GCMS';
-        if ($gather_tab = 'gather_txt_check_gc'){
+        if ($gather_tab == 'gather_txt_check_gc'){
             $params['machine'] = 'GC';
         }
         $params['name'] = $entrust['name'];

application/admin/view/entrust/add.html

@@ -17,7 +17,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sell_bach')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sell_bach" data-rule="required" class="form-control" name="row[sell_bach]" type="text">
+            <input id="c-sell_bach" data-rule="" class="form-control" name="row[sell_bach]" 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">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" 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">
+            <input id="c-sample_info" class="form-control" name="row[sample_info]" type="text" >
         </div>
     </div>
     <div class="form-group">
@@ -36,7 +48,7 @@
     <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="">
+            <input id="c-sample_no" data-rule="required" class="form-control" name="row[sample_no]" type="text" value="" readonly>
         </div>
     </div>
     <div class="form-group">
@@ -51,6 +63,24 @@
             {:build_select('row[is_two]', ['0'=>'否', '1'=>'是'], null,['class'=>'form-control'])}
         </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[is_urgent]', ['0'=>'不加急', '1'=>'加急'], null,['class'=>'form-control'])}
+        </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 id="c-send_sample" data-rule="required" class="form-control" name="row[send_sample]" 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[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], null,['class'=>'form-control'])}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sample_status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -89,7 +119,74 @@
     <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 class="col-xs-12 col-sm-8">
+                <div class="check">
+
+                    <label>
+                        <input name="row[remark]" type="radio" value="正式报告" >正式报告
+                        <input name="row[remark]" type="radio" value="简化报告" checked>简化报告
+                        <input name="row[remark]" type="radio" value="检测数据" >检测数据
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label >
+                        <input name="row[sample_request]" type="radio" value="委托方取回" >委托方取回
+                        <input name="row[sample_request]" type="radio" value="本中心处理" checked>本中心处理
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label>
+                        <input name="row[report_grant][]" type="checkbox" value="自取" />自取
+                    </label>
+                    <label>
+                        <input name="row[report_grant][]" type="checkbox" value="邮寄" />邮寄
+                    </label>
+                    <label>
+                        <input name="row[report_grant][]" type="checkbox" value="传真" />传真
+                    </label>
+                    <label>
+                        <input name="row[report_grant][]" type="checkbox" value="邮箱" checked />邮箱
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label >
+                        <input name="row[sample_stand][]" type="checkbox" value="YC/T 207-2014" >YC/T 207-2014
+                    </label>
+                    <label >
+                        <input name="row[sample_stand][]" type="checkbox" value="YQ/T 35-2013" >YQ/T 35-2013
+                    </label>
+                    <label >
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 7974-2013" >GB/T 7974-2013
+                    </label>
+                    <label >
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 18348-2008" >GB/T 18348-2008
+                    </label>
+                    <label >
+                        <input name="row[sample_stand][]" type="checkbox" value="其他" >其他
+                    </label>
+                </div>
+            </div>
         </div>
     </div>
 <!--    <div class="form-group">-->

application/admin/view/entrust/edit.html

@@ -15,13 +15,25 @@
     <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" data-rule="required" class="form-control" name="row[bach]" type="text" value="{$row.bach|htmlentities}">
+            <input id="c-bach" data-rule="" class="form-control" name="row[bach]" type="text" value="{$row.bach|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sell_bach')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sell_bach" data-rule="required" class="form-control" name="row[sell_bach]" type="text" value="{$row.sell_bach|htmlentities}">
+            <input id="c-sell_bach" data-rule="" class="form-control" name="row[sell_bach]" type="text" value="{$row.sell_bach|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">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="text" value="{$row.num|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">
+            <input id="c-sample_info" class="form-control" name="row[sample_info]" type="text" value="{$row.sample_info|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -53,12 +65,46 @@
             {/if}
         </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">
+            {if condition="$row.is_urgent eq 1"}
+            {:build_select('row[is_urgent]', ['0'=>'不加急', '1'=>'加急'], 1,['class'=>'form-control'])}
+            {else/}
+            {:build_select('row[is_urgent]', ['0'=>'不加急', '1'=>'加急'], 0,['class'=>'form-control'])}
+            {/if}
+        </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" 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">送样人:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-send_sample" data-rule="required" class="form-control" name="row[send_sample]" type="text" value="{$row.send_sample|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">
+            {if condition="$row.receive_sample eq '王枫'"}
+                {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], '王枫',['class'=>'form-control'])}
+            {/if}
+            {if condition="$row.receive_sample eq '邹细建'"}
+                {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], '邹细建',['class'=>'form-control'])}
+            {/if}
+            {if condition="$row.receive_sample eq '高小满'"}
+                {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], '高小满',['class'=>'form-control'])}
+            {/if}
+            {if condition="$row.receive_sample eq '顾诚康'"}
+                {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], '顾诚康',['class'=>'form-control'])}
+            {/if}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sample_status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -96,7 +142,141 @@
     <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 class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label>
+                        {if condition="$row.remark eq '正式报告'"}
+                            <input name="row[remark]" type="radio" value="正式报告" checked>正式报告
+                        {else/}
+                            <input name="row[remark]" type="radio" value="正式报告" >正式报告
+                        {/if}
+                    </label>
+                    <label>
+                        {if condition="$row.remark eq '简化报告'"}
+                        <input name="row[remark]" type="radio" value="简化报告" checked>简化报告
+                        {else/}
+                        <input name="row[remark]" type="radio" value="简化报告" >简化报告
+                        {/if}
+                    </label>
+                    <label>
+                        {if condition="$row.remark eq '检测数据'"}
+                        <input name="row[remark]" type="radio" value="检测数据" checked>检测数据
+                        {else/}
+                        <input name="row[remark]" type="radio" value="检测数据" >检测数据
+                        {/if}
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label >
+                        {if condition="$row.sample_request eq '委托方取回'"}
+                        <input name="row[sample_request]" type="radio" value="委托方取回" checked>委托方取回
+                        {else/}
+                        <input name="row[sample_request]" type="radio" value="委托方取回" >委托方取回
+                        {/if}
+                    </label>
+                    <label>
+                        {if condition="$row.sample_request eq '本中心处理'"}
+                        <input name="row[sample_request]" type="radio" value="委托方取回" checked>本中心处理
+                        {else/}
+                        <input name="row[sample_request]" type="radio" value="本中心处理" >本中心处理
+                        {/if}
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label>
+                        {if condition="in_array('自取',$report_grant)"}
+                        <input name="row[report_grant][]" type="checkbox" value="自取" checked />自取
+                        {else/}
+                        <input name="row[report_grant][]" type="checkbox" value="自取"  />自取
+                        {/if}
+                    </label>
+                    <label>
+                        {if condition="in_array('邮寄',$report_grant)"}
+                        <input name="row[report_grant][]" type="checkbox" value="邮寄" checked/>邮寄
+                        {else/}
+                        <input name="row[report_grant][]" type="checkbox" value="邮寄" />邮寄
+                        {/if}
+                    </label>
+                    <label>
+                        {if condition="in_array('传真',$report_grant)"}
+                        <input name="row[report_grant][]" type="checkbox" value="传真" checked/>传真
+                        {else/}
+                        <input name="row[report_grant][]" type="checkbox" value="传真" />传真
+                        {/if}
+
+                    </label>
+                    <label>
+                        {if condition="in_array('邮箱',$report_grant)"}
+                        <input name="row[report_grant][]" type="checkbox" value="邮箱" checked />邮箱
+                        {else/}
+                        <input name="row[report_grant][]" type="checkbox" value="邮箱"  />邮箱
+                        {/if}
+                    </label>
+                </div>
+            </div>
+        </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">
+            <div class="col-xs-12 col-sm-8">
+                <div class="check">
+                    <label >
+                        {if condition="in_array('YC/T 207-2014',$sample_stand)"}
+                        <input name="row[sample_stand][]" type="checkbox" value="YC/T 207-2014" checked>YC/T 207-2014
+                        {else/}
+                        <input name="row[sample_stand][]" type="checkbox" value="YC/T 207-2014" >YC/T 207-2014
+                        {/if}
+
+                    </label>
+                    <label >
+                        {if condition="in_array('YQ/T 35-2013',$sample_stand)"}
+                        <input name="row[sample_stand][]" type="checkbox" value="YQ/T 35-2013" checked>YQ/T 35-2013
+                        {else/}
+                        <input name="row[sample_stand][]" type="checkbox" value="YQ/T 35-2013" >YQ/T 35-2013
+                        {/if}
+
+                    </label>
+                    <label >
+                        {if condition="in_array('GB/T 7974-2013',$sample_stand)"}
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 7974-2013" checked>GB/T 7974-2013
+                        {else/}
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 7974-2013" >GB/T 7974-2013
+                        {/if}
+
+                    </label>
+                    <label >
+                        {if condition="in_array('GB/T 18348-2008',$sample_stand)"}
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 18348-2008" checked>GB/T 18348-2008
+                        {else/}
+                        <input name="row[sample_stand][]" type="checkbox" value="GB/T 18348-2008" >GB/T 18348-2008
+                        {/if}
+
+                    </label>
+                    <label >
+                        {if condition="in_array('其他',$sample_stand)"}
+                        <input name="row[sample_stand][]" type="checkbox" value="其他" checked>其他
+                        {else/}
+                        <input name="row[sample_stand][]" type="checkbox" value="其他" >其他
+                        {/if}
+
+                    </label>
+                </div>
+            </div>
         </div>
     </div>