Zhouzhendong 6 лет назад
Родитель
Сommit
5a203c6f54

+ 2 - 1
app/Http/Controllers/InventoryController.php

@@ -50,10 +50,11 @@ class InventoryController extends Controller
         $page=$request->input('page')??1;
         /*$sql.=" where data.r>".($page-1)*50;
         $sql.=" and data.r<=".$page*50;*/
-        $oracleActTransactingLogs=DB::connection('oracle')->select($sql);
+        $oracleActTransactingLogs=DB::connection('oracle')->select($sql);dd($oracleActTransactingLogs);
         $oracleActTransactingLogs=json_encode($oracleActTransactingLogs);
         $end=microtime(true);
         $date=$end-$start;
+
         return view('inventory.statement.changeInventory',compact('oracleActTransactingLogs','page','date'));
     }
 }

+ 9 - 3
database/migrations/2020_05_29_144440_add_inventory_authority.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Authority;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -7,7 +8,8 @@ use Illuminate\Support\Facades\Schema;
 class AddInventoryAuthority extends Migration
 {
     protected $authNames=[
-        "库存管理"
+        "库存管理",
+        "库存管理-动库报表"
     ];
     /**
      * Run the migrations.
@@ -16,7 +18,9 @@ class AddInventoryAuthority extends Migration
      */
     public function up()
     {
-        //
+        foreach ($this->authNames as $name){
+            if(!Authority::where('name',$name)->first())(new Authority(['name'=>$name,'alias_name'=>$name]))->save();
+        }
     }
 
     /**
@@ -26,6 +30,8 @@ class AddInventoryAuthority extends Migration
      */
     public function down()
     {
-        //
+        foreach ($this->authNames as $name){
+            Authority::where('name',$name)->delete();
+        }
     }
 }

+ 3 - 1
resources/views/inventory/statement/changeInventory.blade.php

@@ -26,6 +26,7 @@
     </form>
     <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2">
         <tr>
+            <th>序号</th>
             <th>货主</th>
             <th>库位</th>
             <th>产品编码</th>
@@ -40,7 +41,8 @@
             <th>在库数量</th>
             <th>占用数量</th>
         </tr>
-        <tr v-for="oracleActTransactingLog in oracleActTransactingLogs">
+        <tr v-for="(oracleActTransactingLog,i) in oracleActTransactingLogs">
+            <td>@{{ i+1 }}</td>
             <td class="text-primary">@{{ oracleActTransactingLog.货主 }}</td>
             <td class="text-muted">@{{ oracleActTransactingLog.库位 }}</td>
             <td class="text-muted">@{{ oracleActTransactingLog.产品编码 }}</td>

+ 1 - 1
resources/views/inventory/statement/menu.blade.php

@@ -4,7 +4,7 @@
     <div class="container-fluid nav3">
         <div class="card menu-third" >
             <ul class="nav nav-pills">
-                @can('库存管理')
+                @can('库存管理-动库报表')
                     <li class="nav-item">
                         <a class="nav-link text-dark" href="{{url('inventory/statement/changeInventory')}}" :class="{active:isActive('changeInventory',3)}">动库报表</a>
                     </li> @endcan