忽略性提交 by 'zengjun'

app/Http/Controllers/OrderIssueController.php

@@ -13,20 +13,20 @@ class OrderIssueController extends Controller
 
     public function __construct()
     {
-        app()->bind("OrderIssueService",OrderIssueService::class);
+        app()->bind("orderIssueService",OrderIssueService::class);
     }
 
     /**
      * search orderissue
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
+        if(!Gate::allows('订单管理-问题件-查询')){ return redirect(url('/'));  }
+        $orderIssueService = app('orderIssueService');
         $owners = Owner::all();
+        $orderIssues = $orderIssueService->paginate($request);
 
-
-        return view('order/issue/index');
+        return view('order/issue/index',compact('owners','orderIssues'));
     }
 
     /**
@@ -38,7 +38,6 @@ class OrderIssueController extends Controller
 
     /**
      * 工作量
-     * @param Request $request
      */
     public function workLoad(Request $request){
         return view('order/issue/workload');
@@ -46,14 +45,13 @@ class OrderIssueController extends Controller
 
     /**
      * 标记问题订单
-     * @param Request $request
      */
     public function orderIssueTag(Request $request){
         if(!Gate::allows('订单管理-订单问题件生成')){ return ['success'=>false,'fail_info'=>'没有对应权限']; }
         if(!$request->input('orderNos')){
             return ['success'=>false,'fail_info'=>'没有传入的订单编号'];
         }
-        $orderIssueService = app('OrderIssueService');
+        $orderIssueService = app('orderIssueService');
         $meg =  $orderIssueService->orderIssueTag($request);
         return $meg;
     }
@@ -61,8 +59,6 @@ class OrderIssueController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function create()
     {
@@ -71,9 +67,6 @@ class OrderIssueController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
     {
@@ -82,9 +75,6 @@ class OrderIssueController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param  \App\OrderIssue  $orderIssue
-     * @return \Illuminate\Http\Response
      */
     public function show(OrderIssue $orderIssue)
     {
@@ -94,8 +84,6 @@ class OrderIssueController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\OrderIssue  $orderIssue
-     * @return \Illuminate\Http\Response
      */
     public function edit(OrderIssue $orderIssue)
     {

app/OrderIssue.php

@@ -19,29 +19,35 @@ class OrderIssue extends Model
     ];
 
     public function order(){
-        return $this->belongsTo('App/Order','order_id','id');
+        return $this->belongsTo('App\Order','order_id','id');
     }
 
     public function rejectedBill(){
-        return $this->belongsTo('App/RejectedBill','rejected_bill_id','id');
+        return $this->belongsTo('App\RejectedBill','rejected_bill_id','id');
     }
 
     public function orderIssueType(){
-        return $this->belongsTo('App/OrderIssueType','order_issue_type_id','id');
+        return $this->belongsTo('App\OrderIssueType','order_issue_type_id','id');
     }
 
     public function workgroup(){
-        return $this->belongsTo('App/UserWorkgroup','UserWorkgroup','id');
+        return $this->belongsTo('App\UserWorkgroup','UserWorkgroup','id');
     }
 
     public function secondOrder(){
-        return $this->belongsTo('App/Order','second_order_id','id');
+        return $this->belongsTo('App\Order','second_order_id','id');
+    }
+
+    public function orderIssueOnTop(){
+        return $this->hasOne('App\OrderOnTop','order_id','id');
     }
 
     public function setCreatorAttribute ($id,$user_id){
         Sign::updateOrCreate(['signable_type'=>'orders','signable_id'=>$id,'field'=>'creator','mark'=>$user_id]);
     }
 
+
+
     public function getCreatorAttribute(){
         return  $this->hasOne('App\Sign','signable_id','id')
             ->where('signable_type','orders')

app/OrderOnTop.php

@@ -12,5 +12,8 @@ class OrderOnTop extends Model
 
     protected $fillable = ['remarks','order_id'];
 
+    public function order(){
+        return $this->belongsTo('App\OrderIssue','order_id','id');
+    }
 
 }

app/Services/OrderIssueService.php

@@ -2,16 +2,10 @@
 
 namespace App\Services;
 
-use App\Authority;
-use App\Logistic;
-use App\OracleDOCOrderHeader;
 use App\OrderIssue;
-use App\Owner;
-use App\Shop;
-use App\Sign;
+use App\Services\common\QueryService;
 use App\Order;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class OrderIssueService
@@ -22,10 +16,46 @@ class OrderIssueService
         app()->bind("OrderService", OrderService::class);
     }
 
-    private function queryCondition(){
+    private function conditionQuery(Request $request)
+    {
+        // 订单日期
+        // 客户
+        // 是否完结
+        // 原始订单
+        // 最终状态
+        // 承运商赔偿金额
+        // 宝时赔偿金额
+
+
+        $query =  OrderIssue::with(['order','rejectedBill','orderIssueType','workgroup','secondOrder','orderIssueOnTop']);
+       /* if($request->input('created_at_start')){
+            $query->where('created_at','>=',$request->input('created_at_start').' 00:00:00');
+        }
+        if($request->input('created_at_end')){
+            $query->where('created_at','<=',$request->input('created_at_start').' 23：59：59');
+        }
+        if($request->input('logistic_indemnity_money')){
+            $query->where('logistic_indemnity_money',$request->input('logistic_indemnity_money'));
+        }
+        if($request->input('baoshi_indemnity_money')){
+            $query->where('baoshi_indemnity_money'.$request->input('baoshi_indemnity_money'));
+        }
+        if($request->input('final_status')){
+            $query->where('final_status',input('final_status'))
+        }*/
+        return $query;
 
     }
 
+    public function paginate(Request $request)
+    {
+        return $this->conditionQuery($request)->paginate($request->paginate ?? 50);
+    }
+
+    public function get(Request $request)
+    {
+
+    }
 
     public function orderIssueTag(Request $request)
     {
@@ -61,9 +91,8 @@ class OrderIssueService
     {
         $orderService = app('OrderService');
         $order = $orderService->createOrFindByOrderHead($ordeNo);
-
         $arr = [
-            'order_id' => $order->value('id'),
+            'order_id' => $order->id,
         ];
         return OrderIssue::create($arr);
     }

resources/js/queryForm/queryForm.js

@@ -368,6 +368,14 @@ const query = function getQueryForm(data) {
                 return map.value.includes(value);
             })
             fillSelectOption(select, data || condition.data);
+            if(data.length > 0 && data.length !== condition.data.length){
+                console.log(123);
+                console.log(data);
+                console.log(data[0].value);
+
+                _data[condition.name].select = data[0].name;
+                console.log( _data[condition.name].select);
+            }
             select.val(_data[condition.name].select);
         })
         select.change(function () {

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

@@ -106,8 +106,8 @@
                 $("#list").removeClass("d-none");
 
                 // let data = [[
-                //     {name:['startDate','endDate'],type:'dataTime_dataTime',tip:['订单起始日期','订单结束日期']},
-                //     {name:'owners_id',type:'search_select',tip:'选择要显示的客户',placeholder:['客户',''],
+                //     {name:['created_at_start','created_at_end'],type:'dataTime_dataTime',tip:['订单起始日期','订单结束日期']},
+                //     {name:'owner_id',type:'search_select',tip:'选择要显示的客户',placeholder:['客户',''],
                 //         data:[{name:'',value:''}]
                 //     },
                 //     {