Ver Fonte

工单处理->添加退回状态筛选

loustwo há 4 anos atrás
pai
commit
ef84c225bd

+ 8 - 0
app/Filters/WorkOrderFilters.php

@@ -4,6 +4,7 @@
 namespace App\Filters;
 
 use App\Order;
+use App\OrderDetail;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderIssueType;
@@ -57,6 +58,7 @@ class WorkOrderFilters
         'bao_shi_express_remission',
         'user_owner_group_id',
         'user_work_group_id',
+        'rejecting_status',
     ];
     protected $array_filter;
     protected $params = [];
@@ -69,6 +71,7 @@ class WorkOrderFilters
     protected $orderIssueQuery;
     protected $shopQuery;
     protected $workOrderProcessLogQuery;
+    protected $orderDetailQuery;
 
     public function __construct(Request $request)
     {
@@ -465,4 +468,9 @@ class WorkOrderFilters
         });
     }
 
+    public function rejecting_status($rejecting_status)
+    {
+        $query = OrderDetail::query()->select('order_id')->where('rejecting_status',$rejecting_status);
+        $this->queryBuilder->whereIn('order_id',$query);
+    }
 }

+ 8 - 0
resources/views/order/workOrder/index.blade.php

@@ -639,6 +639,13 @@
                 },
                 order_info_commodities_key: 101,
                 workOrderRemissionType: ['原单减免', '补发减免', '全部减免'],
+                rejectingStatus:[
+                    {name:'无',value:'无'},
+                    {name:'未退回',value:'未退回'},
+                    {name:'全部退回',value:'全部退回'},
+                    {name:'部分退回',value:'部分退回'},
+                    {name:'差异退回',value:'差异退回'},
+                    ],
             },
             computed: {},
             mounted() {
@@ -735,6 +742,7 @@
                         tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的仓库责任方'],
                         placeholder: ['仓库责任方', '定位或多选仓库责任方'],data:this.userWorkgroup},
                     {name: 'user_owner_group_id', type: 'select', placeholder: '项目责任方',data:this.userOwnerGroup},
+                    {name: 'rejecting_status', type: 'select', placeholder: '退回状态',data:this.rejectingStatus},
                 ],[
                     {name: 'order_issue_log', type: 'input', placeholder: '问题件处理日志'},
                     {