暂时提交，准备合并master

app/Http/Controllers/OrderFreezeController.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers;
+
+class OrderFreezeController extends Controller
+{
+    public function index()
+    {
+
+    }
+}

app/OrderFreeze.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+use App\Traits\LogChanging;
+
+class OrderFreeze extends Model
+{
+    use LogChanging;
+
+    //
+}

database/migrations/2021_01_15_100109_create_order_freezes_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOrderFreezesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('order_freezes', function (Blueprint $table) {
+            $table->id();
+            $table->tinyInteger("status")->default(0)->comment("状态");
+            $table->bigInteger("logistic_id")->comment("承运商");
+            $table->bigInteger("province_id")->nullable()->comment("省");
+            $table->bigInteger("city_id")->nullable()->comment("市");
+            $table->bigInteger("location_id")->nullable()->comment("区");
+            $table->index(["status","logistic_id","province_id","city_id","location_id"],"freeze_s_l_p_c_l_index");
+            $table->timestamps();
+        });
+        \App\Authority::query()->firstOrCreate(["name"=>"订单管理-自动冻结","alias_name"=>"订单管理-自动冻结"]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_freezes');
+        \App\Authority::query()->where("name","订单管理-自动冻结")->delete();
+    }
+}

resources/views/customer/project/part/_three.blade.php

@@ -3,6 +3,7 @@
         <div class="card" id="storage-card">
             <div class="card-header bg-light-info">
                 <span class="pull-left font-weight-bold cursor-pointer text-secondary" @click="show('storage')"><span class="fa fa-align-justify"></span>&nbsp;仓储</span>
+                <span class="pull-right small mb-0 text-secondary">双击下方已添加内容可编辑</span>
             </div>
             <div class="card-body" id="storage">
                 <table class="table table-sm">
@@ -34,6 +35,7 @@
         <div class="card" id="operation-card">
             <div class="card-header bg-light-info">
                 <span class="pull-left font-weight-bold cursor-pointer text-secondary" @click="show('operation')"><span class="fa fa-align-justify"></span>&nbsp;作业</span>
+                <span class="pull-right small mb-0 text-secondary">双击下方已添加内容可编辑</span>
             </div>
             <div class="card-body" id="operation">
                 <div class="container-fluid">
@@ -127,6 +129,7 @@
         <div class="card" id="express-card">
             <div class="card-header bg-light-info">
                 <span class="pull-left font-weight-bold cursor-pointer text-secondary" @click="show('express')"><span class="fa fa-align-justify"></span>&nbsp;快递</span>
+                <span class="pull-right small mb-0 text-secondary">双击下方已添加内容可编辑</span>
             </div>
             <div class="card-body" id="express">
                 <table class="table table-sm">
@@ -184,6 +187,7 @@
         <div class="card" id="logistic-card">
             <div class="card-header bg-light-info">
                 <span class="pull-left font-weight-bold cursor-pointer text-secondary" @click="show('logistic')"><span class="fa fa-align-justify"></span>&nbsp;物流</span>
+                <span class="pull-right small mb-0 text-secondary">双击下方已添加内容可编辑</span>
             </div>
             <div class="card-body" id="logistic">
                 <table class="table table-sm">
@@ -264,6 +268,7 @@
         <div class="card" id="directLogistic-card">
             <div class="card-header bg-light-info">
                 <span class="pull-left font-weight-bold cursor-pointer text-secondary" @click="show('directLogistic')"><span class="fa fa-align-justify"></span>&nbsp;直发</span>
+                <span class="pull-right small mb-0 text-secondary">双击下方已添加内容可编辑</span>
             </div>
             <div class="card-body" id="directLogistic" @dblclick="editDirectLogistic()" style="cursor: pointer">
                 <div class="row">

resources/views/order/index/menu.blade.php

@@ -12,6 +12,10 @@
                     <li class="nav-item">
                         <a class="nav-link" href="{{url('order/index/commodityAssign')}}" :class="{active:isActive('commodityAssign',3)}">指定分配</a>
                     </li> @endcan
+                @can('订单管理-自动冻结')
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{url('order/index/freeze')}}" :class="{active:isActive('freeze',3)}">自动冻结</a>
+                    </li> @endcan
             </ul>
         </div>
     </div>

routes/web.php

@@ -539,6 +539,7 @@ Route::group(['prefix'=>'order'],function(){
         Route::group(['prefix'=>'commodityAssign'],function(){
             Route::post('import','OrderCommodityAssignController@import');
         });
+        Route::resource('freeze','OrderFreezeController');
     });
     /** 创建 */
     Route::group(['prefix'=>'create'],function(){