haozi 5 лет назад
Родитель
Сommit
5f195ab94a

+ 1 - 1
app/Services/InventoryCompareService.php

@@ -146,7 +146,7 @@ class InventoryCompareService
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'mission_code' => ['timeLimit' => 15],
-            'custom_location' => ['timeLimit' => 15],
+            'custom_location' => ['like' => '','timeLimit' => 15],
             'id' => ['multi' => ','],
         ];
         $inventoryCompares = app(QueryService::class)->query($param,$inventoryCompares,$columnQueryRules,'inventory_compares');

+ 3 - 3
resources/views/customer/project/report.blade.php

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

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

@@ -199,7 +199,6 @@
                     ],
                     [
                         {name:'date_end',type:'dateTime',tip:'选择创建日期的结束时间'},
-                        {name:'custom_location',type:'input',tip:'属性仓:糊模查找需要在左边打上%符号',placeholder: '属性仓'},
                         {name: 'differ', type: 'select', placeholder: '差值', data: this.differ},
                     ],
                 ];
@@ -218,7 +217,7 @@
                     {name: 'commodity_name', value: '商品名称'},
                     {name:'commodity_sku',value: '商品编码'},
                     {name: 'commodity_barcodes', value: '商品条码', neglect: true},
-                    {name: 'custom_location', value: '属性仓', neglect: true},
+                    {name: 'amount', value: '属性仓', neglect: true},
                     {name: 'quality', value: '质量状态', neglect: true},
                     {name: 'amount_in_sys',value: '宝时库存', neglect: true},
                     {name: 'amount_in_compare', value: '参考库存', neglect: true},