Bladeren bron

入库管理模块 自动填充问题

ajun 4 jaren geleden
bovenliggende
commit
47f57a3ec1

+ 2 - 1
app/Services/StoreCheckingReceiveService.php

@@ -18,10 +18,11 @@ class StoreCheckingReceiveService
      * @return Builder
      * @return Builder
      */
      */
     private function conditionQuery(Builder $query,array $params){
     private function conditionQuery(Builder $query,array $params){
+
         $columnQueryRules=[
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'owner' => ['multi' => ','],
+            'owner' => ['alias' => 'owner_id','multi' => ','],
             'id' => ['multi' => ','],
             'id' => ['multi' => ','],
             'asn' => ['batch' => ',']
             'asn' => ['batch' => ',']
         ];
         ];

+ 2 - 2
app/Services/StoreService.php

@@ -32,8 +32,8 @@ class StoreService
             'remark' => ['batch' => '','timeLimit' => 15],
             'remark' => ['batch' => '','timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at', 'endDate' => ' 23:59:59'],
             'created_at_end' => ['alias' => 'created_at', 'endDate' => ' 23:59:59'],
-            'owner' => ['multi' => ','],
-            'warehouse_id' => ['multi' => ','],
+            'owner' => ['alias' => 'owner_id','multi' => ','],
+            'warehouse' => ['alias' => 'warehouse_id','multi' => ','],
             'status' => ['multi' => ','],
             'status' => ['multi' => ','],
             'stored_method' => ['multi' => ','],
             'stored_method' => ['multi' => ','],
             'id' => ['multi' => ',']
             'id' => ['multi' => ',']

+ 1 - 1
resources/views/store/checkingReceive/mission.blade.php

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

+ 1 - 1
resources/views/store/inStorage/index.blade.php

@@ -89,7 +89,7 @@
                         {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
                         {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
                         {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的货主'],
                         {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的货主'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                             placeholder:['货主','定位或多选货主'],data:this.owners},
-                        {name:'warehouse_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的仓库'],
+                        {name:'warehouse',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的仓库'],
                             placeholder:['仓库','定位或多选仓库'],data:this.warehouses},
                             placeholder:['仓库','定位或多选仓库'],data:this.warehouses},
                         {name:'remark',type:'input',tip:'备注:可在两侧增加百分号(%)进行模糊搜索',placeholder: '备注'},
                         {name:'remark',type:'input',tip:'备注:可在两侧增加百分号(%)进行模糊搜索',placeholder: '备注'},
                     ],
                     ],