订单管理-工单处理-三方添加退回单号

app/Http/Controllers/WorkOrderRelationRejectedBillController.php

@@ -21,7 +21,7 @@ class WorkOrderRelationRejectedBillController extends Controller
 
     public function storeApi(Request $request): array
     {
-        if (Gate::denies('订单管理-工单处理-宝时编辑')) {
+        if (Gate::denies('订单管理-工单处理-宝时编辑') && Gate::denies('订单管理-工单处理-承运商编辑') && Gate::denies('订单管理-工单处理-商家编辑')) {
             return ['success' => false, 'message' => '没有对应权限'];
         } else if (!$request->has('order_id', 'logistic_number_return')) {
             return ['success' => false, 'message' => '参数异常'];
@@ -44,7 +44,7 @@ class WorkOrderRelationRejectedBillController extends Controller
 
     public function destroyApi(Request $request): array
     {
-        if (Gate::denies('订单管理-工单处理-宝时编辑')) {
+        if (Gate::denies('订单管理-工单处理-宝时编辑') && Gate::denies('订单管理-工单处理-承运商编辑') && Gate::denies('订单管理-工单处理-商家编辑')) {
             return ['success' => false, 'message' => '没有对应权限'];
         } else if (!$request->has('order_id', 'logistic_number_return')) {
             return ['success' => false, 'message' => '参数异常'];
@@ -64,7 +64,7 @@ class WorkOrderRelationRejectedBillController extends Controller
 
     public function resetRelationApi(Request $request): array
     {
-        if (Gate::denies('订单管理-工单处理-宝时编辑')) {
+        if (Gate::denies('订单管理-工单处理-宝时编辑') && Gate::denies('订单管理-工单处理-承运商编辑') && Gate::denies('订单管理-工单处理-商家编辑')) {
             return ['success' => false, 'message' => '没有对应权限'];
         } else if ($request->has('order_id', 'logistic_number_return', 'update_logistic_number_return')) {
             return ['success' => false, 'message' => '参数异常'];

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

@@ -208,35 +208,32 @@
                                 <td v-text="item.status"></td>
                                 <td v-text="item.creator ? item.creator.name : ''"></td>
                                 <td v-text="item.result_explain ? item.result_explain: item.remark"></td>
-                                @can('订单管理-工单处理-宝时编辑')
-                                    <td class="text-muted child-layer-3-hide" >
-                                        <div class="form-inline">
-                                            <div class="form-group">
-                                                <input type="text" class="form-control form-text form-control-sm mr-1">
-                                                <button class="btn btn-sm btn-primary"
-                                                        @click="joinLogisticNumberReturn(item,$event,i)"
-                                                >添加
-                                                </button>
-                                            </div>
+                                <td class="text-muted child-layer-3-hide" >
+                                    <div class="form-inline">
+                                        <div class="form-group">
+                                            <input type="text" class="form-control form-text form-control-sm mr-1">
+                                            <button class="btn btn-sm btn-primary"
+                                                    @click="joinLogisticNumberReturn(item,$event,i)"
+                                            >添加
+                                            </button>
                                         </div>
-                                        <div v-if="item.order_issue_rejected_bills">
-                                            <div class="form-inline"
-                                                 v-for="relation in item.order_issue_rejected_bills">
-                                                <input type="text" class="form-control form-control-sm mt-1 mr-1"
-                                                       :value="relation.logistic_number_return"
+                                    </div>
+                                    <div v-if="item.order_issue_rejected_bills">
+                                        <div class="form-inline"
+                                             v-for="relation in item.order_issue_rejected_bills">
+                                            <input type="text" class="form-control form-control-sm mt-1 mr-1"
+                                                   :value="relation.logistic_number_return"
 {{--                                                       @change="reviseJoinRejectedBill(item,orderIssueRejectedBill.logistic_number_return,$event)"--}}
-                                                       @focus="displayDelBtn(true,$event)"
-                                                       @blur="displayDelBtn(false,$event)">
-                                                <button type="button" class="btn btn-sm btn-outline-danger mt-1 d-none"
-                                                        @click="unJoinLogisticNumberReturn(item,relation.logistic_number_return,i)"
-                                                >
-                                                    删
-                                                </button>
-                                            </div>
+                                                   @focus="displayDelBtn(true,$event)"
+                                                   @blur="displayDelBtn(false,$event)">
+                                            <button type="button" class="btn btn-sm btn-outline-danger mt-1 d-none"
+                                                    @click="unJoinLogisticNumberReturn(item,relation.logistic_number_return,i)"
+                                            >
+                                                删
+                                            </button>
                                         </div>
-
-                                    </td>
-                                @endcan
+                                    </div>
+                                </td>
 
                                 <td class="log-td"
                                     v-on:mouseover="showAddBtn($event)"