Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -92,7 +92,7 @@ class OrderController extends Controller
     }
 
     public  function export(Request $request){
-        $data = MedicalOrderModel::all();
+        $data = MedicalOrderModel::where('single','!=','')->orwhere('combo','!=','')->get();
         dd($data);
         foreach ($student as $key=>$val){}
         $student =json_encode($student,true);

resources/views/admin/medical/order/index.blade.php

@@ -25,11 +25,10 @@
 				        </div>
 				        </form>
 						<form method="post" action="export" accept-charset="UTF-8">
-
+							<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 							<div class="col-sm-4">
 								<div class="input-group">
 									<button type="submit" class="btn btn-sm btn-primary">导出excel</button>
-								</span>
 								</div>
 							</div>
 						</form>