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

 Conflicts:

	resources/views/rejected/search/general.blade.php

app/Http/Controllers/TestController.php

@@ -182,7 +182,7 @@ class TestController extends Controller
     }
     public function restoreBillReport()
     {
-        $areas = OwnerAreaReport::query()->where("counting_month",'like','2021-04%')->whereNotNull("accounting_area")->get();
+        $areas = OwnerAreaReport::query()->where("counting_month",'like','2021-04%')->whereNotNull("accounting_area")->where("owner_id",22)->get();
         foreach ($areas as $area){
             $report = OwnerBillReport::query()->lockForUpdate()->where("owner_id",$area->owner_id)
                 ->where("counting_month",'like',$area->counting_month."%")->first();

app/Services/OwnerStoragePriceModelService.php

@@ -154,6 +154,6 @@ class OwnerStoragePriceModelService
                 if ($total>=$model->amount_interval[$i])$model->price = $index;
             }
         }
-        return $area*$model->price[$index];
+        return $area>0 ? $area*$model->price[$index] : 0;
     }
 }

resources/views/rejected/search/general.blade.php

@@ -68,12 +68,14 @@
                         </td>
                         <td class="" :class="[rejectedBill.is_finished==1?'text-success':'text-muted']">@{{rejectedBill.is_finished | yesNo}}</td>
                         <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">
+                            <span>
                             @can('退货管理-查询-一般-修改入库')
                             <span v-if="rejectedBill.is_loaded==4">
                                 <button class="btn btn-sm btn-info" @click="confirmBeStored($event,rejectedBill.id)">确定入库</button>
                             </span>
                             @endcan
                             <span v-else>@{{rejectedBill.is_loaded | yesNoIsLoaded}}</span>
+                            </span>
                         </td>
                         <td class="text-muted"><span>@{{rejectedBill.created_at}}</span></td>
                         <td><span v-if="rejectedBill.owner"><span>@{{rejectedBill.owner.name}}</span></span></td>