Pārlūkot izejas kodu

委托单打印

15168162575 2 gadi atpakaļ
vecāks
revīzija
de91178f67

+ 36 - 28
application/admin/controller/Entrust.php

@@ -529,6 +529,7 @@ class Entrust extends Backend
         }
         $judgment = Db::name('entrust_print')->where('entrust_user',$params['entrust_user'])
             ->where('entrust_id',$params['entrust_id'])
+            ->where('entrust_time',$params['entrust_time'])
             ->where('name',$params['name'])
             ->where('no',$params['no'])->find();
         if (empty($judgment)){
@@ -537,48 +538,55 @@ class Entrust extends Backend
                 $this->success();
             }
         }else{
-            $this->error();
+            $this->error('该委托单已存在,不需要重新添加');
         }
     }
-    //委托单批量打印
+    //委托单批量打印页面
     public function printing(){
-        $datas=$res =$row = array();
+        $datas=$res = array();
         if ($this->request->isGet()){
             $ids  =explode(',',$this->request->get('ids')) ;
             for($i=0;$i<count($ids);$i++){
                 $datas[$i] = Db::name('entrust')->where('id',$ids[$i])->find();
+                $res['entrust_id'][$i]=$datas[$i]['no'];
+                $res['set'][$i]['name'] = $datas[$i]['name'];
+                $res['set'][$i]['no'] = $datas[$i]['sample_no'];
             }
-            for ($i=0;$i<count($datas);$i++){
-                $row[$i] = Db::name('entrust_print')->where('entrust_id',$datas[$i]['no'])
-                    ->where('name',$datas[$i]['name'])
-                    ->where('no',$datas[$i]['sample_no'])->find();
-                if (!empty($row)){
-                    $res['entrust_user'][$i]=$row[$i]['entrust_user'];
-                    $res['entrust_id'][$i]=$row[$i]['entrust_id'];
-                    $res['set'][$i]['name'] = $row[$i]['name'];
-                    $res['set'][$i]['status'] = $row[$i]['status'];
-                    $res['set'][$i]['num'] = $row[$i]['num'];
-                    $res['set'][$i]['project'] = $row[$i]['project'];
-                    $res['set'][$i]['no'] = $row[$i]['no'];
-                }else{
-                    return $this->error('序号'.$i++.'委托单未提交');
-                }
-            }
-            $res['entrust_time'] = $row['0']['entrust_time'];
-            $res['requirement'] = $row['0']['requirement'];
-            $res['reportnumber'] = $row['0']['reportnumber'];
-            $res['deal'] = $row['0']['deal'];
-            $res['condition'] = $row['0']['condition'];
-            $res['isue'] = $row['0']['isue'];
-            $res['testcost'] = $row['0']['testcost'];
-            $res['standard'] = $row['0']['standard'];
-            $res['entrust_user'] = implode('、',array_unique($res['entrust_user']));
+            $res['entrust_time'] = $datas[0]['create'];
             $res['entrust_id'] = implode('、',array_unique($res['entrust_id']));
             $this->view->assign('row',$res);
         }
         return $this->view->fetch();
 
     }
