Zhouzhendong 5 年之前
父節點
當前提交
a1eb1248cd
共有 2 個文件被更改,包括 9 次插入1 次删除
  1. 1 1
      app/Services/RejectedService.php
  2. 8 0
      resources/views/rejected/search/general.blade.php

+ 1 - 1
app/Services/RejectedService.php

@@ -13,7 +13,7 @@ Class RejectedService
 {
     private function conditionQuery(Request $request){
         $user = Auth::user();
-        $rejectedBills=RejectedBill::query()->with('items')->orderBy('id','desc')->whereIn('id_owner',
+        $rejectedBills=RejectedBill::query()->with('items','logistic','owner')->orderBy('id','desc')->whereIn('id_owner',
             $user?$user->getPermittingOwnerIdsAttribute():[]);
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],

+ 8 - 0
resources/views/rejected/search/general.blade.php

@@ -34,6 +34,14 @@
                     {{--                                            <option value="2">待推单</option>--}}
                     {{--                                        </select>--}}
                 @endcan
+                @can('退货管理-审核')
+                    <span class="btn btn-sm" @click="checkAll" style="cursor: pointer"
+                          :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">审核</span>
+                @endcan
+                @can('退货管理-编辑')
+                    <span class="btn btn-sm" @click="finishAll" style="cursor: pointer"
+                          :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">完结</span>
+                @endcan
                 <span class="dropdown">
                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget":class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"
                             data-toggle="dropdown" title="将勾选记录的入库状态设定为是或否,仅对未完结状态的记录有效">