diff --git a/app/Http/Controllers/PrintController.php b/app/Http/Controllers/PrintController.php index 16fda58..9df890a 100644 --- a/app/Http/Controllers/PrintController.php +++ b/app/Http/Controllers/PrintController.php @@ -15,6 +15,7 @@ class PrintController extends Controller $sn = ''; //默认list最少N行,最多N行; $list = []; + $total = 0; $bigTotal = ''; $adminName = ''; $timeZone = ''; @@ -44,7 +45,7 @@ class PrintController extends Controller $timeZone = substr($flow->start_at, 0, 10).'至'.substr($flow->end_at, 0, 10); } - return view('print-const', compact('name', 'time', 'sn', 'list', 'bigTotal', 'timeZone', 'adminName')); + return view('print-const', compact('name', 'time', 'sn', 'list', 'total', 'bigTotal', 'timeZone', 'adminName')); } diff --git a/resources/views/print-const.blade.php b/resources/views/print-const.blade.php index 64ee362..a0efb2a 100644 --- a/resources/views/print-const.blade.php +++ b/resources/views/print-const.blade.php @@ -9,7 +9,7 @@ margin: 0; } body { - margin: 1.6cm; + margin: 0.8cm; } } body { @@ -18,7 +18,6 @@ .container { /* width: 800px; */ text-align: center; - height: 800px; } .tag { overflow: hidden; /* 清除浮动 */ @@ -43,8 +42,8 @@ margin: 0 auto; table-layout: fixed; } - td,th{ - line-height: 35px; + td, th{ + line-height: 30px; border: 1px solid black; } @@ -52,7 +51,7 @@