结算BUG修改

app/Http/Controllers/SettlementBillExpressFeeDetailController.php

@@ -52,12 +52,12 @@ class SettlementBillExpressFeeDetailController extends Controller implements Set
 
     public function export(Request $request)
     {
-        list($permittingOwnerIds, $counting_month, $owner_id) = $this->getRequestParams($request->owner_id, $request->year, $request->month);
+        list($permittingOwnerIds, $counting_month, $owner_id) = $this->getRequestParams($request->year, $request->month,$request->owner_id  );
         $query = $this->service->getSql($owner_id, $counting_month);
         if (!$request->exists('checkAllSign')) {
             $query->whereIn('id', explode(',', $request['data']));
         }
-        $details = $this->service->buildDetails($query->get());
+        $details = $this->service->buildExport($query->get());
         $json = [];
         foreach ($details as $detail) {
             $json[] = array_values($detail);

app/Http/Controllers/SettlementBillExpressFeeReportController.php

@@ -77,7 +77,7 @@ class SettlementBillExpressFeeReportController extends Controller
         foreach ($reports as $report) {
             $json[] = [
                 $report['logistic']['name'] ?? '',
-                $report['province'],
+                $report['province']['name'],
                 $report['initial_weight'],
                 $report['initial_amount'],
                 $report['additional_weight'],

app/Http/Controllers/SettlementBillStoreFeeDetailController.php

@@ -61,7 +61,6 @@ class SettlementBillStoreFeeDetailController extends Controller implements Settl
             $query->whereIn('id', explode(',', $request['data']));
         }
         $details = $query->get();
-
         $json = $this->service->buildExport($details);
         $row = ['作业日期', '作业名称', '入库单号', '商品条码', '商品名称', '数量', '单价', '入库费'];
         return Export::make($row, $json, "入库费明细");

app/Http/Controllers/TestController.php

@@ -12,6 +12,7 @@ use App\Feature;
 use App\Jobs\CacheShelfTaskJob;
 use App\Jobs\OrderCreateInstantBill;
 use App\Jobs\OrderCreateWaybill;
+use App\Jobs\SettlementBillReportTask;
 use App\Jobs\StoreCreateInstantBill;
 use App\MaterialBox;
 use App\MaterialBoxModel;
@@ -183,4 +184,9 @@ class TestController extends Controller
         OrderPackage::query()->whereNotNull('transfer_status')->update(['sync_routes_flag'=>true]);
     }
 
+    public function SettlementBillReportTask()
+    {
+        SettlementBillReportTask::dispatchNow('2021-08-01');
+    }
+
 }

app/Jobs/SettlementBillReportTask.php

@@ -26,16 +26,18 @@ class SettlementBillReportTask implements ShouldQueue
     public $maxExceptions = 3;
 
     public $tries = 2;
+
+    public $init_date;
+
     /**
-     * Create a new job instance.
-     *
-     * @return void
+     * @param $init_date
      */
-    public function __construct()
+    public function __construct($init_date)
     {
-        //
+        $this->init_date = $init_date;
     }
 
+
     /**
      * Execute the job.
      *
@@ -46,21 +48,21 @@ class SettlementBillReportTask implements ShouldQueue
         //快递
         /** @var OwnerLogisticFeeReportService $expressFeeReportService */
         $expressFeeReportService = app('OwnerLogisticFeeReportService');
-        $expressFeeReportService->recordReport();
+        $expressFeeReportService->recordReport($this->init_date);
 
         //入库
         /** @var OwnerStoreFeeReportService $storeFeeReportService */
         $storeFeeReportService = app('OwnerStoreFeeReportService');
-        $storeFeeReportService->recordReport();
+        $storeFeeReportService->recordReport($this->init_date);
 
         //出库
         /** @var OwnerStoreOutFeeReportService $storeOutFeeReportService */
         $storeOutFeeReportService = app('OwnerStoreOutFeeReportService');
-        $storeOutFeeReportService->recordReport();
+        $storeOutFeeReportService->recordReport($this->init_date);
 
         //总账单
         /** @var OwnerFeeTotalService $feeTotal */
         $feeTotal = app('OwnerFeeTotalService');
-        $feeTotal->record();
+        $feeTotal->record($this->init_date);
     }
 }

app/Services/OwnerFeeTotalService.php

@@ -99,7 +99,9 @@ class OwnerFeeTotalService
         return OwnerFeeTotal::query()
             ->where('owner_id', $kvPairs['owner_id'])
             ->where('counting_month', $kvPairs['counting_month'])
