Procházet zdrojové kódy

临时提交 可忽略

ajun před 5 roky
rodič
revize
7c4bd418f2

+ 0 - 34
app/Http/Controllers/OrderIssueProcessLogController.php

@@ -10,40 +10,6 @@ use Illuminate\Support\Facades\Gate;
 class OrderIssueProcessLogController extends Controller
 {
 
-    public function index()
-    {
-        //
-    }
-
-    public function create()
-    {
-        //
-    }
-
-    public function store(Request $request)
-    {
-        //
-    }
-
-    public function show(OrderIssueProcessLog $orderIssueProcessLog)
-    {
-        //
-    }
-
-    public function edit(OrderIssueProcessLog $orderIssueProcessLog)
-    {
-        //
-    }
-
-    public function update(Request $request, OrderIssueProcessLog $orderIssueProcessLog)
-    {
-        //
-    }
-
-    public function destroy(OrderIssueProcessLog $orderIssueProcessLog)
-    {
-        //
-    }
 
     public function apiStore(Request $request)
     {

+ 0 - 74
app/Http/Controllers/OrderIssueTypeController.php

@@ -7,79 +7,5 @@ use Illuminate\Http\Request;
 
 class OrderIssueTypeController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\OrderIssueType  $orderIssueType
-     * @return \Illuminate\Http\Response
-     */
-    public function show(OrderIssueType $orderIssueType)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\OrderIssueType  $orderIssueType
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(OrderIssueType $orderIssueType)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\OrderIssueType  $orderIssueType
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, OrderIssueType $orderIssueType)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\OrderIssueType  $orderIssueType
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(OrderIssueType $orderIssueType)
-    {
-        //
-    }
 }

+ 0 - 73
app/Http/Controllers/OrderPackageCommoditiesController.php

@@ -7,79 +7,6 @@ use Illuminate\Http\Request;
 
 class OrderPackageCommoditiesController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\OrderPackageCommodities  $orderPackageCommodities
-     * @return \Illuminate\Http\Response
-     */
-    public function show(OrderPackageCommodities $orderPackageCommodities)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\OrderPackageCommodities  $orderPackageCommodities
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(OrderPackageCommodities $orderPackageCommodities)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\OrderPackageCommodities  $orderPackageCommodities
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, OrderPackageCommodities $orderPackageCommodities)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\OrderPackageCommodities  $orderPackageCommodities
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(OrderPackageCommodities $orderPackageCommodities)
-    {
-        //
-    }
 }

+ 0 - 73
app/Http/Controllers/OrderPackageController.php

@@ -7,79 +7,6 @@ use Illuminate\Http\Request;
 
 class OrderPackageController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\OrderPackage  $orderPackage
-     * @return \Illuminate\Http\Response
-     */
-    public function show(OrderPackage $orderPackage)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\OrderPackage  $orderPackage
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(OrderPackage $orderPackage)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\OrderPackage  $orderPackage
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, OrderPackage $orderPackage)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\OrderPackage  $orderPackage
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(OrderPackage $orderPackage)
-    {
-        //
-    }
 }

+ 29 - 0
app/Http/Controllers/OrderTrackingController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\OrderTracking;
+use App\Owner;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+
+class OrderTrackingController extends Controller
+{
+
+    public function index(Request $request)
+    {
+        if(!Gate::allows('订单管理-跟踪')){ return redirect(url('/'));  }
+        $owners = Owner::all();
+
+        return view('order.tracking.index',compact('owners'));
+    }
+
+
+    public function export(){
+
+    }
+
+    public function updateApi(Request $request){
+
+    }
+}

+ 50 - 0
app/Http/Controllers/OrderTrackingOwnerController.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\OrderTrackingOwner;
+use App\Owner;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+
+class OrderTrackingOwnerController extends Controller
+{
+
+    public function updateStatusApi(Request $request)
+    {
+        if (!Gate::allows('订单管理-跟踪-监听')) {
+            return ['success' => false, 'fail_info' => '权限不足'];
+        }
+        if($request->filled('owner_id') || $request->filled('status')){
+            return ['success' => false, 'fail_info' => '没有传入对应参数'];
+        }
+
+        $orderTrackingOwner = OrderTrackingOwner::query()
+            ->where(['owner_id' => $request->input('owner_id')])
+            ->first();
+        if (!$orderTrackingOwner ?? false) {
+            $success = $orderTrackingOwner->update(['status' => $request->input('status')]);
+            return ['success'=>$success] ;
+        }
+
+        $data = ['owner_id' => $request->input('owner_id'), 'status' => $request->input('status')];
+        $success =  $orderTrackingOwner = OrderTrackingOwner::query()->create($data);
+        return ['success' => $success];
+    }
+
+    public function getAllApi()
+    {
+        if (!Gate::allows('订单管理-跟踪-监听')) {
+            return ['success' => false, 'fail_info' => '权限不足'];
+        }
+        $user = Auth::user();
+        $owner_ids = $user ? $user->getPermittingOwnerIdsAttribute() : [];
+
+        return Owner::query()
+            ->with('orderTrackingOwner')
+            ->get();
+    }
+}
+
+

