Просмотр исходного кода

解决退件中,因为问题件标记会取出全部问题件模型的BUG

LD 5 лет назад
Родитель
Сommit
459441228e

+ 1 - 1
app/Http/Controllers/OrderIssueController.php

@@ -46,7 +46,7 @@ class OrderIssueController extends Controller
         $qualityLabel = QualityLabel::all();
         $logistics = Logistic::all();
         $userWorkgroup = UserWorkgroup::all();
-        return view('order.issue.index', compact('owners', 'orderIssues', 'orderIssueType', 'qualityLabel','userWorkgroup','logistics'));
+        return view('order/issue/index', compact('owners', 'orderIssues', 'orderIssueType', 'qualityLabel','userWorkgroup','logistics'));
     }
 
     public function create()

+ 2 - 2
app/Http/Controllers/RejectedController.php

@@ -52,12 +52,12 @@ class RejectedController extends Controller
         /** @var RejectedService $application */
         $application = app('RejectedService');
         $rejectedBills= $application->paginate($request);
-        $issueIds = $application->返回有问题件的ID($request);
+//        $issueIds = $application->返回有问题件的ID($request);
         $owners = $ownerService->getSelection();
         $qualityLabels = $qualityLabelService->get();
         $logistics=$logisticService->getSelection();
         return view('rejected.search.general',compact('rejectedBills','owners','logistics',
-            'paginateParams','qualityLabels','issueIds'));
+            'paginateParams','qualityLabels'));
     }
     public function recycle(Request $request)
     {

+ 4 - 0
app/Http/Controllers/TestController.php

@@ -753,6 +753,10 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     {
         dd(Request::all());
     }
+    public function relating()
+    {
+        dd(OrderIssue::query()->where('id',182)->paginate()->total());
+    }
 
     public function updateOrdersWarehouse()
     {

+ 5 - 5
app/OrderIssue.php

@@ -27,11 +27,11 @@ class OrderIssue extends Model
      */
     protected $appends = [
 //        'secondLogisticNumber',
-        'createLog',
-        'endLog',
-        'processingTime',
-        'createUser',
-        'endUser',
+//        'createLog',
+//        'endLog',
+//        'processingTime',
+//        'createUser',
+//        'endUser',
     ];
 
     public function order()

+ 1 - 1
app/Services/OrderIssueWorkLoadService.php

@@ -84,7 +84,7 @@ class OrderIssueWorkLoadService
     }
 
     public function getOwners(){
-        $owner_ids = app('UserService')->getPermittingOwnerIds($user)??[];
+        $owner_ids = app('UserService')->getPermittingOwnerIds(auth()->user())??[];
         return Owner::whereIn('id', $owner_ids)->get();
     }
 

+ 1 - 1
app/Services/RejectedService.php

@@ -21,7 +21,7 @@ class RejectedService
     private function conditionQuery(array $param)
     {
         $user = Auth::user();
-        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality')->orderBy('rejected_bills.id', 'desc')->whereIn('rejected_bills.id_owner',
+        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality','orderIssue:logistic_number_return')->orderBy('rejected_bills.id', 'desc')->whereIn('rejected_bills.id_owner',
             $user ? app('UserService')->getPermittingOwnerIds($user) : []);
         $columnQueryRules = [
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],

+ 1 - 1
app/Services/UserService.php

@@ -26,7 +26,7 @@ class UserService
     }
     function getPermittingOwnerIds($user){
         return $this->cacheService->getOrExecute("user{$user['id']}->getPermittingOwnerIds",function()use($user){
-            return $user->getPermittingOwnerIdsAttribute();
+            return $user->getPermittingOwnerIdsAttribute() ?? [];
         });
     }
 }

+ 7 - 7
resources/views/order/issue/workload.blade.php

@@ -81,7 +81,7 @@
         let workLoadVue = new Vue({
             el: "#workLoad_div",
             data: {
-                workLoads: {!! $workLoads->toJson() !!}['data'],
+                workLoads: {!! $workLoads->append(['createUser','endUser','processingTime',])->toJson()??[] !!},
                 users:{!! $users->toJson() !!},
                 owners:{!! $owners->toJson() !!},
                 checkData: [],
@@ -95,17 +95,17 @@
                     order_issue_id: '{{$options['order_issue_id']}}',
                 },
                 page: {
-                    lastPage: {!! $workLoads->toJson() !!}['last_page'],
-                    curPage: {!!  $workLoads->toJson() !!}['current_page'],
-                    total: {!!  $workLoads->toJson() !!}['total'],
-                    nextPageUrl: {!!  $workLoads->toJson() !!}['next_page_url'],
-                    prevPageUrl: {!! $workLoads->toJson()  !!}['prev_page_url'],
-                    lastPageUrl: {!!  $workLoads->toJson() !!}['last_page_url'],
+                    lastPage: '{!! $workLoads->lastPage() !!}',
+                    curPage: '{!! $workLoads->currentPage() !!}',
+                    total: '{!! $workLoads->total() !!}',
+                    nextPageUrl: '{!! $workLoads->nextPageUrl() !!}',
+                    prevPageUrl: '{!! $workLoads->previousPageUrl() !!}',
                 },
                 isBtn:[],
                 form:'',
             },
             mounted: function () {
+
                 $('#workLoad_div').removeClass('d-none');
                 let users = [];
                 let owners = [];

+ 3 - 2
resources/views/rejected/search/general.blade.php

@@ -67,7 +67,8 @@
                             <input type="checkbox" v-model="rejectedBills_checkBoxes" :value="rejectedBill.id"/>
                         </td>
                         <td class="text-nowrap">
-                            <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="issueIds.includes(rejectedBill.id)" class="badge badge-pill badge-danger">问题件</span>
+{{--                            <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="issueIds.includes(rejectedBill.id)" class="badge badge-pill badge-danger">问题件</span>--}}
+                            <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="rejectedBill.order_issue" class="badge badge-pill badge-danger">问题件</span>
                         </td>
                         <td class="text-muted">
                             <span v-if="rejectedBill.is_checked==1" class="text-success">
@@ -197,7 +198,7 @@
                     {name:'{{$owner->id}}',value:'{{$owner->name}}'},
                     @endforeach
                 ],
-                issueIds:{!! $issueIds !!},
+                {{--issueIds:{!! $issueIds !!},--}}
                 logistics:[
                         @foreach($logistics as $logistic)
                     {name:'{{$logistic->id}}',value:'{{$logistic->name}}'},