Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/TestController.php

@@ -169,11 +169,15 @@ class TestController extends Controller
 
     public function test()
     {
+        $ows = OwnerAreaReport::query()->select("owner_id")->where("counting_month",'like',"2021-03%")->get();
+        $owners = Owner::query()->whereNotIn("id",array_column($ows->toArray(),"owner_id"))->get();
+        dd($owners);
         return view("test");
     }
     public function supplementMarchOwnerReport()
     {
-        $owners = Owner::query()->whereNotIn("id",DB::raw("SELECT owner_id FROM owner"))->get();
+        $ows = OwnerAreaReport::query()->select("owner_id")->where("counting_month",'like',"2021-03%")->get();
+        $owners = Owner::query()->whereNotIn("id",array_column($ows->toArray(),"owner_id"))->get();
         foreach ($owners as $owner){
             if (!$owner->ownerStoragePriceModels)continue;
             foreach ($owner->ownerStoragePriceModels as $model){

resources/views/finance/instantBill.blade.php

@@ -62,7 +62,7 @@
                     <td><span>@{{ bill.volume }}</span></td>
                     <td><span>@{{ bill.weight }}</span></td>
                     <td :rowspan="bill.rowspan"><span>@{{ bill.logisticName }}</span></td>
-                    <td :rowspan="bill.rowspan"><span.@{{ bill.workFee }}</td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.workFee }}</span></td>
                     <td><span>@{{ bill.logisticFee }}</span></td>
                     <td :rowspan="bill.rowspan"><span>@{{ bill.total }}</span></td>
                 </tr>