Merge branch 'yang'

app/Filters/OrderIssueFilters.php

@@ -251,7 +251,12 @@ class OrderIssueFilters
 
     public function logistic($logistic_id)
     {
-        $this->getOrderQuery()->where('orders.logistic_id',$logistic_id);
+        if (strpos($logistic_id, ',') || strpos($logistic_id, '，') || strpos($logistic_id, ' ')) {
+            $arr = array_filter(preg_split('/[,， ]+/is', $logistic_id));
+            $this->getOrderQuery()->whereIn('orders.logistic_id',$arr);
+        } else {
+            $this->getOrderQuery()->where('orders.logistic_id',$logistic_id);
+        }
     }
 
     public function custom_code($custom_code)

app/Http/Controllers/CustomerController.php

@@ -18,6 +18,7 @@ use App\Services\OwnerBillReportService;
 use App\Services\OwnerReportService;
 use App\Services\OwnerService;
 use App\Store;
+use App\UserWorkgroup;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
@@ -100,7 +101,8 @@ class CustomerController extends Controller
         $customers = app('CustomerService')->getSelection();
         $ownerGroups = app('UserOwnerGroupService')->getSelection();
         $params = request()->input();
-        return response()->view('customer.project.index',compact("owners","models","customers","ownerGroups","params"));
+        $userWorkGroups = UserWorkgroup::all();
+        return response()->view('customer.project.index',compact("owners","models","customers","ownerGroups","params",'userWorkGroups'));
     }
 
     public function projectIndexExport(Request $request)
@@ -551,7 +553,7 @@ class CustomerController extends Controller
         $month = request("month");
         $owner = request("owner");
         $sql = <<<sql
-SELECT owner_id,SUM(IFNULL(work_fee,0)) AS work_fee,SUM(IFNULL(logistic_fee,0)) AS logistic_fee 
+SELECT owner_id,SUM(IFNULL(work_fee,0)) AS work_fee,SUM(IFNULL(logistic_fee,0)) AS logistic_fee
 FROM owner_fee_details WHERE worked_at LIKE ? AND ((type = '发货' AND logistic_fee IS NOT NULL AND work_fee IS NOT NULL) OR (type <> '发货' AND work_fee IS NOT NULL))
 sql;
         if ($owner && count($owner)>0){

app/Services/OwnerService.php

@@ -267,7 +267,10 @@ class OwnerService
                 else $builder->where('owner_id',$param);
                 continue;
             }
-
+            if ($column == 'user_work_group'){
+                $builder->where("user_workgroup_id",$param);
+                continue;
+            }
             if (is_array($param))$builder->whereIn($column,$param);
             else $builder->where($column,$param);
         }

resources/views/customer/project/index.blade.php

@@ -133,20 +133,23 @@
                 ownerSubjection:{!! json_encode(\App\Owner::subjection,JSON_UNESCAPED_UNICODE) !!},
                 selectTr:'',
                 id:"",
+                user_work_groups:  [@foreach($userWorkGroups as $userWorkGroup){name:"{{$userWorkGroup->id}}",value:"{{$userWorkGroup->name}}"},@endforeach]
             },
             mounted(){
                 $('#container').removeClass('d-none');
                 let data=[
                     [
                         {name:'user_owner_group_id',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.ownerGroups},
+                        {name:'user_work_group',type:'select',tip: '仓库小组搜索',placeholder: '仓库小组',data:this.user_work_groups},
+
                         {name:'created_at_start',type:'time',tip:['选择显示创建日期的起始时间','']},
                         {name:'ids',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.models},
                         {name:'contract_number',type:'input',tip: '合同号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '合同号'},
                     ],[
                         {name:'customers',type:'select_multiple_select',tip:['客户','定位或多选项目'],placeholder: ['客户','定位或多选项目'],data:this.customers},
-                        {name:'created_at_end',type:'time',tip:['选择显示创建日期的结束时间','']},
                         {name:'using_type',type:'select',placeholder: '用仓类型',data:[{name:"常温",value:"常温"},{name:"恒温",value:"恒温"}]},
+                        {name:'created_at_end',type:'time',tip:['选择显示创建日期的结束时间','']},
                     ],
                 ];
                 this.form = new query({