问题件 权限部分修改

app/Http/Controllers/OrderIssueController.php

@@ -101,7 +101,7 @@ class OrderIssueController extends Controller
 
     public function batchImport(Request $request)
     {
-        if (!Gate::allows('订单管理-订单问题件生成')) {
+        if (!Gate::allows('订单管理-问题件-导入-Excel导入')) {
             return redirect(url('/'));
         }
         $file = $request->file('file');
@@ -155,7 +155,7 @@ class OrderIssueController extends Controller
 
     public function excelImport()
     {
-        if (!Gate::allows('订单管理-订单问题件生成')) {
+        if (!Gate::allows('订单管理-问题件-导入')) {
             return redirect(url('/'));
         }
         return view('order.issue.import');
@@ -497,7 +497,7 @@ class OrderIssueController extends Controller
 
     public function importPasteDataApi(Request $request)
     {
-        if (!Gate::allows('订单管理-订单问题件生成'))
+        if (!Gate::allows('订单管理-问题件-导入-文本导入'))
             return ['success'=>false,'fail_info'=>'没有对应权限'];
         $rows = $request->input('rows');
         $logistic_numbers = [];

database/migrations/2020_11_19_113953_change_order_issue_auth.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeOrderIssueAuth extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        \App\Authority::query()->create(['name'=>'订单管理-问题件-导入','alias_name'=>'订单管理-问题件-导入']);
+
+        \App\Authority::query()->create(['name'=>'订单管理-订单-生成问题件','alias_name'=>'订单管理-订单-生成问题件']);
+
+        \App\Authority::query()->where('name','订单管理-订单问题件生成-文本导入')
+            ->update(['name'=>'订单管理-问题件-导入-Excel导入','alias_name'=>'订单管理-问题件-导入-Excel导入']);
+
+        \App\Authority::query()->create(['name'=>'订单管理-问题件-导入-文本导入','alias_name'=>'订单管理-问题件-导入-文本导入']);
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        \App\Authority::query()->whereIn('name',['订单管理-订单-生成问题件','订单管理-问题件-导入-文本导入','订单管理-问题件-导入'])->delete();
+        \App\Authority::query()->where('name','订单管理-问题件-导入-Excel导入')
+            ->update(['name'=>'订单管理-订单问题件生成-文本导入','alias_name'=>'订单管理-订单问题件生成-文本导入']);
+    }
+}

resources/views/order/index/delivering.blade.php

@@ -33,7 +33,7 @@
                         <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm "
                                 :class="[checkData.length>0?'btn-dark':'btn-outline-secondary']">重置快递获取标记</button>
                     @endcan
-                    @can('订单管理-订单问题件生成')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-2 btn-outline-primary "
+                    @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-2 btn-outline-primary "
                                                  :class="[checkData.length>0?'btn-dark':'btn-outline-primary']">标记问题件</button>@endcan
                     @can('订单管理-订单-生成退货单')
                         <button class="btn btn-sm ml-2" :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" @click="isRejectedBillExist()"

resources/views/order/issue/import.blade.php

@@ -19,7 +19,7 @@
                         <hr>
                     </div>
                 </div>
-                @can('订单管理-订单问题件生成-文本导入')
+                @can('订单管理-问题件-导入-文本导入')
                     <div class="form-group row text-center">
                         <div class="col-12 text-danger">
                             订单问题类别：同Excel文件导入所要求的订单问题类别一致<br/>
@@ -36,6 +36,7 @@
                     </div>
                     <hr/>
                 @endcan
+                @can('订单管理-问题件-导入-Excel导入')
                 <form action="{{url('order/issue/batchImport')}}" method="post" enctype="multipart/form-data" class="form"  target="_blank">
                     @csrf
                     <div class="form-group row">
@@ -58,6 +59,7 @@
                         </div>
                     </div>
                 </form>
+                @endcan
             </div>
         </div>
         <div class="modal fade" id="pasteData" role="dialog" tabindex="-1" aria-labelledby="pasteDataTetlie" aria-hidden="true">

resources/views/order/issue/menu.blade.php

@@ -14,7 +14,7 @@
                         <a class="nav-link" href="{{url('order/issue/create')}}" :class="{active:isActive('create',3)}">录入</a>
                     </li>
                 @endcan
-                @can('订单管理-订单问题件生成')
+                @can('订单管理-问题件-导入')
                     <li class="nav-item">
                         <a class="nav-link" href="{{url('order/issue/excelImport')}}" :class="{active:isActive('excelImport',3)}">导入</a>
                     </li>