人事管理 临时工 卸货 绩效 设置 页面自动填充

app/Filters/DischargeTaskFilters.php

@@ -11,7 +11,7 @@ class DischargeTaskFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = [
-        'owner_id', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitator_id','created_range'
+        'owners', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitators','created_range','owners'
     ];
     protected $array_filter;
     protected $params = [];
@@ -60,7 +60,7 @@ class DischargeTaskFilters
         return $query;
     }
 
-    public function owner_id($owner_id)
+    public function owners($owner_id)
     {
         $this->queryBuilder->where('discharge_tasks.owner_id',$owner_id);
     }
@@ -99,7 +99,7 @@ class DischargeTaskFilters
         $this->queryBuilder->whereIn('discharge_tasks.id',$ids);
     }
 
-    public function facilitator_id($facilitator_id)
+    public function facilitators($facilitator_id)
     {
         $this->searchWay($this->queryBuilder,$facilitator_id,'discharge_tasks.facilitator_id');
     }

app/Http/Controllers/UserLaborController.php

@@ -26,7 +26,7 @@ class UserLaborController extends Controller
     public function index(Request $request)
     {
         $userLabors=UserLabor::query()->with('userDetail')->orderBy('user_id','desc');
-        $full_name = $request->user_name ?? false;
+        $full_name = $request->name ?? false;
         if ($full_name){
             $userLabors->whereHas('userDetail',function($query)use($full_name){
                 if (strpos($full_name, ',') || strpos($full_name, '，') || strpos($full_name, ' ')) {

app/Services/OwnerReportService.php

@@ -22,21 +22,21 @@ class OwnerReportService
         $columnQueryRules = [
             'counting_month_start' => ['alias' => 'counting_month', 'startDate' => '-01'],
             'counting_month_end' => ['alias' => 'counting_month', 'endDate' => '-31'],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
         ];
-        if ($params["owner_group_id"] ?? false){
+        if ($params["owner_groups"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){
                 /** @var Builder $query */
-                $query->where("user_owner_group_id",$params["owner_group_id"]);
+                $query->where("user_owner_group_id",$params["owner_groups"]);
             });
-            unset($params["owner_group_id"]);
+            unset($params["owner_groups"]);
         }
-        if ($params["customer_id"] ?? false){
+        if ($params["customers"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){
                 /** @var Builder $query */
-                $query->where("customer_id",$params["customer_id"]);
+                $query->where("customer_id",$params["customers"]);
             });
-            unset($params["customer_id"]);
+            unset($params["customers"]);
         }
         if ($params["status"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){

resources/views/maintenance/userLabor/index.blade.php

@@ -135,7 +135,7 @@
             mounted(){
                 let data=[
                    [
-                       {name: 'user_name', type: 'input', tip: '可支持多姓名查找,模糊搜索可在左侧增加百分号(%)进行', placeholder: '姓名'},
+                       {name: 'name', type: 'input', tip: '可支持多姓名查找,模糊搜索可在左侧增加百分号(%)进行', placeholder: '姓名'},
                    ]
                 ];
                 this.form = new query({

resources/views/personnel/discharge/statement/index.blade.php

@@ -61,7 +61,7 @@
                 let status = [{name: 0, value: '创建'}, {name: 1, value: '接单'}, {name: 2, value: '作业中'}, {name: 3, value: '完成'}];
                 let data = [[
                     {
-                        name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                        name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },
@@ -71,7 +71,7 @@
                     {name: 'status', type: 'select', tip: '状态', data: status, placeholder: '状态'},
                 ], [
                     {
-                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
+                        name: 'facilitators', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
                         placeholder: ['装卸队', '定位或多选装卸队'],
                         data: _this.facilitators
                     },

resources/views/personnel/discharge/task/index.blade.php

@@ -102,7 +102,7 @@
                 let _this = this;
                 let data = [[
                     {
-                        name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                        name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },

resources/views/personnel/report.blade.php

@@ -142,12 +142,12 @@
                 $('#container').removeClass('d-none');
                 let data=[
                     [
-                        {name:'owner_group_id',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.workgroup},
+                        {name:'owner_groups',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.workgroup},
                         {name:'counting_month_start',type:'dateMonth',tip:'起始结算月',placeholder: '----年--月'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
+                        {name:'owners',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.owners},
                     ],[
-                        {name:'customer_id',type:'select_multiple_select',tip:['客户','定位或多选客户'],placeholder: ['客户','定位或多选客户'],data:this.customers},
+                        {name:'customers',type:'select_multiple_select',tip:['客户','定位或多选客户'],placeholder: ['客户','定位或多选客户'],data:this.customers},
                         {name:'counting_month_end',type:'dateMonth',tip:'结束结算月',placeholder: '----年--月'},
                         {name:'status',type:'select',placeholder:'状态',data:this.status},
                     ],