导出问题件条件缺失

app/Services/OrderIssueService.php

@@ -121,6 +121,9 @@ class OrderIssueService
         if (!isset($condition)) {
             $condition = $arr;
         }
+        if ($condition['id'] ?? false){
+            $query->whereIn('order_issues.id', explode(',',$condition['id']));
+        }
         if (isset($condition['created_at_start'])) {
             $query->where('order_issues.created_at', '>=', $condition['created_at_start'] . " 00:00:00");
         }
@@ -204,44 +207,25 @@ class OrderIssueService
                 ->selectRaw('order_issue_types.`name` order_issue_type_name')
             ->leftJoin('orders','order_issues.order_id','orders.id')
                 ->selectRaw('orders.id order_id,orders.address,orders.district,orders.city,orders.province,orders.consignee_phone,orders.consignee_name,orders.client_code,orders.created_at order_created_at')
-          /*  ->leftJoin('order_packages','order_packages.order_id','orders.id')
-                ->selectRaw('order_packages.id order_package_id,order_packages.logistic_number order_package_logistic_name')
-            ->leftJoin('order_package_commodities','order_packages.id','order_package_commodities.order_package_id')
-                ->selectRaw('order_package_commodities.id order_package_commodity_id,order_package_commodities.amount commodity_amount')
-            ->leftJoin('commodities','order_package_commodities.commodity_id','commodities.id')
-                ->selectRaw('commodities.name commodity_name,commodities.sku commodity_sku')*/
             ->leftJoin('logistics','logistics.id','orders.logistic_id')
                 ->selectRaw('logistics.name logistic_name')
             ->leftJoin('owners','owners.id','orders.owner_id')
                 ->selectRaw('owners.name owner_name')
             ->leftJoin('shops','orders.shop_id','shops.id')
                 ->selectRaw('shops.name shop_name')
-/*            ->leftJoin('rejected_bills','order_issues.rejected_bill_id','rejected_bills.id')*/
-            /*->leftJoin('rejected_bill_items','rejected_bills.id','rejected_bill_items.id_rejected_bill')
-                ->selectRaw('rejected_bill_items.id rejected_bill_item_id,rejected_bill_items.remark,rejected_bill_items.amount rejected_bill_amount,rejected_bill_items.name_goods,rejected_bill_items.barcode_goods')*/
-            /*->leftJoin('order_issue_process_logs','order_issues.id','order_issue_process_logs.order_issue_id')
-                ->selectRaw('order_issue_process_logs.content log_content,order_issue_process_logs.type log_type')
-            ->leftJoin('users','order_issue_process_logs.user_id','users.id')
-                ->selectRaw('users.name user_name')*/
             ->leftJoin('orders as s_o','s_o.id','order_issues.second_order_id')
                 ->selectRaw('s_o.id s_o_id,s_o.client_code s_o_client_code')
-            /*->leftJoin('order_packages as s_o_p','s_o_p.order_id','s_o.id')
-                ->selectRaw('s_o_p.id s_o_p_id,s_o_p.logistic_number')
-            ->leftJoin('order_package_commodities as s_o_p_c','s_o_p_c.order_package_id','s_o_p.id')
-                ->selectRaw('s_o_p_c.id s_o_p_c_id,s_o_p_c.amount s_o_p_c_amount')
-            ->leftJoin('commodities as s_c','s_o_p_c.commodity_id','s_c.id')
-                ->selectRaw('s_c.sku s_c_sku,s_c.name s_c_name')*/
             ->leftJoin('logistics as s_logistics','s_o.logistic_id','s_logistics.id')
                 ->selectRaw('s_logistics.name s_logistics_name')
             ->leftJoin('user_workgroups','user_workgroups.id','order_issues.user_workgroup_id')
                 ->selectRaw('user_workgroups.name user_workgroup_name')
             ->sql();
-            return compact('orderPackageSql','secondOrderPackageSql','orderIssueSql','rejectedBillItemSql','logSql');
+        return compact('orderPackageSql','secondOrderPackageSql','orderIssueSql','rejectedBillItemSql','logSql');
     }
 
     public function paginate(array $arr)
     {
-        return $query = $this->getConditionQuery($arr);
+        return $query = $this->getConditionQuery($arr)->paginate($arr['paginate'] ?? 50);
 
     }
 

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

@@ -568,7 +568,6 @@
             mounted: function () {
                 $('.tooltipTarget').tooltip({'trigger': 'hover'});
                 $('#list').removeClass("d-none");
-                console.log(this.orderIssues);
                 let _this = this;
                 let final_status = [{name: '已解决', value: '已解决'}, {name: '待退回', value: '待退回'}, {
                     name: '退回中',