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

跟踪件 应送达时间可以筛选 并添加索引

ajun пре 5 година
родитељ
комит
a0375b323e

+ 5 - 0
app/Services/OrderTrackingService.php

@@ -44,10 +44,15 @@ class OrderTrackingService
         $queryParam = [
             'start_at' => ['alias' => 'pick_up_at', 'startDate' => ' 00:00:00'],
             'end_at' => ['alias' => 'pick_up_at', 'endDate' => ' 23:59:59'],
+            'start_planning_sent_at' => ['alias' => 'planning_sent_at', 'startDate' => ' 00:00:00'],
+            'end_planning_sent_at' => ['alias' => 'planning_sent_at', 'endDate' => ' 23:59:59'],
         ];
+
         $param = [
             'start_at' => $params['start_at'] ?? '',
             'end_at' => $params['end_at'] ?? '',
+            'start_planning_sent_at' => $params['start_planning_sent_at'] ?? '',
+            'end_planning_sent_at' => $params['end_planning_sent_at'] ?? '',
         ];
 
         $query = app(QueryService::class)->query($param, $query, $queryParam);

+ 32 - 0
database/migrations/2020_11_03_162118_add_planning_sent_at_index_to_order_trackings_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPlanningSentAtIndexToOrderTrackingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_trackings', function (Blueprint $table) {
+            $table->index('planning_sent_at','order_trackings_planning_sent_at_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('order_trackings', function (Blueprint $table) {
+            $table->dropIndex('order_trackings_planning_sent_at_index');
+        });
+    }
+}

+ 2 - 0
resources/views/order/tracking/index.blade.php

@@ -316,6 +316,7 @@
                     [
                         {name:'start_at',type:'dateTime',tip:'起始日期',placeholder:'起始日期'},
                         {name:'owner_id',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'], placeholder: ['货主', '定位或多选货主'], data: _this.owners},
+                        {name:'start_planning_sent_at',type:'dateTime',tip:'应送达时间开始',placeholder:'应送达时间开始'},
                         {name:'client_code',type:'input',tip:'订单号',placeholder:'订单号'},
                         {name:['client','addtime'],type:'input_select',tip:['右侧选择查询范围,默认为一月内','查询范围,范围越短搜索越快'],placeholder: ['客户',''],
                             data:selectDate1, rules:[{son:{addtime:{default:'31',required_without_all_if:['start_at','end_at']}}},
@@ -327,6 +328,7 @@
                     [
                         {name:'end_at',type:'dateTime',tip:'结束日期',placeholder: '结束日期'},
                         {name:'logistic_number',type:'input',tip:'运输单号',placeholder:'运输单号'},
+                        {name:'end_planning_sent_at',type:'dateTime',tip:'应送达时间结束',placeholder:'应送达时间结束'},
                         {name:'logistic_id',type:'select',tip:'物流方式',placeholder:'物流方式',data:this.logistics},
                         {name:'sku',type:'input',tip:'SKU',placeholder: '商品编号'},
                     ]