+    //委托单批量上传
+    public function printingup(){
+        $params = [];
+        if (true === $this->request->isPost()){
+            $sampledata = input('sampledata/a');
+            for ($i=0;$i<count($sampledata);$i++){
+                $params['entrust_user'] = input('entrust_user');
+                $params['entrust_time'] = input('entrust_time');
+                $params['entrust_id'] = input('entrust_id');
+                $params['requirement'] = input('requirement');
+                $params['reportnumber'] = input('reportnumber');
+                $params['deal'] = input('deal');
+                $params['condition'] = input('condition');
+                $params['isue'] = input('isue');
+                $params['testcost'] = input('testcost');
+                $params['standard'] = input('standard');
+                $params['name'] = $sampledata[$i][0];
+                $params['status'] = $sampledata[$i][1];
+                $params['num'] = $sampledata[$i][2];
+                $params['project'] = $sampledata[$i][3];
+                $params['no'] = $sampledata[$i][4];
+                $res[$i] = Db::name('entrust_print')->insert($params);
+            }
+            if (!empty($res)){
+                $this->success();
+            }
+        }
+    }
     //生成委托单号
     public function getNo(){
         $params = input('temp');

+ 40 - 39
application/admin/view/entrust/commissionsheet.html

@@ -1,11 +1,13 @@
 
 <style type="text/css">
-    .table{table-layout: fixed;}
+    .table{table-layout: fixed; border: none;}
+    .table tbody tr{vertical-align: middle;min-height: 25px;}
     .table tbody tr td{font-size: 13px;padding-top: 0;padding-bottom: 0;vertical-align: middle ;}
     input{padding-top: 0;padding-bottom: 0;}
-    label{font-weight: inherit;}
-    .radio{padding-top: 0;min-height: auto;}
+    label{font-weight: inherit;margin: 0;}
+    .radio label input{margin-top: 2px;}
     #ee{text-align: center;}
+    .checkbox label input{margin-top: 2px;}
 </style>
 
 <form id="add-form" class="form-horizontal" role="form"  data-toggle="validator" method="POST" action="">
@@ -15,26 +17,26 @@
             <thead>
             </thead>
             <tbody>
-            <tr >
-                <td colspan="2" style="padding: 0;">
+            <tr style="border: none;">
+                <td colspan="2" style="padding: 0;border: none;">
                     <label>委托编号:</label>
                 </td>
-                <td colspan="12" style="padding: 0;">
+                <td colspan="12" style="padding: 0;border: none;">
                     <input id="c-entrust_id" style="border: none;" class="form-control" data-rule="required" name="entrust_id" type="text" value="{$name['no']}" >
                 </td>
             </tr>
             <tr >
                 <td colspan="2" id="ee" style="padding: 0;"><label>委托方</label></td>
                 <td colspan="8" style="padding: 0;">
-                    <input id="c-entrust_user" class="form-control" data-rule="required"  style="background-color: #FFFFFF;border: none;" name="entrust_user" type="text">
+                    <input id="c-entrust_user" class="form-control" data-rule="required"  style="background-color: #FFFFFF; font-weight: 600; border: none;" name="entrust_user" type="text" value="浙江美浓世纪集团(品保部)">
                 </td>
                 <td colspan="2" id="ee" style="padding: 0; "><label>委托日期</label></td>
                 <td colspan="2" style="padding: 0; ">
-                    <input id="c-entrust_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" style="background-color: #FFFFFF;border: none;" data-use-current="true" name="entrust_time" type="text" value="{:date('Y-m-d')}">
+                    <input id="c-entrust_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" style="background-color: #FFFFFF;border: none;" data-use-current="true" name="entrust_time" type="text" value="{$name['create']}">
                 </td>
             </tr>
             <tr>
-                <td colspan="14" id="ee"><h3 align="center">委托样品信息</h3></td>
+                <td colspan="14" id="ee"><h3 align="center" style="margin-top: 12px;margin-bottom: 12px;">委托样品信息</h3></td>
             </tr>
             <tr>
                 <td colspan="6" id="ee"><label >样品名称、规格、生产证号</label></td>
@@ -45,21 +47,21 @@
             </tr>
             <tr>
                 <td colspan="6">
-                    <input id="c-name" class="form-control" style="background-color: #FFFFFF;border: none;" name="name" data-rule="required" type="text" value="{$name['name']}">
+                    <p  id="c-name" style="font-weight: 700;">{$name['name']}</p>
                 </td>
                 <td colspan="2">
                     <div class="radio" >
-                        <label><input name="status" type="radio" value="1">密&nbsp;&nbsp;&nbsp;&nbsp;封</label><br>
+                        <label><input name="status" type="radio" checked  value="密封">密&nbsp;&nbsp;&nbsp;&nbsp;封</label><br>
                     </div>
                     <div class="radio">
-                        <label><input name="status" type="radio"  value="2">不密封</label>
+                        <label><input name="status" type="radio" value="不密封">不密封</label>
                     </div>
                 </td>
                 <td >
                     <input id="c-num" class="form-control" style="background-color: #FFFFFF;border: none;" data-rule="required" name="num" >
                 </td>
                 <td colspan="2">
-                    <input id="c-project" class="form-control"  style="background-color: #FFFFFF;border: none;" name="project" type="text">
+                    <input id="c-project" class="form-control"  style="background-color: #FFFFFF;border: none;" name="project" type="text" value="VOC">
                 </td>
                 <td colspan="3">
                     <input id="c-no" class="form-control" style="background-color: #FFFFFF;border: none;" data-rule="required" name="no"  type="text" value="{$name['sample_no']}">
@@ -69,34 +71,34 @@
                 <td colspan="2" id="ee"><label>备注</label></td>
                 <td colspan="7">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label><input  name="requirement" type="radio" value="1">正式报告</label>
-                            <label><input  name="requirement" type="radio" value="2">简化报告</label>
-                            <label><input  name="requirement" type="radio" value="3">检测数据</label>
+                        <div class="checkbox">
+                            <label><input  name="requirement" type="checkbox" value="正式报告">正式报告</label>
+                            <label><input  name="requirement" type="checkbox" value="简化报告">简化报告</label>
+                            <label><input  name="requirement" type="checkbox" value="检测数据">检测数据</label>
                         </div>
                     </div>
                 </td>
                 <td colspan="2" id="ee"><label>报告份数</label></td>
                 <td colspan="3">
-                    <input id="c-reportnumber" class="form-control " style="background-color: #FFFFFF;border: none;" name="reportnumber" type="text" >
+                    <input id="c-reportnumber" class="form-control " style="background-color: #FFFFFF;border: none;" name="reportnumber" type="text" value="1" >
                 </td>
             </tr>
             <tr>
                 <td colspan="2" id="ee"><label>检后样品处理要求</label></td>
                 <td colspan="5">
                     <div class="form-inline">
-                        <div class="radio" >
-                            <label><input name="deal" type="radio" value="1">&nbsp;&nbsp;委托方取回</label>
-                            <label><input name="deal" type="radio" value="2">&nbsp;&nbsp;本中心处理</label>
+                        <div class="checkbox" >
+                            <label><input name="deal" type="checkbox" value="委托方取回">&nbsp;&nbsp;委托方取回</label>
+                            <label><input name="deal" type="checkbox" value="本中心处理">&nbsp;&nbsp;本中心处理</label>
                         </div>
                     </div>
                 </td>
                 <td colspan="2" id="ee"><label>样品保存条件</label></td>
                 <td colspan="5">
                     <div class="form-inline">
-                        <div class="radio" >
-                            <label><input name="condition" type="radio" value="1">&nbsp;&nbsp;密封</label>
-                            <label><input name="condition" type="radio" value="2">&nbsp;&nbsp;其他</label>
+                        <div class="checkbox" >
+                            <label><input name="condition" type="checkbox" value="密封">&nbsp;&nbsp;密封</label>
+                            <label><input name="condition" type="checkbox" value="其他">&nbsp;&nbsp;其他</label>
                         </div>
                     </div>
                 </td>
@@ -105,37 +107,37 @@
                 <td colspan="2" id="ee"><label>报告发放</label></td>
                 <td colspan="7">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label><input name="isue" type="radio" value="1">&nbsp;&nbsp;自取</label>
+                        <div class="checkbox">
+                            <label><input name="isue" type="checkbox" value="自取">&nbsp;&nbsp;自取</label>
 
-                            <label><input name="isue" type="radio" value="2">&nbsp;&nbsp;邮寄</label>
+                            <label><input name="isue" type="checkbox" value="邮寄">&nbsp;&nbsp;邮寄</label>
 
-                            <label><input name="isue" type="radio" value="3">&nbsp;&nbsp;传真</label>
+                            <label><input name="isue" type="checkbox" value="传真">&nbsp;&nbsp;传真</label>
 
-                            <label><input name="isue" type="radio" value="4">&nbsp;&nbsp;邮箱</label>
+                            <label><input name="isue" type="checkbox" value="邮箱">&nbsp;&nbsp;邮箱</label>
                         </div>
                     </div>
                 </td>
-                <td colspan="2" id="ee"><label>检测费用</label></td>
+                <td colspan="2" id="ee"><label>检测费用(元)</label></td>
                 <td colspan="3">
-                    <input id="c-testcost" class="form-control" step="1" style="background-color: #FFFFFF;border: none;" name="testcost" type="number">
+                    <input id="c-testcost" class="form-control" step="1" style="background-color: #FFFFFF;border: none;" name="testcost" type="number" >
                 </td>
             </tr>
             <tr>
                 <td rowspan="2" colspan="2" id="ee"><label>委托协议</label></td>
-                <td colspan="3" id="ee"><label>1.检测依据标准</label></td>
+                <td colspan="3"><label>1.检测依据标准</label></td>
                 <td colspan="9">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label><input name="standard" type="radio" value="1">&nbsp;&nbsp;YC/T 207-2014</label>
+                        <div class="checkbox">
+                            <label><input name="standard" type="checkbox" value="YC/T 207-2014">&nbsp;&nbsp;YC/T 207-2014</label>
 
-                            <label><input name="standard" type="radio" value="2">&nbsp;&nbsp;YQ/T 35-2013</label>
+                            <label><input name="standard" type="checkbox" value="YQ/T 35-2013">&nbsp;&nbsp;YQ/T 35-2013</label>
 
-                            <label><input name="standard" type="radio" value="3">&nbsp;&nbsp;GB/T 7974-2013</label>
+                            <label><input name="standard" type="checkbox" value="GB/T 7974-2013">&nbsp;&nbsp;GB/T 7974-2013</label>
 
-                            <label><input name="standard" type="radio" value="4">&nbsp;&nbsp;GB/T 18348-2008</label>
+                            <label><input name="standard" type="checkbox" value="GB/T 18348-2008">&nbsp;&nbsp;GB/T 18348-2008</label>
 
-                            <label><input name="standard" type="radio" value="5" >&nbsp;&nbsp;其他</label>
+                            <label><input name="standard" type="checkbox" value="其他" >&nbsp;&nbsp;其他</label>
                         </div>
                     </div>
                 </td>
@@ -227,7 +229,6 @@
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div id="button" class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-success btn-embossed submit ">{:__('保存')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
 </form>

+ 57 - 45
application/admin/view/entrust/printing.html

@@ -1,29 +1,34 @@
 
 <style type="text/css">
-    .table{table-layout: fixed;}
-    .table tbody tr td{font-size: 13px;padding-top: 0;padding-bottom: 0;vertical-align: middle;}
+    .table{table-layout: fixed; border: none;}
+    .table tbody tr{vertical-align: middle;min-height: 25px;}
+    .table tbody tr td{font-size: 13px;padding-top: 0;padding-bottom: 0;vertical-align: middle ;}
     input{padding-top: 0;padding-bottom: 0;}
-    label{font-weight: inherit;}
-    .radio{padding-top: 0;min-height: auto;margin: 0;}
-    input[type="checkbox"]{padding-top: 0;}
+    label{font-weight: inherit;margin: 0;}
+    .radio label input{margin-top: 2px;}
     #ee{text-align: center;}
+    .checkbox label input{margin-top: 2px;}
 </style>
-    <div class="container" style="width: 210mm;height: 297mm;" >
-        <table id="tableprint" class="table table-bordered">
+
+<form id="add-form" class="form-horizontal" role="form"  data-toggle="validator" method="POST" action="">
+    <div class="container">
+        <table id="tableprint" class="table table-bordered" style="width: 200mm;">
             <caption style="font-weight: normal;font-size: 20px; text-align: center;color: #0d0d0d;" >检测委托书</caption>
             <thead>
             </thead>
             <tbody>
-            <tr >
-                <td colspan="2" style="padding: 0;"><label >委托编号:</label></td>
-                <td colspan="12" style="padding: 0;">
+            <tr style="border: none;">
+                <td colspan="2" style="padding: 0;border: none;">
+                    <label>委托编号:</label>
+                </td>
+                <td colspan="12" style="padding: 0;border: none;">
                     <input id="c-entrust_id" style="border: none;" class="form-control" data-rule="required" name="entrust_id" type="text" value="{$row['entrust_id']}" >
                 </td>
             </tr>
             <tr >
                 <td colspan="2" id="ee" style="padding: 0;"><label>委托方</label></td>
-                <td colspan="8" style="padding: 0; v">
-                    <input id="c-entrust_user" class="form-control" data-rule="required"  style="background-color: #FFFFFF;border: none;" name="entrust_user" type="text" value="{$row['entrust_user']}">
+                <td colspan="8" style="padding: 0;">
+                    <input id="c-entrust_user" class="form-control" data-rule="required"  style="background-color: #FFFFFF;font-weight:600;border: none;" name="entrust_user" type="text" value="浙江美浓世纪集团(品保部)">
                 </td>
                 <td colspan="2" id="ee" style="padding: 0; "><label>委托日期</label></td>
                 <td colspan="2" style="padding: 0; ">
@@ -31,7 +36,7 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="14" id="ee"><h3 align="center">委托样品信息</h3></td>
+                <td colspan="14" id="ee"><h3 align="center" style="margin-top: 12px;margin-bottom: 12px;">委托样品信息</h3></td>
             </tr>
             <tr>
                 <td colspan="6" id="ee"><label >样品名称、规格、生产证号</label></td>
@@ -43,21 +48,21 @@
             {volist name="row['set']" id="vo"}
             <tr>
                 <td colspan="6">
-                    <input id="c-name" class="form-control" style="background-color: #FFFFFF;border: none;" name="name" data-rule="required" type="text" value="{$vo.name}">
+                    <p  id="c-name" style="font-weight: 600;">{$vo.name}</p>
                 </td>
                 <td colspan="2">
                     <div class="radio" >
-                        <label><input name="status"  type="checkbox" value="1" {if $vo.status == 1}checked{/if}>密&nbsp;&nbsp;&nbsp;&nbsp;封</label><br>
+                        <label><input name="status" type="checkbox" checked  value="密封">密&nbsp;&nbsp;&nbsp;&nbsp;封</label><br>
                     </div>
                     <div class="radio">
-                        <label><input name="status" type="checkbox"  value="2" {if $vo.status == 2}checked{/if}>不密封</label>
+                        <label><input name="status" type="checkbox" value="不密封">不密封</label>
                     </div>
                 </td>
                 <td >
-                    <input id="c-num" class="form-control" style="background-color: #FFFFFF;border: none;" data-rule="required" name="num" value="{$vo.num}" >
+                    <input id="c-num" class="form-control" style="background-color: #FFFFFF;border: none;" data-rule="required" name="num" >
                 </td>
                 <td colspan="2">
-                    <input id="c-project" class="form-control"  style="background-color: #FFFFFF;border: none;" name="project" type="text" value="{$vo.project}">
+                    <input id="c-project" class="form-control"  style="background-color: #FFFFFF;border: none;" name="project" type="text" value="VOC">
                 </td>
                 <td colspan="3">
                     <input id="c-no" class="form-control" style="background-color: #FFFFFF;border: none;" data-rule="required" name="no"  type="text" value="{$vo.no}">
@@ -68,34 +73,34 @@
                 <td colspan="2" id="ee"><label>备注</label></td>
                 <td colspan="7">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label class="checkbox-inline"><input  name="requirement" type="radio" {if $row['requirement'] == 1}checked{/if} value="1">正式报告</label>
-                            <label class="checkbox-inline"><input  name="requirement" type="radio" {if $row['requirement'] == 2}checked{/if} value="2">简化报告</label>
-                            <label class="checkbox-inline"><input  name="requirement" type="radio" {if $row['requirement'] == 3}checked{/if} value="3">检测数据</label>
+                        <div class="checkbox">
+                            <label><input  name="requirement" type="checkbox" value="正式报告">正式报告</label>
+                            <label><input  name="requirement" type="checkbox" value="简化报告">简化报告</label>
+                            <label><input  name="requirement" type="checkbox" value="检测数据">检测数据</label>
                         </div>
                     </div>
                 </td>
                 <td colspan="2" id="ee"><label>报告份数</label></td>
                 <td colspan="3">
-                    <input id="c-reportnumber" class="form-control " style="background-color: #FFFFFF;border: none;" name="reportnumber" type="text" value="{$row['reportnumber']}" >
+                    <input id="c-reportnumber" class="form-control " style="background-color: #FFFFFF;border: none;" name="reportnumber" type="text" value="1" >
                 </td>
             </tr>
             <tr>
                 <td colspan="2" id="ee"><label>检后样品处理要求</label></td>
                 <td colspan="5">
                     <div class="form-inline">
-                        <div class="radio" >
-                            <label><input name="deal" type="radio" {if $row['deal'] == 1}checked{/if} value="1">&nbsp;&nbsp;委托方取回</label>
-                            <label><input name="deal" type="radio" {if $row['deal'] == 2}checked{/if} value="2">&nbsp;&nbsp;本中心处理</label>
+                        <div class="checkbox" >
+                            <label><input name="deal" type="checkbox" value="委托方取回">&nbsp;&nbsp;委托方取回</label>
+                            <label><input name="deal" type="checkbox" value="本中心处理">&nbsp;&nbsp;本中心处理</label>
                         </div>
                     </div>
                 </td>
                 <td colspan="2" id="ee"><label>样品保存条件</label></td>
                 <td colspan="5">
                     <div class="form-inline">
-                        <div class="radio" >
-                            <label><input name="condition" type="radio" {if $row['condition'] == 1}checked{/if} value="1">&nbsp;&nbsp;密封</label>
-                            <label><input name="condition" type="radio" {if $row['condition'] == 2}checked{/if} value="2">&nbsp;&nbsp;其他</label>
+                        <div class="checkbox" >
+                            <label><input name="condition" type="checkbox" value="密封">&nbsp;&nbsp;密封</label>
+                            <label><input name="condition" type="checkbox" value="其他">&nbsp;&nbsp;其他</label>
                         </div>
                     </div>
                 </td>
@@ -104,37 +109,37 @@
                 <td colspan="2" id="ee"><label>报告发放</label></td>
                 <td colspan="7">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label><input name="isue" type="radio" {if $row['isue'] == 1}checked{/if} value="1">&nbsp;&nbsp;自取</label>
+                        <div class="checkbox">
+                            <label><input name="isue" type="checkbox" value="自取">&nbsp;&nbsp;自取</label>
 
-                            <label><input name="isue" type="radio" {if $row['isue'] == 2}checked{/if} value="2">&nbsp;&nbsp;邮寄</label>
+                            <label><input name="isue" type="checkbox" value="邮寄">&nbsp;&nbsp;邮寄</label>
 
-                            <label><input name="isue" type="radio" {if $row['isue'] == 3}checked{/if} value="3">&nbsp;&nbsp;传真</label>
+                            <label><input name="isue" type="checkbox" value="传真">&nbsp;&nbsp;传真</label>
 
-                            <label><input name="isue" type="radio" {if $row['isue'] == 4}checked{/if} value="4">&nbsp;&nbsp;邮箱</label>
+                            <label><input name="isue" type="checkbox" value="邮箱">&nbsp;&nbsp;邮箱</label>
                         </div>
                     </div>
                 </td>
-                <td colspan="2" id="ee"><label>检测费用</label></td>
+                <td colspan="2" id="ee"><label>检测费用(元)</label></td>
                 <td colspan="3">
-                    <input id="c-testcost" class="form-control" step="1" style="background-color: #FFFFFF;border: none;" name="testcost" type="number" value="{$row['testcost']}">
+                    <input id="c-testcost" class="form-control" step="1" style="background-color: #FFFFFF;border: none;" name="testcost" type="number" >
                 </td>
             </tr>
             <tr>
                 <td rowspan="2" colspan="2" id="ee"><label>委托协议</label></td>
-                <td colspan="3" id="ee"><label>1.检测依据标准</label></td>
+                <td colspan="3"><label>1.检测依据标准</label></td>
                 <td colspan="9">
                     <div class="form-inline">
-                        <div class="radio">
-                            <label><input name="standard" type="radio" {if $row['standard'] == 1}checked{/if} value="1">&nbsp;&nbsp;YC/T 207-2014</label>
+                        <div class="checkbox">
+                            <label><input name="standard" type="checkbox" value="YC/T 207-2014">&nbsp;&nbsp;YC/T 207-2014</label>
 
-                            <label><input name="standard" type="radio" {if $row['standard'] == 2}checked{/if} value="2">&nbsp;&nbsp;YQ/T 35-2013</label>
+                            <label><input name="standard" type="checkbox" value="YQ/T 35-2013">&nbsp;&nbsp;YQ/T 35-2013</label>
 
-                            <label><input name="standard" type="radio" {if $row['standard'] == 3}checked{/if} value="3">&nbsp;&nbsp;GB/T 7974-2013</label>
+                            <label><input name="standard" type="checkbox" value="GB/T 7974-2013">&nbsp;&nbsp;GB/T 7974-2013</label>
 
-                            <label><input name="standard" type="radio" {if $row['standard'] == 4}checked{/if} value="4">&nbsp;&nbsp;GB/T 18348-2008</label>
+                            <label><input name="standard" type="checkbox" value="GB/T 18348-2008">&nbsp;&nbsp;GB/T 18348-2008</label>
 
-                            <label><input name="standard" type="radio" {if $row['standard'] == 5}checked{/if} value="5" >&nbsp;&nbsp;其他</label>
+                            <label><input name="standard" type="checkbox" value="其他" >&nbsp;&nbsp;其他</label>
                         </div>
                     </div>
                 </td>
@@ -159,12 +164,12 @@
             <tr>
                 <td colspan="7">
                     <div class="from-grop">
-                        <textarea class="form-control" rows="4" style="background-color: #FFFFFF;border: none;resize: none;" disabled>委托方(签章):</textarea>
+                        <textarea class="form-control" rows="3" style="background-color: #FFFFFF;border: none;resize: none;" disabled>委托方(签章):</textarea>
                     </div>
                 </td>
                 <td colspan="7">
                     <div class="from-grop">
-                        <textarea class="form-control" rows="4" style="background-color: #FFFFFF;border: none;resize: none;"   disabled>承检方(签章):</textarea>
+                        <textarea class="form-control" rows="3" style="background-color: #FFFFFF;border: none;resize: none;"   disabled>承检方(签章):</textarea>
                     </div>
                 </td>
             </tr>
@@ -222,5 +227,12 @@
         </table>
     </div>
 
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div id="button" class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed submit ">{:__('保存')}</button>
+        </div>
+    </div>
+</form>
 
 

+ 134 - 11
public/assets/js/backend/entrust.js

@@ -126,6 +126,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
             $(".btn-add").data("area", ["100%","100%"]);
             $(".btn-edit").data("area", ["100%","100%"]);
+            $(".btn-printing").data("area", ["100%","100%"]);
             table.on('post-body.bs.table', function (e, settings, json, xhr) {
                 $(".btn-editone").data("area", ["100%", "100%"]);
             });
@@ -290,7 +291,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     return false;
                 }
                 // 判断样品名称是否为空
