From 47f610eefcaffc03a7e92c4e40b7913b8419339f Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 16 Jun 2023 12:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=89=93=E5=8D=B04=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/PrintController.php | 20 ++++++++++++++++++--
 resources/views/print-const.blade.php    |  9 +++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/PrintController.php b/app/Http/Controllers/PrintController.php
index 9df890a..5d5e4f2 100644
--- a/app/Http/Controllers/PrintController.php
+++ b/app/Http/Controllers/PrintController.php
@@ -28,11 +28,27 @@ class PrintController extends Controller
             $time = $flow->created_at->format('Y-m-d H:i:s');
             $sn = $flow->sn;
             $ukeys = explode(',', $request->input('ukeys', ''));
+            $i = 0;
             foreach($rows as $item){
-                if(in_array($item['ukey'], $ukeys)){
-                    $list[] = $item;
+                
+                if($i<4){
+                    if(in_array($item['ukey'], $ukeys)){
+                        $i++;
+                        $list[] = $item; 
+                    }
+                }else{
+                    break;
                 }
             }
+            for($i; $i<4; $i++){
+                $list[] = [
+                    'ukey' => '',
+                    'name' => '',
+                    'fee_name' => '',
+                    'fee_value' => 0,
+                ];
+            }
+            
             if(count($list) > 0){
                 $total = collect($list)->sum('fee_value');
                 if($total > 0){
diff --git a/resources/views/print-const.blade.php b/resources/views/print-const.blade.php
index a0efb2a..51eff28 100644
--- a/resources/views/print-const.blade.php
+++ b/resources/views/print-const.blade.php
@@ -62,14 +62,14 @@
                 <th style="width: 5%;">序号</th>
                 <th style="width: 25%;">费用类别</th>
                 <th style="width: 30%;">起止日期</th>
-                <th style="width: 15%;">金额</th>
+                <th style="width: 15%;">金额（元）</th>
                 <th style="width: 25%;">备注</th>
             </tr>
             @foreach($list as $item)
                 <tr>
                     <td>{{$loop->iteration}}</td>
-                    <td>{{$item['fee_name']}}</td>
-                    <td>{{$timeZone}}</td>
+                    <td>{{$item['name']}}-{{$item['fee_name']}}</td>
+                    <td>@if(empty($item['name']))-@else{{$timeZone}}@endif</td>
                     <td>{{$item['fee_value']}}</td>
                     <td>
                         <input type="text" style="border:none">
@@ -78,7 +78,8 @@
             @endforeach
             <tr>
                 <td colspan="3" style=" text-align: left;">合计大写：{{$bigTotal}}</td>
-                <td colspan="2">{{$total}}</td>
+                <td >{{$total}}</td>
+                <td ></td>
             </tr>
         </table>
         <p class="tag" style="font-size:20px;">