Преглед изворни кода

二次加工 查询 统计 页面自动填充修复

ajun пре 4 година
родитељ
комит
31adb3e1e8

+ 1 - 1
app/Services/ProcessService.php

@@ -59,7 +59,7 @@ class ProcessService
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'code' => ['batch' => ''],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id' ,'multi' => ','],
             'id' => ['multi' => ','],
         ];
         $processes = app(QueryService::class)->query($params,$processes,$columnQueryRules,"processes");

+ 3 - 3
app/Services/ProcessStatisticService.php

@@ -15,12 +15,12 @@ class ProcessStatisticService
     private function conditionQuery(array $params){
         $query = ProcessStatistic::with(['process.owner','operatorLog.user'])->orderBy('process_statistics.process_id','DESC')
             ->has('process');
-        if ($params["owner_id"] ?? false){
-            $owner_id=$params["owner_id"];
+        if ($params["owners"] ?? false){
+            $owner_id=$params["owners"];
             $query=$query->whereHas('process',function (Builder $builder)use($owner_id){
                 $builder->where('owner_id',$owner_id);
             });
-            unset($params["owner_id"]);
+            unset($params["owners"]);
         }
         if ($params["code"] ?? false){
             $code=$params["code"];

+ 1 - 1
resources/views/process/index.blade.php

@@ -535,7 +535,7 @@
                     [
                         {name: 'date_start', type: 'dateTime', tip: '选择显示指定日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                         {name: 'wms_code', type: 'input', tip: '可支持多单据号,模糊搜索可在两侧增加百分号(%)进行', placeholder: '单据号'},

+ 1 - 1
resources/views/process/statistic.blade.php

@@ -85,7 +85,7 @@
                     [
                         {name: 'started_at_start', type: 'dateTime', tip: '选择显示指定日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                         {name: 'process_method_id', type: 'select', placeholder: '加工类型', data: this.processMethods},