+ 26 - 0
app/OrderTracking.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use App\Traits\ModelTimeFormat;
+use Illuminate\Database\Eloquent\Model;
+
+class OrderTracking extends Model
+{
+
+    use ModelTimeFormat;
+    protected $fillable = [
+        'order_package_commodity_id','owner_id','web_order_number',
+        'pick_up_at','sale','client',
+        'order_remark','pallet_total','planning_sent_at',
+        'is_on_duty_shift','is_arrival','signed_at',
+        'receive_bill_status','remark'];
+
+    public function commodities(){
+        return $this->hasOne('App\OrderPackageCommodities','id','order_package_commodity_id');
+    }
+
+    public function owner(){
+        return $this->hasOne('App\Owner','owner','owner_id');
+    }
+}

+ 18 - 0
app/OrderTrackingOwner.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App;
+
+use App\Traits\ModelTimeFormat;
+use Illuminate\Database\Eloquent\Model;
+
+class OrderTrackingOwner extends Model
+{
+    //
+    use ModelTimeFormat;
+    protected $fillable = ['owner_id','status'];
+
+    public function owner(){
+        return $this->hasOne('App\Owner','id','owner_id');
+    }
+
+}

+ 4 - 0
app/Owner.php

@@ -34,4 +34,8 @@ class Owner extends Model
     {
         return $this->belongsToMany('\App\PaperBox', 'owner_paper_box', 'owner_id', 'paper_box_id');
     }
+
+    public function orderTrackingOwner(){
+        return $this->belongsTo('App\orderTrackingOwner','id','owner_id');
+    }
 }

+ 65 - 0
app/Services/OrderTrackingService.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Services;
+
+use App\OrderTracking;
+use App\Owner;
+use App\Services\common\QueryService;
+use Illuminate\Support\Facades\Auth;
+
+Class OrderTrackingService
+{
+    public function getQuery($params){
+        $user = Auth::user();
+        $owner_ids = $user ? $user-> getPermittingOwnerIdsAttribute() :[];
+        if($params['owner_id'] ?? false){
+            $owner_ids = array_intersect($owner_ids,$params['owner_id']) ;
+        }
+        $query =  OrderTracking::query()->with(['owner','commodities'=>function($query){
+            $query->with(['commodity','package.order']);
+        },])->whereHas('owner',function($query) use ($owner_ids) {
+            $query->whereIn('id',$owner_ids);
+        });
+
+        $queryParam = [
+            'start_at' => ['alias'=>'created_at','startDate'=>' 00:00:00'],
+            'end_at' => ['alias'=>'created_at','endDate'=>' 23:59:59'],
+        ];
+        $param = [
+            'start_at' => $params['start_at'] ?? '',
+            'end_at' => $params['end_at'] ?? '',
+        ];
+        $query = app(QueryService::class)->query($param,$query,$queryParam);
+        return $query;
+    }
+
+    public function getConditionQuery($params){
+        $query =  $this->getQuery($params);
+        if($params['client_code'] ?? false ){
+            $query->whereHas('commodities.package',function($query) use ($params){$query->where('client_code',$params['client_code']);});
+        }
+
+        if($params['client'] ?? false){
+            $query->where('client','like',$params['client']);
+        }
+
+        if($params['sku'] ?? false){
+            $query->whereHas('commodities.commodity',function($query) use ($params){$query->where('sku',$params['sku']);});
+        }
+
+        if($params['logistic_number'] ?? false){
+            $query->whereHas('commodities.package',function($query) use ($params){$query->where('logistic_number',$params['logistic_number']);});
+        }
+
+        return $query;
+    }
+
+
+    public function paginate($params){
+       return  $this->getQuery($params)->paginate($params['paginate'] ?? 50);
+    }
+
+    public function export($params){
+
+    }
+}

+ 7 - 0
config/sync,php.php

@@ -0,0 +1,7 @@
+<?php
+return [
+    'order_tracking_import' => [
+        'import' => 20,
+        'start_at'=> '',
+    ],
+];