-            ->first();
+            ->firstOr(function (){
+                return new OwnerFeeTotal();
+            });
     }
 
     /**

app/Services/OwnerLogisticFeeDetailService.php

@@ -57,6 +57,21 @@ class OwnerLogisticFeeDetailService implements \App\Interfaces\SettlementBillDet
 
     public function buildExport($details): array
     {
+        $result = [];
+        foreach ($details as $key => $detail) {
+            //     $row = ['主键', '快递公司', '省份', '快递单号', '重量', '首重价格', '续重价格', '快递费',];
+            $result[] = [
+                $detail->id,
+                $detail->logistic->name ?? '',
+                $detail->province->name ?? '',
+                $detail->logistic_number ?? '',
+                $detail->weight ?? '',
+                $detail->initial_weight_price ?? '',
+                $detail->additional_weight_price ?? '',
+                $detail->total_fee ?? '',
+            ];
+        }
+        return $result;
     }
 
     public function add(array $model)
@@ -65,6 +80,6 @@ class OwnerLogisticFeeDetailService implements \App\Interfaces\SettlementBillDet
 
     public function getTotalFee($owner_id, $counting_month)
     {
-    }
 
+    }
 }

app/Services/OwnerStoreFeeDetailService.php

@@ -46,17 +46,18 @@ class OwnerStoreFeeDetailService
 
     public function buildExport($details): array
     {
+        //        $row = ['作业日期', '作业名称', '入库单号', '商品条码', '商品名称', '数量', '单价', '入库费'];
         $results = [];
         foreach ($details as $detail) {
             $results[] = [
-                $detail->ownerFeeDetail->worked_at ?? null,
-                $detail->work_name ?? null,
-                $detail->asn_code ?? null,
-                $detail->sku ?? null,
-                $detail->commodity->name ?? null,
-                $detail->amount ?? null,
-                $detail->unit_price ?? null,
-                $detail->fee ?? null,
+                $detail->worked_at ?? '',
+                $detail->model->name ?? '',
+                $detail->doc_number ?? '',
+                $detail->commodity->sku ?? '',
+                $detail->commodity->name ?? '',
+                $detail->details[0]->amount ?? '',
+                $detail->details[0]->price ?? '',
+                $detail->total_fee ?? '',
             ];
         }
         return $results;

app/Services/OwnerStoreOutFeeDetailService.php

@@ -40,7 +40,7 @@ class OwnerStoreOutFeeDetailService implements SettlementBillDetailInterface
             ->select('id')
             ->where('operation_type', '出库');
         return OwnerFeeOperation::query()
-            ->with(['details','model','commodity.barcodes'])
+            ->with(['details', 'model', 'commodity.barcodes'])
             ->whereIn('model_id', $OwnerPriceOperationQuery)
             ->whereBetween('worked_at', [$start, $end])
             ->where('owner_id', $owner_id);
@@ -56,18 +56,19 @@ class OwnerStoreOutFeeDetailService implements SettlementBillDetailInterface
         $result = [];
 
         foreach ($details as $detail) {
+            //        $row = ['作业时间', '作业名称', '上游单号', '订单号', '商家编码', '商品条码', '商品名称', '商品数量', '单价', '价格描述', '合计'];
             $result[] = [
-                $detail->ownerFeeDetail->worked_at,
-                $detail->work_name,
-                $detail->source_bill,
-                $detail->ownerFeeDetail->operation_bill,
-                $detail->sku,
-                $detail->barcode,
+                $detail->worked_at ?? '',
+                $detail->model->name ?? '',
+                $detail->source_number,
+                $detail->doc_number ?? '',
+                $detail->commodity->sku ?? '',
+                $detail->source_number ?? '',
                 $detail->commodity->name ?? '',
-                $detail->amount,
-                $detail->unit_price,
-                $detail->price_remark,
-                $detail->fee,
+                $detail->details[0]->amount ?? '',
+                $detail->details[0]->price ?? '',
+                $detail->fee_description ?? '',
+                $detail->fee ?? '',
             ];
         }
         return $result;

resources/views/finance/settlementBills/totalFee/index.blade.php

@@ -54,398 +54,400 @@
                     <th>金额</th>
                     <th>操作</th>
                 </tr>
-                <tr>
-                    <td>仓储费</td>
-                    <td class="m-0 p-0">
-                        <table class="table  m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storageFee']">
-                                <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storageFee']">
-                                <td>@{{ item.remark }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storageFee']">
-                                <td>@{{ item.fee }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['storageFee']!==1" action="{{ 'storageFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+             <template v-if="feeTotal['information']??false">
+                 <tr>
+                     <td>仓储费</td>
+                     <td class="m-0 p-0">
+                         <table class="table  m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storageFee']">
+                                 <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storageFee']">
+                                 <td>@{{ item.remark }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storageFee']">
+                                 <td>@{{ item.fee }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['storageFee']!==1" action="{{ 'storageFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
-                    </td>
-                </tr>
-                <tr>
-                    <td>入库费</td>
-                    <td class="m-0 p-0">
-                        <table class="table  m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeFee']">
-                                <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table  m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeFee']">
-                                <td >
-                                    <span v-for="itemInfo in item.remark">@{{ itemInfo }} </span>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeFee']">
-                                <td>@{{ item.fee }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['storeFee']!==1" action="{{ 'storeFee/report/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>入库费</td>
+                     <td class="m-0 p-0">
+                         <table class="table  m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeFee']">
+                                 <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table  m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeFee']">
+                                 <td >
+                                     <span v-for="itemInfo in item.remark">@{{ itemInfo }} </span>
+                                 </td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeFee']">
+                                 <td>@{{ item.fee }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['storeFee']!==1" action="{{ 'storeFee/report/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>出库费</td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeOutFee']">
-                                <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeOutFee']">
-                                <td>
-                                    <span v-for="itemInfo in item.remark">@{{ itemInfo }} </span>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr v-for="item in feeTotal['information']['storeOutFee']">
-                                <td>@{{ item.fee }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['storeOutFee']!==1" action="{{ 'storeOutFee/report/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>出库费</td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeOutFee']">
+                                 <td>@{{ item.name }}<span v-if="item.tax_fee>0" class="badge badge-info">税</span></td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeOutFee']">
+                                 <td>
+                                     <span v-for="itemInfo in item.remark">@{{ itemInfo }} </span>
+                                 </td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr v-for="item in feeTotal['information']['storeOutFee']">
+                                 <td>@{{ item.fee }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['storeOutFee']!==1" action="{{ 'storeOutFee/report/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>配送费</td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr>
-                                <td>快递费<span v-if="feeTotal['express_tax_fee']>0" class="badge badge-info">税</span></td>
-                            </tr>
-                            <tr>
-                                <td>物流费<span v-if="feeTotal['logistic_tax_fee']>0" class="badge badge-info">税</span>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr>
-                                <td><a target="_blank"
-                                       href="{{ route('settlementBills.expressFee.report',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><a target="_blank"
-                                       href="{{ route('settlementBills.logisticFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr>
-                                <td>@{{ feeTotal['express_fee'] }}</td>
-                            </tr>
-                            <tr>
-                                <td>@{{ feeTotal['logistic_fee'] }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0">
-                            <tr>
-                                <td class="m-0 p-0">
-                                    <form v-if="isArchivedItems['expressFee']!==1"
-                                          action="{{ 'expressFee/report/confirmBill' }}"
-                                          method="post"
-                                          onsubmit="return confirm('您确定要确认金额吗？');">
-                                        {{ csrf_field() }}
-                                        <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                                        <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                                        <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                                        <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>配送费</td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr>
+                                 <td>快递费<span v-if="feeTotal['express_tax_fee']>0" class="badge badge-info">税</span></td>
+                             </tr>
+                             <tr>
+                                 <td>物流费<span v-if="feeTotal['logistic_tax_fee']>0" class="badge badge-info">税</span>
+                                 </td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr>
+                                 <td><a target="_blank"
+                                        href="{{ route('settlementBills.expressFee.report',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                                 </td>
+                             </tr>
+                             <tr>
+                                 <td><a target="_blank"
+                                        href="{{ route('settlementBills.logisticFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                                 </td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr>
+                                 <td>@{{ feeTotal['express_fee'] }}</td>
+                             </tr>
+                             <tr>
+                                 <td>@{{ feeTotal['logistic_fee'] }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0">
+                             <tr>
+                                 <td class="m-0 p-0">
+                                     <form v-if="isArchivedItems['expressFee']!==1"
+                                           action="{{ 'expressFee/report/confirmBill' }}"
+                                           method="post"
+                                           onsubmit="return confirm('您确定要确认金额吗？');">
+                                         {{ csrf_field() }}
+                                         <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                                         <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                                         <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                                         <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                                    </form>
-                                    <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="m-0 p-0">
-                                    <form v-if="isArchivedItems['logisticFee']!==1"
-                                          action="{{ 'logisticFee/confirmBill' }}"
-                                          method="post"
-                                          onsubmit="return confirm('您确定要确认金额吗？');">
-                                        {{ csrf_field() }}
-                                        <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                                        <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                                        <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                                        <span class="ml-4 mt-2">
+                                     </form>
+                                     <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                                 </td>
+                             </tr>
+                             <tr>
+                                 <td class="m-0 p-0">
+                                     <form v-if="isArchivedItems['logisticFee']!==1"
+                                           action="{{ 'logisticFee/confirmBill' }}"
+                                           method="post"
+                                           onsubmit="return confirm('您确定要确认金额吗？');">
+                                         {{ csrf_field() }}
+                                         <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                                         <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                                         <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                                         <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                                    </form>
-                                    <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                                     </form>
+                                     <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                                </td>
-                            </tr>
-                        </table>
+                                 </td>
+                             </tr>
+                         </table>
 
-                    </td>
+                     </td>
 
-                </tr>
-                <tr>
-                    <td>库内加工</td>
-                    <td>加工作业<span v-if="feeTotal['process_tax_fee']>0" class="badge badge-info">税</span></td>
-                    <td><a target="_blank"
-                           href="{{ route('settlementBills.processFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                    </td>
-                    <td>@{{ feeTotal['process_fee'] }}</td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['processFee']!==1"
-                              action="{{ 'processFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                 </tr>
+                 <tr>
+                     <td>库内加工</td>
+                     <td>加工作业<span v-if="feeTotal['process_tax_fee']>0" class="badge badge-info">税</span></td>
+                     <td><a target="_blank"
+                            href="{{ route('settlementBills.processFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                     </td>
+                     <td>@{{ feeTotal['process_fee'] }}</td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['processFee']!==1"
+                               action="{{ 'processFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>系统使用费</td>
-                    <td>系统使用费<span v-if="feeTotal['system_tax_fee']>0" class="badge badge-info">税</span></td>
-                    <td>-</td>
-                    <td>@{{ feeTotal['system_fee'] }}</td>
-                </tr>
-                <tr>
-                    <td>包材费</td>
-                    <td>包材费</td>
-                    <td><a target="_blank" href="{{ route('settlementBills.packingMaterialFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a></td>
-                    <td>@{{ feeTotal['packing_material_fee'] }}</td>
-                    <!--                   TODO -->
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['packingMaterialFee']!==1"
-                              action="{{ 'packingMaterialFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>系统使用费</td>
+                     <td>系统使用费<span v-if="feeTotal['system_tax_fee']>0" class="badge badge-info">税</span></td>
+                     <td>-</td>
+                     <td>@{{ feeTotal['system_fee'] }}</td>
+                 </tr>
+                 <tr>
+                     <td>包材费</td>
+                     <td>包材费</td>
+                     <td><a target="_blank" href="{{ route('settlementBills.packingMaterialFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a></td>
+                     <td>@{{ feeTotal['packing_material_fee'] }}</td>
+                     <!--                   TODO -->
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['packingMaterialFee']!==1"
+                               action="{{ 'packingMaterialFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>卸货费</td>
-                    <td>卸货费</td>
-                    <td><a target="_blank"
-                           href="{{ route('settlementBills.unloadFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                    </td>
-                    <td>@{{ feeTotal['unload_fee'] }}</td>
-                    <!--                   TODO -->
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['unloadFee']!==1"
-                              action="{{ 'unloadFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>卸货费</td>
+                     <td>卸货费</td>
+                     <td><a target="_blank"
+                            href="{{ route('settlementBills.unloadFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                     </td>
+                     <td>@{{ feeTotal['unload_fee'] }}</td>
+                     <!--                   TODO -->
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['unloadFee']!==1"
+                               action="{{ 'unloadFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>杂项费</td>
-                    <td class="m-0 p-0">
-                        <table class="table   m-0 p-0"
-                               v-for="sundryFee in feeTotal['sundry_information']">
-                            <tr>
-                                <td>@{{ sundryFee.type }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table m-0 p-0"
-                               v-for="sundryFee in feeTotal['sundry_information']">
-                            <tr>
-                                <td><a target="_blank"
-                                       href="{{ route('settlementBills.sundryFee', ['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <table class="table  m-0 p-0"
-                               v-for="sundryFee in feeTotal['sundry_information']">
-                            <tr>
-                                <td>@{{ sundryFee.fee }}</td>
-                            </tr>
-                        </table>
-                    </td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['sundryFee']!==1"
-                              action="{{ 'sundryFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>杂项费</td>
+                     <td class="m-0 p-0">
+                         <table class="table   m-0 p-0"
+                                v-for="sundryFee in feeTotal['sundry_information']">
+                             <tr>
+                                 <td>@{{ sundryFee.type }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table m-0 p-0"
+                                v-for="sundryFee in feeTotal['sundry_information']">
+                             <tr>
+                                 <td><a target="_blank"
+                                        href="{{ route('settlementBills.sundryFee', ['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                                 </td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <table class="table  m-0 p-0"
+                                v-for="sundryFee in feeTotal['sundry_information']">
+                             <tr>
+                                 <td>@{{ sundryFee.fee }}</td>
+                             </tr>
+                         </table>
+                     </td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['sundryFee']!==1"
+                               action="{{ 'sundryFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>理赔</td>
-                    <td>责任理赔</td>
-                    <td><a target="_blank"
-                           href="{{ route('settlementBills.indemnityFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
-                    </td>
-                    <td>@{{ feeTotal['indemnity_fee'] }}</td>
-                    <td class="m-0 p-0">
-                        <form v-if="isArchivedItems['indemnityFee']!==1"
-                              action="{{ 'indemnityFee/confirmBill' }}"
-                              method="post"
-                              onsubmit="return confirm('您确定要确认金额吗？');">
-                            {{ csrf_field() }}
-                            <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
-                            <input type="hidden" name="year" value="{{ $request['year']??'' }}">
-                            <input type="hidden" name="month" value="{{ $request['month']??'' }}">
-                            <span class="ml-4 mt-2">
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>理赔</td>
+                     <td>责任理赔</td>
+                     <td><a target="_blank"
+                            href="{{ route('settlementBills.indemnityFee',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">查看明细</a>
+                     </td>
+                     <td>@{{ feeTotal['indemnity_fee'] }}</td>
+                     <td class="m-0 p-0">
+                         <form v-if="isArchivedItems['indemnityFee']!==1"
+                               action="{{ 'indemnityFee/confirmBill' }}"
+                               method="post"
+                               onsubmit="return confirm('您确定要确认金额吗？');">
+                             {{ csrf_field() }}
+                             <input type="hidden" name="owner_id" value="{{ $request['owner_id']??'' }}">
+                             <input type="hidden" name="year" value="{{ $request['year']??'' }}">
+                             <input type="hidden" name="month" value="{{ $request['month']??'' }}">
+                             <span class="ml-4 mt-2">
                               <button type="submit" class="btn btn-success">
                                  确认金额
                             </button>
                             </span>
-                        </form>
-                        <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
+                         </form>
+                         <h5 v-else class="text-center pt-1 font-weight-bold">已确认</h5>
 
-                    </td>
-                </tr>
-                <tr>
-                    <td>优惠</td>
-                    <td>优惠政策</td>
-                    <td>@{{ feeTotal['discount_remark'] }}</td>
-                    <td>@{{ feeTotal['discount_fee'] }}</td>
-                </tr>
-                <tr>
-                    <td>税率</td>
-                    <td>@{{ feeTotal['tax_rate'] }}%</td>
-                </tr>
-                <tr>
-                    <td class="text-right font-weight-bolder" rowspan="3">
-                        公司名称：
-                        <br>
-                        开户银行：
-                        <br>
-                        公司账号：
-                    </td>
-                    <td class="font-weight-bolder" colspan="3">
-                        上海宝时供应链管理有限公司
-                        <br>
-                        中国工商银行股份有限公司上海市松江科技城支行
-                        <br>
-                        1001 7341 0900 0118 429
-                    </td>
-                </tr>
+                     </td>
+                 </tr>
+                 <tr>
+                     <td>优惠</td>
+                     <td>优惠政策</td>
+                     <td>@{{ feeTotal['discount_remark'] }}</td>
+                     <td>@{{ feeTotal['discount_fee'] }}</td>
+                 </tr>
+                 <tr>
+                     <td>税率</td>
+                     <td>@{{ feeTotal['tax_rate'] }}%</td>
+                 </tr>
+                 <tr>
+                     <td class="text-right font-weight-bolder" rowspan="3">
+                         公司名称：
+                         <br>
+                         开户银行：
+                         <br>
+                         公司账号：
+                     </td>
+                     <td class="font-weight-bolder" colspan="3">
+                         上海宝时供应链管理有限公司
+                         <br>
+                         中国工商银行股份有限公司上海市松江科技城支行
+                         <br>
+                         1001 7341 0900 0118 429
+                     </td>
+                 </tr>
+             </template>
             </table>
         </div>
     </div>