权限修复

app/Http/Controllers/OrderController.php

@@ -58,7 +58,7 @@ class OrderController extends Controller
     }
 
     public function createRejectedBill(Request $request){
-        if(!Gate::allows('订单管理-订单-退货单生成')){ return ['success'=>false,'data'=>'您无权操作！'];  }
+        if(!Gate::allows('订单管理-订单-生成退货单')){ return ['success'=>false,'data'=>'您无权操作！'];  }
         /** @var OrderService $orderService */
         $orderService = app('orderService');
         $result = $orderService->get(['data' => $request->data]);
@@ -107,7 +107,7 @@ class OrderController extends Controller
     }
 
     public function isRejectedBillExist(Request $request){
-        if(!Gate::allows('订单管理-订单-退货单生成')){ return redirect(url('/'));  }
+        if(!Gate::allows('订单管理-订单-生成退货单')){ return redirect(url('/'));  }
         /** @var RejectedBillService $rejectedBillService */
         $rejectedBillService = app('rejectedBillService');
         $rejectedBills = $rejectedBillService->get(['order_number' => $request->data]);

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

@@ -27,7 +27,7 @@
                         <span class="btn btn-sm tooltipTarget ml-2" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
                               :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">冻结</span>
                         <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget" title="解除已冻结订单"
-                                :class="[checkData.length>0?'btn-dark':'btn-outline-danger']">解冻</button>
+                                :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
                         <span class="btn btn-sm tooltipTarget ml-2" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
                               :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">取消分配</span>
                         <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm "
@@ -35,8 +35,9 @@
                     @endcan
                     @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()">退货单生成</button>
+                    @can('订单管理-订单-生成退货单')
+                        <button class="btn btn-sm ml-2" :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" @click="isRejectedBillExist()"
+                            style="opacity: 0.7">生成退货单</button>
                     @endcan
                 </div>
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -705,7 +706,7 @@
                         .then(res=>{
                             if (res.data.success){
                                 tempTip.setDuration(2000);
-                                tempTip.showSuccess("退货单生成成功！");
+                                tempTip.showSuccess("生成退货单成功！");
                             }else{
                                 tempTip.setDuration(3000);
                                 tempTip.show(res.data.data);