+ 12 - 0
database/factories/OrderTrackingFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OrderTracking;
+use Faker\Generator as Faker;
+
+$factory->define(OrderTracking::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

+ 12 - 0
database/factories/OrderTrackingOwnerFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OrderTrackingOwner;
+use Faker\Generator as Faker;
+
+$factory->define(OrderTrackingOwner::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

+ 46 - 0
database/migrations/2020_09_03_182051_create_order_trackings_table.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOrderTrackingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('order_trackings', function (Blueprint $table) {
+            $table->id();
+            $table->integer('order_package_commodity_id')->index();
+            $table->integer('owner_id')->index();
+            $table->string('web_order_number')->nullable();
+            $table->timestamp('pick_up_at');
+            $table->string('sale')->nullable();
+            $table->string('client')->nullable();
+            $table->string('order_remark')->nullable();
+            $table->string('pallet_total')->nullable();
+            $table->timestamp('planning_sent_at')->nullable();
+            $table->enum('is_on_duty_shift',['是','否'])->default(null)->nullable();
+            $table->enum('is_arrival',['是','否'])->default(null)->nullable();
+            $table->timestamp('signed_at')->nullable();
+            $table->string('receive_bill_status')->nullable();
+            $table->string('remark')->nullable();
+            $table->timestamp('created_at')->index();
+            $table->timestamp('updated_at')->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_trackings');
+    }
+}

+ 33 - 0
database/migrations/2020_09_04_091531_create_order_tracking_owners_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOrderTrackingOwnersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('order_tracking_owners', function (Blueprint $table) {
+            $table->id();
+            $table->integer('owner_id')->index();
+            $table->enum('status',['启用','禁用']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_tracking_owners');
+    }
+}

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

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddOrderTrackingAuth extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        (new \App\Authority(['name'=>'订单管理-跟踪','alias_name'=>'订单管理-跟踪']))->save();
+        (new \App\Authority(['name'=>'订单管理-跟踪-仓库编辑','alias_name'=>'订单管理-跟踪-仓库编辑']))->save();
+        (new \App\Authority(['name'=>'订单管理-跟踪-物流公司编辑','alias_name'=>'订单管理-跟踪-物流公司编辑']))->save();
+        (new \App\Authority(['name'=>'订单管理-跟踪-监听','alias_name'=>'订单管理-跟踪-监听']))->save();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        \App\Authority::where('name','订单管理-跟踪')->delete();
+        \App\Authority::where('name','订单管理-跟踪-仓库编辑')->delete();
+        \App\Authority::where('name','订单管理-跟踪-物流公司编辑')->delete();
+        \App\Authority::where('name','订单管理-跟踪-监听')->delete();
+    }
+}

+ 16 - 0
database/seeds/OrderTrackingOwnerSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class OrderTrackingOwnerSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+    }
+}

+ 16 - 0
database/seeds/OrderTrackingSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class OrderTrackingSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+    }
+}

+ 1 - 1
resources/views/order/issue/index.blade.php

@@ -6,7 +6,7 @@
     <div class="container-fluid" id="issue_div">
         <div style="min-width: 3000px;" >
             <div id="list" class="d-none container-fluid">
-                <div id="form_div" style="min-width: 2250px;"></div>
+                <div id="IOrer" style="min-width: 2250px;"></div>
                 <div class="form-inline mt-1 ">
                     <span class="dropdown">
                         <button type="button"

+ 13 - 6
resources/views/order/menu.blade.php

@@ -5,16 +5,23 @@
             @can('订单管理-查询')
             <li class="nav-item">
                 <a class="nav-link" href="{{url('order/index/delivering')}}" :class="{active:isActive('delivering',3)}">订单</a>
-            </li> @endcan
+            </li>
+            @endcan
             @can('订单管理-波次-查询')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('order/wave/index/')}}" :class="{active:isActive('wave',2)}">波次</a>
-            </li> @endcan
+            </li>
+            @endcan
             @can('订单管理-问题件-查询')
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{url('order/issue/index/')}}" :class="{active:isActive('issue',2)}">问题件</a>
-                    </li>
-                @endcan
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('order/issue/index/')}}" :class="{active:isActive('issue',2)}">问题件</a>
+            </li>
+            @endcan
+            @can('订单管理-跟踪')
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('order/tracking/index')}}" :class="{active:isActive('tracking',2)}">跟踪</a>
+            </li>
+            @endcan
         </ul>
     </div>
 </div>

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