-                var name = $('#c-name').val();
+                var name = $('#c-name').text();
                 if (name == '' || name == undefined) {
                     layer.confirm('样品名称不能为空');
                     return false;
@@ -313,6 +314,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     layer.confirm('样品编号不能为空');
                     return false;
                 }
+                // 获取备注选中值
+                var requirement = '';
+                $("input[name='requirement']:checked").each(function(){
+                    requirement += $(this).val()+"、";
+                });
+                // 获取检后样品处理要求选中值
+                var deal = '';
+                $("input[name='deal']:checked").each(function(){
+                    deal += $(this).val()+"、";
+                });
+                // 获取样品保存条件选中值
+                var condition = '';
+                $("input[name='condition']:checked").each(function (){
+                    condition += $(this).val()+"、";
+                });
+                // 获取报告发放选中值
+                var isue = '';
+                $("input[name='isue']:checked").each(function (){
+                    isue += $(this).val()+"、";
+                });
+                // 获取检测依据标准选中值
+                var standard = '';
+                $("input[name='standard']:checked").each(function(){
+                    standard += $(this).val()+"、";
+                });
                 Fast.api.ajax({
                     url: 'entrust/commissionsheetup',
                     data: {
@@ -324,13 +350,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         project:project,
                         no:no,
                         status:$("input[name='status']:checked").val(),
-                        requirement:$("input[name='requirement']:checked").val(),
+                        requirement:requirement,
                         reportnumber:$('#c-reportnumber').val(),
-                        deal:$("input[name='deal']:checked").val(),
-                        condition:$("input[name='condition']:checked").val(),
-                        isue:$("input[name='isue']:checked").val(),
+                        deal:deal,
+                        condition:condition,
+                        isue:isue,
                         testcost:$('#c-testcost').val(),
-                        standard:$("input[name='standard']:checked").val()
+                        standard:standard
                     },
                 }, function (data, ret) {
                     if (ret.code === 1){
@@ -341,7 +367,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     parent.Fast.api.refreshmenu();
                     return false;
                 }, function (data, ret) {
-                    parent.Toastr.error('添加失败');
+                    parent.Toastr.error(ret.msg);
                     Fast.api.close();
                     parent.Fast.api.refreshmenu();
                     return false;
@@ -350,11 +376,108 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
         },
         printing: function (){
-            $(document).ready(function (){
-                Fast.api.close();
-                window.print();
-            });
             Controller.api.bindevent();
+            Form.api.bindevent($("form[role=form]"), function (data, ret) {
+                Toastr.success("成功");
+            }, function (data, ret) {
+                Toastr.success("失败");
+            }, function (success, error) {
+                // 判断委托编号是否为空
+                var entrust_id = $('#c-entrust_id').val();
+                if (entrust_id == '' || entrust_id == undefined) {
+                    layer.confirm('委托编号不能为空');
+                    return false;
+                }
+                // 判断委托方是否为空
+                var entrust_user = $('#c-entrust_user').val();
+                if (entrust_user == '' || entrust_user == undefined) {
+                    layer.confirm('委托方不能为空');
+                    return false;
+                }
+                // 判断委托日期是否为空
+                var entrust_time = $('#c-entrust_time').val();
+                if (entrust_time == '' || entrust_time == undefined) {
+                    layer.confirm('委托日期不能为空');
+                    return false;
+                }
+                // 循环获取样品信息
+                var sampledata = [];
+                var samplelist = $('#tableprint').find("tr");//样品种数
+                for (var i=4;i<samplelist.length-8;i++){
+                    var samdata = [];
+                    var name = $(samplelist).eq(i).find('#c-name').text();
+                    var status = $(samplelist).eq(i).find("input[name='status']:checked").val();
+                    var num = $(samplelist).eq(i).find('#c-num').val();
+                    if (num == '' || num == undefined) {
+                        layer.confirm('样品数量不能为空');
+                        return false;
+                    }
+                    var object = $(samplelist).eq(i).find('#c-project').val();
+                    var no = $(samplelist).eq(i).find('#c-no').val();
+                    samdata.push(name);
+                    samdata.push(status);
+                    samdata.push(num);
+                    samdata.push(object);
+                    samdata.push(no);
+                    sampledata.push(samdata);
+                }
+                console.log(sampledata);
+                // 获取备注选中值
+                var requirement = '';
+                $("input[name='requirement']:checked").each(function(){
+                    requirement += $(this).val()+"、";
+                });
+                // 获取检后样品处理要求选中值
+                var deal = '';
+                $("input[name='deal']:checked").each(function(){
+                    deal += $(this).val()+"、";
+                });
+                // 获取样品保存条件选中值
+                var condition = '';
+                $("input[name='condition']:checked").each(function (){
+                    condition += $(this).val()+"、";
+                });
+                // 获取报告发放选中值
+                var isue = '';
+                $("input[name='isue']:checked").each(function (){
+                    isue += $(this).val()+"、";
+                });
+                // 获取检测依据标准选中值
+                var standard = '';
+                $("input[name='standard']:checked").each(function(){
+                    standard += $(this).val()+"、";
+                });
+                Fast.api.ajax({
+                    url: 'entrust/printingup',
+                    data: {
+                        entrust_user:entrust_user,
+                        entrust_time:entrust_time,
+                        entrust_id:entrust_id,
+                        sampledata:sampledata,
+                        requirement:requirement,
+                        reportnumber:$('#c-reportnumber').val(),
+                        deal:deal,
+                        condition:condition,
+                        isue:isue,
+                        testcost:$('#c-testcost').val(),
+                        standard:standard
+                    },
+                }, function (data, ret) {
+                    if (ret.code === 1){
+                        window.print();
+                    }
+                    parent.Toastr.success('添加成功');
+                    Fast.api.close();
+                    parent.Fast.api.refreshmenu();
+                    return false;
+                }, function (data, ret) {
+                    parent.Toastr.error(ret.msg);
+                    Fast.api.close();
+                    parent.Fast.api.refreshmenu();
+                    return false;
+                });
+                return false;
+            });
         },
         api: {
             bindevent: function () {

+ 1 - 1
public/assets/js/require-table.js

@@ -361,7 +361,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     }
                     var data = ids.toString();
                     var url = options.extend.printing_url+'?ids='+data;
-                    Fast.api.open(url,'批量打印',);
+                    Fast.api.open(url,'批量打印',{area:["100%","100%"]});
                 });
                 //清空回收站
                 $(document).on('click', Table.config.destroyallbtn, function () {