Quellcode durchsuchen

库存管理 库存 页面自动填充修复

ajun vor 4 Jahren
Ursprung
Commit
72343452bf

+ 3 - 3
app/Filters/OrderPackageFilters.php

@@ -15,7 +15,7 @@ class OrderPackageFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = ['logistic_number', 'status', 'received_at_start',
-        'received_at_end', 'is_weighed', 'logistic_id', 'owner_id', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
+        'received_at_end', 'is_weighed', 'logistic', 'owner', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
 
     public function __construct(Request $request)
     {
@@ -82,7 +82,7 @@ class OrderPackageFilters
         }
     }
 
-    private function logistic_id($logistic_id)
+    private function logistic($logistic_id)
     {
         $logistic_ids = array_filter(preg_split('/[,, ]+/is', $logistic_id));
         $this->queryBuilder->whereIn('order_id', function ($query) use ($logistic_ids) {
@@ -90,7 +90,7 @@ class OrderPackageFilters
         });
     }
 
-    private function owner_id($owner_id)
+    private function owner($owner_id)
     {
         $owner_ids = array_filter(preg_split('/[,, ]+/is', $owner_id));
         $this->queryBuilder->whereIn('owner_id', $owner_ids);

+ 1 - 1
app/Services/InventoryCompareService.php

@@ -146,7 +146,7 @@ class InventoryCompareService
         }
         unset($param['differ']);
         $columnQueryRules=[
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'mission_code' => ['batch' => '','timeLimit' => 15],

+ 1 - 1
app/Services/InventoryDailyLogService.php

@@ -19,7 +19,7 @@ class InventoryDailyLogService
             $query->with('barcodes');
         }])->orderByDesc('inventory_daily_logs.id');
         $columnQueryRules=[
-            'owner_id' => ['multi' => ','],
+            'owner' => ['alias'=>'owner_id','multi' => ','],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'id' => ['multi' => ','],

+ 3 - 3
app/Services/PackageService.php

@@ -24,10 +24,10 @@ class PackageService
             return  $query->with(['owner','logistic','batch']);
         },'paperBox','measuringMachine'])
         ->whereIn('order_packages.owner_id',$ownerIds)->orderBy(TABLE.'id','DESC');
-        if ($params['owner_id'] ?? false){
-            $owner_id = explode(',',$params['owner_id']);
+        if ($params['owner'] ?? false){
+            $owner_id = explode(',',$params['owner']);
             $packages->whereIn('order_packages.owner_id',$owner_id);
-            unset($params['owner_id']);
+            unset($params['owner']);
         }
         if ($params['logistic_number'] ?? false){
             $packages->whereIn('logistic_number',array_values(array_filter(preg_split('/[,, ]+/is', $params['logistic_number']))));

+ 1 - 1
resources/views/inventory/statement/dailyLog.blade.php

@@ -119,7 +119,7 @@
                     [
                         {name:'created_at_start',type:'dateTime',tip:'选择创建日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
+                            name: 'owner', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                     ],

+ 1 - 1
resources/views/inventory/statement/inventoryCompare.blade.php

@@ -153,7 +153,7 @@
                         {name:'date_start',type:'dateTime',tip:'选择创建日期的起始时间'},
                         {name:'mission_code',type:'input',tip:'可支持多任务号,糊模查找需要在右边打上%符号',placeholder: '任务号'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                     ],

+ 2 - 2
resources/views/package/logistic/index.blade.php

@@ -254,14 +254,14 @@
 
                     ], [
                         {
-                            name: 'logistic_id',
+                            name: 'logistic',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的快递'],
                             placeholder: ['快递', '定位或多选快递'],
                             data: _this.logistics
                         },
                         {
-                            name: 'owner_id',
+                            name: 'owner',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的货主'],
                             placeholder: ['货主', '定位或多选货主'],

+ 1 - 1
resources/views/package/weigh/index.blade.php

@@ -96,7 +96,7 @@
                 let _this = this;
                 let data = [[
                     {name:'weighed_at_start',type:'time',tip:['选择显示称重日期的起始时间','选择显示称重日期的起始时间']},
-                    {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的客户'],
+                    {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
                     {name:'logistic_number',type:'input',tip:'可支持多快递单号,糊模查找需要在右边打上%符号',placeholder:'快递单号'},
                     {name:'is_weighed',type:'checkbox',tip:'是否已称重', data: [{name: 'true', value: '是否已称重'}]}