@@ -0,0 +1,218 @@
+@extends('layouts.app')
+@section('title')订单管理-跟踪@endsection
+@section('content')
+    @component('order.tracking.menu')@endcomponent
+    <div class="container-fluid" id="tracking_div">
+        <div>
+            <div class="d-none" id="list">
+                @can('订单管理-跟踪-监听')
+                <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="pasteDataTitle" aria-hidden="true">
+                    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header row form-inline">
+                                <input type="text" v-model="name" class="form-control form-control-sm col-5 offset-3" placeholder="搜索货主,点击下方块添加" />
+                                <button class="btn btn-sm btn-info col-2" @click="seekOwner()">搜索</button>
+                                <label class="col-2"></label>
+                            </div>
+                            <div class="modal-body container row" style="text-align:center">
+                                <div class="col-2 mt-2" v-for="owner in owners">
+                                    <div style="border: 1px solid #aac7ea;height: 80px;text-align: center;line-height: 80px;border-radius: 4px;cursor: pointer"
+                                         :style="[{'background': loggingOwners.includes(Number(owner.name)) ? '#00FF00' : ''},
+                                    {'box-shadow' : seekOwners.includes(owner.name) ? '0px 0px 10px 5px rgba(0,0,0,0.9)' : ''}]"
+                                         @click="addTrackingOwner( owner.id )">@{{ owner.value }}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                @endcan
+                <div id="form_div"></div>
+                <div class="form-inline mt-1 ">
+                    <span class="dropdown">
+                        <button type="button"
+                                class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
+                                :class="[checkData.length>0?'btn-dark text-light':'']"
+                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果,将其全部记录(每一页)导出">导出Excel
+                        </button>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" @click="exportSelect()" href="javascript:">导出勾选内容</a>
+                            <a class="dropdown-item" @click="exportAll()" href="javascript:">导出所有页</a>
+                        </div>
+                    </span>
+                    @can('订单管理-跟踪-监听')
+                    <button class="btn btn-outline-info btn-sm tooltipTarget ml-2" @click="openModal()">
+                        管理监听货主
+                    </button>
+                    @endif
+                </div>
+
+                <table class="table table-sm table-bordered table-hover card-body table-responsive-sm p-0 m-0">
+                    <tr class="text-center">
+                        <th>
+                            <input id="all" type="checkbox" @click="checkAll($event)"/>
+                        </th>
+                        <th>序号</th>
+                        <th>公司</th>
+                        <th>订单号</th>
+                        <th>WEB+订单号</th>
+                        <th>提货日期</th>
+                        <th>销售</th>
+                        <th>客户</th>
+                        <th>SKU</th>
+                        <th>物料描述</th>
+                        <th>数量</th>
+                        <th>订单备注</th>
+                        <th>重量</th>
+                        <th>体积</th>
+                        <th>托盘合计</th>
+                        <th>运输方式</th>
+                        <th>运输单号</th>
+                        <th>到达城市</th>
+                        <th>到达城市</th>
+                        <th>应送达时间</th>
+                        <th>是否赶上卡班</th>
+                        <th>到货情况</th>
+                        <th>签收日期</th>
+                        <th>签收单情况</th>
+                        <th>备注</th>
+                    </tr>
+
+                    <tr v-for="(orderTracking,index) in orderTrackings">
+                        <td>
+                            <input id="all" type="checkbox" @click="checkAll($event)"/>
+                        </td>
+                        <td>@{{ index }}</td>
+                        <td>公司</td>
+                        <td>订单号</td>
+                        <td>WEB+订单号</td>
+                        <td>提货日期</td>
+                        <td>销售</td>
+                        <td>客户</td>
+                        <td>SKU</td>
+                        <td>物料描述</td>
+                        <td>数量</td>
+                        <td>订单备注</td>
+                        <td>重量</td>
+                        <td>体积</td>
+                        <td>托盘合计</td>
+                        <td>运输方式</td>
+                        <td>运输单号</td>
+                        <td>到达城市</td>
+                        <td>到达城市</td>
+                        <td>应送达时间</td>
+                        <td>是否赶上卡班</td>
+                        <td>到货情况</td>
+                        <td>签收日期</td>
+                        <td>签收单情况</td>
+                        <td>备注</td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+
+    </div>
+@endsection
+
+@section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+
+    <script>
+        let tracking_vue = new Vue({
+            el:'#tracking_div',
+            data:{
+                orderTrackings:[],
+                owners:[@foreach($owners as $owner){name: '{{ $owner->id }}', value: '{{ $owner->name}}'},@endforeach],
+                from:'',
+                checkData:'',
+                seekOwners : [],
+                name : "",
+                loggingOwners : [],
+            },
+            mounted:function(){
+                $('.tooltipTarget').tooltip({'trigger': 'hover'});
+                $("#list").removeClass('d-none');
+                let _this = this;
+                let data = [
+                    [
+                        {name:'start_at',type:'dateTime',tip:'起始日期',placeholder:'起始日期'},
+                        {name:'owner_id',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
+                            placeholder: ['货主', '定位或多选货主'],
+                            data: _this.owners},
+                        {name:'client_code',type:'input',tip:'订单号',placeholder:'订单号'},
+                        {name:'client',type:'input',tip:'货主',placeholder:'货主'},
+                    ],
+                    [
+                        {name:'end_at',type:'dateTime',tip:'结束日期',placeholder: '结束日期'},
+                        {name:'logistic_number',type:'input',tip:'运输单号',placeholder:'运输单号'},
+                        {name:'sku',type:'input',tip:'SKU',placeholder: '商品编号'},
+                    ]
+                ];
+                this.from = new query({
+                    el: '#form_div',
+                    condition: data,
+                }).init();
+            },
+            watch:{
+                checkData: {
+                    handler() {
+                        if (this.checkData.length === this.orderTrackings.length && this.checkData.length !== 0) {
+                            document.querySelector('#all').checked = true;
+                        } else {
+                            document.querySelector('#all').checked = false;
+                        }
+                    },
+                    deep: true
+                },
+            },
+            methods:{
+                checkAll(e){
+                    if (e.target.checked) {
+                        this.orderTrackings.forEach((el, i) => {
+                            if (this.checkData.indexOf(el.id) === -1) {
+                                this.checkData.push(el.id);
+                            }
+                        });
+                    } else {
+                        this.checkData = [];
+                    }
+                },
+                openModal(){
+                    let url = "{{url('apiLocal/order/trackingOwner/all')}}";
+                    axios.post(url).then(res=>{
+                        this.loggingOwners = res.data;
+                        $("#modal").modal('show');
+                    });
+                },
+                seekOwner(){
+                    if (!this.name)return ;
+                    let name = this.name;
+                    let seekOwners = [];
+                    this.owners.forEach(function (owner) {
+                        if ((owner.value).indexOf(name) !== -1){
+                            seekOwners.push(owner.name);
+                        }
+                    });
+                    if (seekOwners.length > 0)this.seekOwners = seekOwners;
+                },
+                addTrackingOwner(owner_id,name){
+
+                },
+                selectedColor(id) {
+                    if (id === this.selectedStyle) {
+                        this.selectedStyle = '';
+                        return;
+                    }
+                    this.selectedStyle = id;
+                },
+                exportSelect:function(){
+
+                },
+                exportAll:function(){
+
+                },
+            }
+        });
+    </script>
+@endsection

