自动终审修改

处理结果查询

app/Filters/WorkOrderFilters.php

@@ -5,11 +5,13 @@ namespace App\Filters;
 
 use App\Order;
 use App\OrderIssue;
+use App\OrderIssueProcessLog;
 use App\OrderIssueType;
 use App\OrderPackage;
 use App\Traits\ModelSearchWay;
 use App\User;
 use App\WorkOrder;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -40,7 +42,8 @@ class WorkOrderFilters
         'client_code',
         'is_end',
         'status',
-        'process_progress'
+        'process_progress',
+        'order_issue_log'
     ];
     protected $array_filter;
     protected $params = [];
@@ -49,6 +52,9 @@ class WorkOrderFilters
     protected $orderQuery;
     protected $orderPackageQuery;
     protected $issueTypeQuery;
+    protected $orderIssueLogQuery;
+
+
 
     public function __construct(Request $request)
     {
@@ -200,6 +206,14 @@ class WorkOrderFilters
         return $this->issueTypeQuery;
     }
 
+    public function getOrderIssueLogQuery(): Builder
+    {
+        if (!$this->orderIssueLogQuery) {
+            $this->orderIssueLogQuery = OrderIssueProcessLog::query()->select('order_issue_id');
+        }
+        return $this->orderIssueLogQuery;
+    }
+
     public function id($id)
     {
         if (is_array($id)) $this->queryBuilder->whereIn('work_orders.id', $id);
@@ -300,6 +314,12 @@ class WorkOrderFilters
         $this->searchWay($this->queryBuilder,$process_progress,'work_orders.process_progress');
     }
 
+    public function order_issue_log($log_content){
+        $order_issue_process_log_query = OrderIssueProcessLog::query()->select('order_issue_id')->where('content', 'like', $log_content);
+        $order_issue_query = OrderIssue::query()->select('order_id')->whereIn('id',$order_issue_process_log_query);
+        $this->queryBuilder->whereIn('order_id',$order_issue_query);
+    }
+
     public function status($status){
         $status_list = [];
         if ($status == '承运商处理'){

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

@@ -456,36 +456,41 @@
                     {
                         name: 'process_progress', type: 'select', placeholder: '当前进度',
                         data: [
-                            {name: '已处理', value: '已处理'},
-                            {name: '已签收', value: '已签收'},
-                            {name: '拦截成功', value: '拦截失败'},
-                            {name: '拦截失败', value: '拦截失败'},
-
-                            {name: '已处理', value: '已处理'},
-                            {name: '无法更改', value: '无法更改'},
-                            {name: '更改成功', value: '更改成功'},
-                            {name: '更改失败', value: '更改失败'},
-
-                            {name: '已处理', value: '已处理'},
-                            {name: '已拦截', value: '已拦截'},
-                            {name: '丢件赔偿', value: '丢件赔偿'},
-                            {name: '签收成功', value: '签收成功'},
-
-                            {name: '已核实', value: '已核实'},
-                            {name: '补发', value: '补发'},
-                            {name: '不补发', value: '不补发'},
-                            {name: '已补发', value: '已补发'},
-                            {name: '已入库', value: '已入库'},
-
-                            {name: '核实全部破损', value: '核实全部破损'},
-                            {name: '核实部分破损', value: '核实部分破损'},
-                            {name: '核实未破损', value: '核实未破损'},
-                            {name: '待商家处理', value: '待商家处理'},
-                            {name: '待终审', value: '待终审'},
-                            {name: '完结', value: '完结'},
+                            {name:'商家创建',value:'商家创建'},
+                            {name:'宝时创建',value:'宝时创建'},
+                            {name:'成功已退回,不赔偿',value:'成功已退回,不赔偿'},
+                            {name:'拦截在途丢件，赔偿',value:'拦截在途丢件，赔偿'},
+                            {name:'无法拦截',value:'无法拦截'},
+                            {name:'已签收',value:'已签收'},
+                            {name:'已退回',value:'已退回'},
+                            {name:'更改成功',value:'更改成功'},
+                            {name:'更改失败',value:'更改失败'},
+                            {name:'丢件赔偿',value:'丢件赔偿'},
+                            {name:'签收成功',value:'签收成功'},
+                            {name:'已补发',value:'已补发'},
+                            {name:'已入库',value:'已入库'},
+                            {name:'全部赔偿',value:'全部赔偿'},
+                            {name:'部分赔偿',value:'部分赔偿'},
+                            {name:'不赔偿',value:'不赔偿'},
+                            {name:'拦截失败',value:'拦截失败'},
+                            {name:'拦截退回中',value:'拦截退回中'},
+                            {name:'已处理',value:'已处理'},
+                            {name:'无法更改',value:'无法更改'},
+                            {name:'已处理',value:'已处理'},
+                            {name:'已拦截',value:'已拦截'},
+                            {name:'核实全部破损',value:'核实全部破损'},
+                            {name:'核实部分破损',value:'核实部分破损'},
+                            {name:'核实未破损',value:'核实未破损'},
+                            {name:'正常派送',value:'正常派送'},
+                            {name:'无法取消拦截',value:'无法取消拦截'},
+                            {name:'宝时创建',value:'宝时创建'},
+                            {name:'待终审',value:'待终审'},
+                            {name:'终审完成',value:'终审完成'},
                         ]
                     },
                     {name: 'is_end', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已完成'}]},
+                ],[
+                    {name: 'order_issue_log', type: 'input', placeholder: '问题件处理日志'},
                 ]];
                 this.form = new query({
                     el: '#form_div',