入库费数据填充

database/factories/OwnerStoreFeeDetailFactory.php

@@ -6,22 +6,26 @@ use App\OwnerStoreFeeDetail;
 use Faker\Generator as Faker;
 
 $factory->define(OwnerStoreFeeDetail::class, function (Faker $faker) {
+    $prices = [1.2, 1.3, 1.5, 1.5];
+    $work_names = ['入库费1', '入库费2'];
+
+    $price = $faker->randomElement($prices);
+    $amount = random_int(1, 100);
+
     return [
         //
         'owner_fee_detail_id' => random_int(1, 100),
-        'owner_price_operation_id' => random_int(1, 100),
-        'unit_id' => random_int(1, 11),
-        'unit_price' => mt_rand(10, 100),
-        'amount' => mt_rand(10, 100),
-        'owner_id' => 8,
-        'store_item_id' => random_int(1, 100),
-        'fee' => random_int(1, 100),//费用
+        'unit_id' => random_int(1, 3),
+        'unit_price' => $price,
+        'amount' => $amount,
+        'owner_id' => random_int(1, 100),
+        'fee' => $price * $amount,//费用
         'commodity_id' => random_int(1, 100),
         'packing_material_fee' => random_int(1, 100),//包材费
         'tax_fee' => random_int(1, 100),//税费
         'sku' => $faker->uuid,//sku
         'barcode' => $faker->uuid,//条码
-        'work_name' => $faker->name,//条码
+        'work_name' => $faker->randomElement($work_names),//作业名称
         'asn_code' => $faker->uuid,//条码
         'created_at' => now()->subMonth()->startOfMonth()->addDays(random_int(0, 28)),
         'updated_at' => now()->subMonth()->startOfMonth()->addDays(random_int(0, 28)),

database/seeds/OwnerStoreFeeDetailSeeder.php

@@ -18,17 +18,18 @@ class OwnerStoreFeeDetailSeeder extends Seeder
     {
         //
         OwnerStoreFeeDetail::query()->truncate();
-        Commodity::query()->truncate();
         $owners = \App\Owner::query()->limit(10)->get();
-        $commodities = factory(Commodity::class)->times(100)->create();
         foreach ($owners as $owner) {
-                $feeDetails = factory(OwnerFeeDetail::class)->times(100)->create(['owner_id' => $owner->id]);
-                foreach ($feeDetails as $feeDetail) {
-                    factory(OwnerStoreFeeDetail::class)->create([
+            $feeDetails = factory(OwnerFeeDetail::class)->times(5)->create(['owner_id' => $owner->id]);
+            $commodities = factory(Commodity::class)->times(5)->create();
+            foreach ($feeDetails as $feeDetail) {
+                foreach ($commodities as $commodity) {
+                    factory(OwnerStoreFeeDetail::class)->times(10)->create([
                         'owner_id' => $owner->id,
                         'owner_fee_detail_id' => $feeDetail->id,
-                        'commodity_id' => $commodities->random(1)[0]->id,
+                        'commodity_id' => $commodity->id,
                     ]);
+                }
             }
         }
 

resources/views/finance/settlementBills/storeFee/report/index.blade.php

@@ -73,7 +73,7 @@
                     </div>
                 </div>
             </div>
-            <table class="table table-sm text-nowrap table-hover table-bordered table-striped">
+            <table class="table table-striped table-sm text-nowrap table-hover table-bordered">
                 <tr>
                     <th>名称</th>
                     <th>单价</th>
@@ -187,9 +187,6 @@
                 _this.form.init();
             },
             methods: {
-                calRowspan(type) {
-                    return this.reports.filter(item => item.type === type).length;
-                },
                 reportExport(sign) {
                     let url = '{{url('finance/settlementBills/storeFee/report/export')}}';
                     let token = '{{ csrf_token() }}';