+ 14 - 0
resources/views/order/tracking/menu.blade.php

@@ -0,0 +1,14 @@
+<div id="nav2">
+    @component('order.menu')
+    @endcomponent
+    <div class="container-fluid nav3">
+        <div class="card menu-third" >
+            <ul class="nav nav-pills">
+                @can('订单管理-跟踪')
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{url('order/tracking/index')}}" :class="{active:isActive('tracking',2)}">查询</a>
+                    </li> @endcan
+            </ul>
+        </div>
+    </div>
+</div>

+ 10 - 0
routes/apiLocal.php

@@ -43,4 +43,14 @@ Route::group(['prefix' => 'order'], function () {
     Route::post('issue/disposeOrderIssue', 'OrderIssueController@apiDisposeOrderIssue');
     Route::post('issue/endOrderIssue', 'OrderIssueController@apiEndOrderIssue');
     Route::post('issue/getOrderInfoByClientNo', 'OrderIssueController@apiGetOrderInfoByClientNo');
+
+});
+
+Route::group(['prefix' => 'order'], function () {
+    Route::get('tracking/update','OrderTrackingController@updateApi');
+    Route::get('trackingOwner/updateStatus','OrderTrackingOwnerController@updateStatusApi');
+    Route::any('trackingOwner/all','OrderTrackingOwnerController@getAllApi');
 });
+
+
+

+ 8 - 2
routes/web.php

@@ -383,5 +383,11 @@ Route::group(['prefix'=>'order'],function(){
     Route::get('issue/orderIssuePerformance/index','OrderIssuePerformanceController@index');
     Route::any('issue/orderIssuePerformance/export','OrderIssuePerformanceController@export');
 });
-
-
+/**
+ * tracking
+ */
+Route::group(['prefix'=>'order'],function(){
+    Route::get('tracking/index',"OrderTrackingController@index");
+    Route::get('tracking/export',"OrderTrackingController@export");
+    Route::get('tracking/update','OrderTrackingController@updateApi');
+});