Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Customer.php

@@ -2,19 +2,22 @@
 
 namespace App;
 
+use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Customer extends Model
 {
+    use ModelTimeFormat;
+
     protected $fillable = [
-        "code",         //客户代码
-        "name",         //客户名称
-        "company_name",  //公司名称
-        "invoice_address",  //公司名称
-        "contact_man",  //公司名称
-        "phone",  //公司名称
-        "comment",  //公司名称
+        "code",             //客户代码
+        "name",             //客户名称
+        "company_name",     //公司名称
+        "invoice_address",  //发票地址
+        "contact_man",      //联系人
+        "phone",            //联系电话
+        "remark",           //公司备注
     ];
 
     public function customerLogs(): HasMany

app/Http/Controllers/CustomerBaseController.php

@@ -38,6 +38,7 @@ class CustomerBaseController extends Controller
      *
      * @param  Request  $request
      * @return Response
+     * @throws
      */
     public function store(Request $request)
     {
@@ -50,7 +51,7 @@ class CustomerBaseController extends Controller
             "invoice_address"=>$request->input("invoice_address"),
             "contact_man"=>$request->input("contact_man"),
             "phone"=>$request->input("phone"),
-            "comment"=>$request->input("comment"),
+            "comment"=>$request->input("remark"),
         ]);
         LogService::log(__METHOD__,"录入客户",json_encode($request->input(),JSON_UNESCAPED_UNICODE));
         return response()->redirectTo("customer/customer")->with("successTip","成功创建客户“".$request->input("name")."”");
@@ -75,6 +76,7 @@ class CustomerBaseController extends Controller
      * @param  Request  $request
      * @param  int  $id
      * @return Response
+     * @throws
      */
     public function update(Request $request, $id)
     {
@@ -87,7 +89,7 @@ class CustomerBaseController extends Controller
             "invoice_address"=>$request->input("invoice_address"),
             "contact_man"=>$request->input("contact_man"),
             "phone"=>$request->input("phone"),
-            "comment"=>$request->input("comment"),
+            "remark"=>$request->input("remark"),
         ]);
         if ($result == 1){
             LogService::log(__METHOD__,"修改客户",json_encode($request->input(),JSON_UNESCAPED_UNICODE));

app/Http/Controllers/CustomerLogController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Customer;
+use App\CustomerLog;
+use App\CustomerLogStatus;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class CustomerLogController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index(Request $request)
+    {
+        $customerLog = CustomerLog::query()->with(['customerLogStatus', 'user', 'customer'])->where('id',$request->id) ->orderByDesc('updated_at')->paginate();
+        return view('customer.customerLog.index', compact('customerLog'));
+    }
+
+    public function show($customerLog_id)
+    {
+        $customerLog =CustomerLog::query()->with(['customerLogStatus', 'user', 'customer'])->where('id',$customerLog_id)->first();
+        return view('customer.customerLog.show', compact('customerLog'));
+    }
+
+    public function create(CustomerLog $customerLog)
+    {
+        $customers = Customer::all();
+        $customerLogStatuses = CustomerLogStatus::all();
+        return view('customer.customerLog.createAndEdit', compact('customerLog', 'customers', 'customerLogStatuses'));
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        $data = $request->all();
+        $data['user_id'] = auth()->id();
+        $customerLog = CustomerLog::query()->create($data);
+        return redirect()->route('customerLog.show', $customerLog->id)->with('message', 'Created successfully.');
+    }
+
+    public function edit(CustomerLog $customerLog)
+    {
+        $this->authorize('update', $customerLog);
+        $customers = Customer::all();
+        $customerLogStatuses = CustomerLogStatus::all();
+        return view('customer.customerLog.createAndEdit', compact('customerLog', 'customers', 'customerLogStatuses'));
+    }
+
+    public function update(Request $request, CustomerLog $customerLog)
+    {
+        $this->authorize('update', $customerLog);
+        $customerLog->update($request->all());
+
+        return redirect()->route('customerLog.show', $customerLog->id)->with('message', 'Updated successfully.');
+    }
+
+    public function destroy(CustomerLog $customerLog)
+    {
+        $this->authorize('destroy', $customerLog);
+        $customerLog->delete();
+
+        return redirect()->route('customerLog.index')->with('message', 'Deleted successfully.');
+    }
+}

app/Http/Controllers/CustomerLogStatusController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\CustomerLogStatus;
+
+
+class CustomerLogStatusController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index()
+    {
+        $customerLogStatuses = CustomerLogStatus::query()->paginate();
+        return view('customer.customerLogStatus.index', compact('customerLogStatuses'));
+    }
+}

app/Http/Controllers/CustomerLogStatusesController.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\CustomerLogStatus;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-
-
-class CustomerLogStatusesController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    public function index()
-    {
-        $customer_log_statuses = CustomerLogStatus::paginate();
-        return view('customer.customer_log_statuses.index', compact('customer_log_statuses'));
-    }
-
-    public function show(CustomerLogStatus $customer_log_status)
-    {
-        return view('customer.customer_log_statuses.show', compact('customer_log_status'));
-    }
-
-    public function create(CustomerLogStatus $customer_log_status)
-    {
-        return view('customer.customer_log_statuses.create_and_edit', compact('customer_log_status'));
-    }
-
-    public function store(Request $request): RedirectResponse
-    {
-        $customer_log_status = CustomerLogStatus::create($request->all());
-        return redirect()->route('customer_log_statuses.show', $customer_log_status->id)->with('message', 'Created successfully.');
-    }
-
-    public function edit(CustomerLogStatus $customer_log_status)
-    {
-        $this->authorize('update', $customer_log_status);
-        return view('customer.customer_log_statuses.create_and_edit', compact('customer_log_status'));
-    }
-
-    public function update(Request $request, CustomerLogStatus $customer_log_status)
-    {
-        $this->authorize('update', $customer_log_status);
-        $customer_log_status->update($request->all());
-
-        return redirect()->route('customer_log_statuses.show', $customer_log_status->id)->with('message', 'Updated successfully.');
-    }
-
-    public function destroy(CustomerLogStatus $customer_log_status)
-    {
-        $this->authorize('destroy', $customer_log_status);
-        $customer_log_status->delete();
-
-        return redirect()->route('customer_log_statuses.index')->with('message', 'Deleted successfully.');
-    }
-}

app/Http/Controllers/CustomerLogsController.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Customer;
-use App\CustomerLog;
-use App\CustomerLogStatus;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-
-class CustomerLogsController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    public function index(Request $request)
-    {
-        $customer_logs = CustomerLog::query()->with(['customerLogStatus', 'user', 'customer'])->where('id',$request->id) ->orderByDesc('updated_at')->paginate();
-        return view('customer.customer_logs.index', compact('customer_logs'));
-    }
-
-    public function show($customer_log_id)
-    {
-        $customer_log =CustomerLog::query()->with(['customerLogStatus', 'user', 'customer'])->where('id',$customer_log_id)->first();
-        return view('customer.customer_logs.show', compact('customer_log'));
-    }
-
-    public function create(CustomerLog $customer_log)
-    {
-        $customers = Customer::all();
-        $customerLogStatuses = CustomerLogStatus::all();
-        return view('customer.customer_logs.create_and_edit', compact('customer_log', 'customers', 'customerLogStatuses'));
-    }
-
-    public function store(Request $request): RedirectResponse
-    {
-        $data = [];
-        $data = $request->all();
-        $data['user_id'] = auth()->id();
-        $customer_log = CustomerLog::create($data);
-        return redirect()->route('customer_logs.show', $customer_log->id)->with('message', 'Created successfully.');
-    }
-
-    public function edit(CustomerLog $customer_log)
-    {
-        $this->authorize('update', $customer_log);
-        $customers = Customer::all();
-        $customerLogStatuses = CustomerLogStatus::all();
-        return view('customer.customer_logs.create_and_edit', compact('customer_log', 'customers', 'customerLogStatuses'));
-    }
-
-    public function update(Request $request, CustomerLog $customer_log)
-    {
-        $this->authorize('update', $customer_log);
-        $customer_log->update($request->all());
-
-        return redirect()->route('customer_logs.show', $customer_log->id)->with('message', 'Updated successfully.');
-    }
-
-    public function destroy(CustomerLog $customer_log)
-    {
-        $this->authorize('destroy', $customer_log);
-        $customer_log->delete();
-
-        return redirect()->route('customer_logs.index')->with('message', 'Deleted successfully.');
-    }
-}

app/Http/Controllers/TestController.php

@@ -116,7 +116,7 @@ class TestController extends Controller
  AND BAS_SKU.sku = ? AND alternate_sku1 = ? AND expectedqty_each = ?
 sql;
             $param = [$flight->asn_line_code,$flight->name,$flight->sku,$flight->barcode,$flight->amount];
-if ($flight->depository)$sql.= " AND LOTATT05 = ".$flight->depository->code;
+if ($flight->depository)$sql.= " AND LOTATT05 = '".$flight->depository->code."' ";
 else $sql .="  AND LOTATT05 IS NULL";
             $r = DB::connection("oracle")->selectOne(DB::raw($sql),$param);
             if ($r){

database/migrations/2020_12_15_095959_add_customer_phone_address.php

@@ -6,6 +6,13 @@ use Illuminate\Support\Facades\Schema;
 
 class AddCustomerPhoneAddress extends Migration
 {
+    protected $authorities = [
+        "客户管理-客户-客户状态",
+        "客户管理-客户-客户状态-查询",
+        "客户管理-客户-客户状态-录入",
+        "客户管理-客户-客户状态-编辑",
+        "客户管理-客户-客户状态-删除",
+    ];
     /**
      * Run the migrations.
      *
@@ -17,7 +24,7 @@ class AddCustomerPhoneAddress extends Migration
             $table->string('invoice_address')->nullable()->comment('发票地址');
             $table->string('contact_man')->index()->nullable()->comment('联系人');
             $table->integer('phone')->index()->nullable()->comment('联系电话');
-            $table->string('comment')->nullable()->comment('公司备注');
+            $table->string('remark')->nullable()->comment('公司备注');
         });
     }
 
@@ -32,7 +39,7 @@ class AddCustomerPhoneAddress extends Migration
             $table->dropColumn('invoice_address');
             $table->dropColumn('contact_man');
             $table->dropColumn('phone');
-            $table->dropColumn('comment');
+            $table->dropColumn('remark');
         });
     }
 }

resources/sass/text.scss

@@ -55,3 +55,8 @@
 .text-letter{
     word-break: break-all
 }
+
+.cursor-pointer{
+    color: dodgerblue;
+    cursor: pointer;
+}

resources/views/customer/customer/_customerLog.blade.php

@@ -0,0 +1,9 @@
+<div class="modal fade" tabindex="-1" role="dialog" id="modal">
+    <div class="modal-dialog modal-xl modal-dialog-centered modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+
+            </div>
+        </div>
+    </div>
+</div>

resources/views/customer/customer/create.blade.php

@@ -57,9 +57,9 @@
                 </div>
 
                 <div class="row mt-3">
-                    <label class="col-2" for="comment">公司备注</label>
-                    <input class="form-control col-6" id="comment" name="comment"
-                           value="{{old("comment") ?? (isset($customer) ? $customer->comment : '')}}">
+                    <label class="col-2" for="remark">公司备注</label>
+                    <input class="form-control col-6" id="remark" name="remark"
+                           value="{{old("remark") ?? (isset($customer) ? $customer->remark : '')}}">
                 </div>
 
                 <div class="row mt-3 offset-1">

resources/views/customer/customer/index.blade.php

@@ -11,6 +11,7 @@
             @if(Session::has('successTip'))
                 <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
             @endif
+            @include("customer.customer._customerLog")
             <table class="table table-striped table-hover text-nowrap">
                 <tr>
                     <th>序号</th>
@@ -34,8 +35,8 @@
                     <td>@{{ customer.invoice_address }}</td>
                     <td>@{{ customer.contact_man }}</td>
                     <td>@{{ customer.phone }}</td>
-                    <td>@{{ customer.comment }}</td>
-                    <td><a href="#" @click="gotoLogs(customer.id)">链接</a></td>
+                    <td>@{{ customer.remark }}</td>
+                    <td><span class="cursor-pointer" data-toggle="modal" data-target="#modal">查看</span></td>
                     <td>#</td>
                     <td>@{{ customer.created_at }}</td>
                     <td>
@@ -74,10 +75,6 @@
                         })
                     })
                 },
-                gotoLogs(id){
-                    let url = '{{ url("customer/customer/customer_logs") }}'+'?id='+id;
-                    window.open(url);
-                }
             },
         });
     </script>

resources/views/customer/customer/menu.blade.php

@@ -9,9 +9,8 @@
             <li class="nav-item">
                 <a class="nav-link" href="{{url('customer/customer/create')}}" :class="{active:isActive('create',3)}">录入</a>
             </li> @endcan
-
             <li class="nav-item">
-                <a class="nav-link" href="{{url('customer\customer/customer_log_statuses')}}" :class="{active:isActive('customer_log_statuses',3)}">客户状态</a>
+                <a class="nav-link" href="{{url('customer/customer/customerLogStatus')}}" :class="{active:isActive('customerLogStatus',3)}">客户状态</a>
             </li>
             {{$slot}}
         </ul>

resources/views/customer/customerLogStatus/index.blade.php

@@ -0,0 +1,39 @@
+@extends('layouts.app')
+@section('title')客户@endsection
+
+@section('content')
+    <div id="nav2">
+        @component('customer.menu')@endcomponent
+        @component('customer.customerLogStatus.menu')@endcomponent
+    </div>
+
+    <div class="d-none container-fluid" id="container">
+        <table class="table table-striped table-bordered table-hover">
+            <tr>
+                <th>序号</th>
+                <th>名称</th>
+                <th>说明</th>
+                <th>创建时间</th>
+                <th>修改时间</th>
+            </tr>
+            <tr v-for="">
+                <td></td>
+            </tr>
+        </table>
+    </div>
+@stop
+
+@section("lastScript")
+    <script>
+        new Vue({
+            el:"#container",
+            data:{
+                models:[
+                    @foreach($customerLogStatuses as $customerLogStatus)
+
+                    @endforeach
+                ],
+            },
+        });
+    </script>
+@stop

resources/views/customer/customerLogStatus/menu.blade.php

@@ -0,0 +1,18 @@
+<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('customer/customer/customerLogStatus')}}" :class="{active:isActive('',4)}">查询</a>
+                </li> @endcan
+            @can('客户-录入')
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('customer/customer/create')}}" :class="{active:isActive('create',3)}">录入</a>
+                </li> @endcan
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('customer/customer/customerLogStatus')}}" :class="{active:isActive('customerLogStatus',3)}">客户状态</a>
+            </li>
+            {{$slot}}
+        </ul>
+    </div>
+</div>

resources/views/customer/customer_log_statuses/create_and_edit.blade.php

@@ -1,52 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-<div class="container">
-  <div class="col-md-10 offset-md-1">
-    <div class="card ">
-
-      <div class="card-header">
-        <h1>
-            客户日志状态-
-          @if($customer_log_status->id)
-            编辑 #{{ $customer_log_status->id }}
-          @else
-              新建
-          @endif
-        </h1>
-      </div>
-
-      <div class="card-body">
-        @if($customer_log_status->id)
-          <form action="{{ route('customer_log_statuses.update', $customer_log_status->id) }}" method="POST" accept-charset="UTF-8">
-          <input type="hidden" name="_method" value="PUT">
-        @else
-          <form action="{{ route('customer_log_statuses.store') }}" method="POST" accept-charset="UTF-8">
-        @endif
-
-          @include('common.error')
-
-          <input type="hidden" name="_token" value="{{ csrf_token() }}">
-
-
-                <div class="form-group">
-                	<label for="name-field">名称</label>
-                	<input class="form-control" type="text" name="name" id="name-field" value="{{ old('name', $customer_log_status->name ) }}" />
-                </div>
-                <div class="form-group">
-                	<label for="description-field">详情</label>
-                	<textarea name="description" id="description-field" class="form-control" rows="3">{{ old('description', $customer_log_status->description ) }}</textarea>
-                </div>
-
-          <div class="well well-sm">
-            <button type="submit" class="btn btn-primary">保存</button>
-            <a class="btn btn-link float-xs-right" href="{{ route('customer_log_statuses.index') }}"> <- 返回</a>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
-
-@endsection

resources/views/customer/customer_log_statuses/index.blade.php

@@ -1,64 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-    <div id="nav2">
-        @component('customer.menu')@endcomponent
-        @component('customer.customer.menu')@endcomponent
-    </div>
-    <div class="container">
-        <div class="col-md-10 offset-md-1">
-            <div class="card ">
-                <div class="card-header">
-                    <h1>
-                        客户日志状态
-                        <a class="btn btn-success float-xs-right"
-                           href="{{ route('customer_log_statuses.create') }}">新建</a>
-                    </h1>
-                </div>
-
-                <div class="card-body">
-                    @if($customer_log_statuses->count())
-                        <table class="table table-sm table-striped">
-                            <thead>
-                            <tr>
-                                <th class="text-xs-center">#</th>
-                                <th>名称</th>
-                                <th>详情</th>
-                                <th class="text-xs-right">操作</th>
-                            </tr>
-                            </thead>
-
-                            <tbody>
-                            @foreach($customer_log_statuses as $customer_log_status)
-                                <tr>
-                                    <td class="text-xs-center"><strong>{{$customer_log_status->id}}</strong></td>
-
-                                    <td>{{$customer_log_status->name}}</td>
-                                    <td>{{$customer_log_status->description}}</td>
-
-                                    <td class="text-xs-right">
-                                        <a class="btn btn-sm btn-primary"
-                                           href="{{ route('customer_log_statuses.show', $customer_log_status->id) }}">
-                                            查
-                                        </a>
-
-                                        <a class="btn btn-sm btn-warning"
-                                           href="{{ route('customer_log_statuses.edit', $customer_log_status->id) }}">
-                                            改
-                                        </a>
-                                    </td>
-                                </tr>
-                            @endforeach
-                            </tbody>
-                        </table>
-                        {!! $customer_log_statuses->render() !!}
-                    @else
-                        <h3 class="text-xs-center alert alert-info">暂时还没有内容 ~ ~</h3>
-                    @endif
-                </div>
-            </div>
-        </div>
-    </div>
-
-@endsection

resources/views/customer/customer_log_statuses/show.blade.php

@@ -1,41 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-    <div class="container">
-        <div class="col-md-10 offset-md-1">
-            <div class="card ">
-                <div class="card-header">
-                    <h1>客户日志状态#{{ $customer_log_status->id }}</h1>
-                </div>
-
-                <div class="card-body">
-                    <div class="card-block bg-light">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <a class="btn btn-link" href="{{ route('customer_log_statuses.index') }}"><- 返回</a>
-                            </div>
-                            <div class="col-md-6">
-                                <a class="btn btn-sm btn-warning float-right mt-1"
-                                   href="{{ route('customer_log_statuses.edit', $customer_log_status->id) }}">
-                                    编辑
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                    <br>
-
-                    <label><b>名称</b></label>
-                    <p>
-                        {{ $customer_log_status->name }}
-                    </p>
-                    <label><b>详情</b></label>
-                    <p>
-                        {{ $customer_log_status->description }}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-@endsection

resources/views/customer/customer_logs/create_and_edit.blade.php

@@ -1,68 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-<div class="container">
-  <div class="col-md-10 offset-md-1">
-    <div class="card ">
-
-      <div class="card-header">
-        <h1>
-          客户日志 -
-          @if($customer_log->id)
-            Edit #{{ $customer_log->id }}
-          @else
-            创建
-          @endif
-        </h1>
-      </div>
-
-      <div class="card-body">
-        @if($customer_log->id)
-          <form action="{{ route('customer_logs.update', $customer_log->id) }}" method="POST" accept-charset="UTF-8">
-          <input type="hidden" name="_method" value="PUT">
-        @else
-          <form action="{{ route('customer_logs.store') }}" method="POST" accept-charset="UTF-8">
-        @endif
-
-          @include('common.error')
-
-          <input type="hidden" name="_token" value="{{ csrf_token() }}">
-
-
-                <div class="form-group">
-                    <label for="customer_id-field">客户名称</label>
-                    <select name="customer_id" class="form-control" required>
-                        <option value="" hidden disabled {{ $customer_log->customer_id ? '':'selected' }}>请选择客户名称</option>
-                        @foreach($customers as $customer)
-                            <option value="{{ $customer->id }}">{{ $customer->name }}</option>
-                        @endforeach
-                    </select>
-{{--                    <input class="form-control" type="text" name="customer_id" id="customer_id-field" value="{{ old('customer_id', $customer_log->customer_id ) }}" />--}}
-                </div>
-                <div class="form-group">
-                    <label for="customer_log_status_id-field">状态</label>
-                    <select name="customer_log_status_id" class="form-control" required>
-                        <option value="" hidden disabled {{ $customer_log->customer_log_status_id ? '':'selected' }}>请选择状态</option>
-                        @foreach($customerLogStatuses as $customerLogStatus)
-                            <option value="{{ $customerLogStatus->id }}">{{ $customerLogStatus->name }}</option>
-                        @endforeach
-                    </select>
-{{--                    <input class="form-control" type="text" name="customer_log_status_id" id="customer_log_status_id-field" value="{{ old('customer_log_status_id', $customer_log->customer_log_status_id ) }}" />--}}
-                </div>
-                <div class="form-group">
-                	<label for="description-field">描述</label>
-                	<textarea name="description" id="description-field" class="form-control" rows="3">{{ old('description', $customer_log->description ) }}</textarea>
-                </div>
-
-          <div class="well well-sm">
-            <button type="submit" class="btn btn-primary">保存</button>
-            <a class="btn btn-link float-xs-right" href="{{ route('customer_logs.index') }}"> <- 返回</a>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
-
-@endsection

resources/views/customer/customer_logs/index.blade.php

@@ -1,69 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    <div class="container">
-        <div class="col-md-10 offset-md-1">
-            <div class="card ">
-                <div class="card-header">
-                    <h1>
-                        客户日志
-                        <a class="btn btn-success float-xs-right" href="{{ route('customer_logs.create') }}">新建</a>
-                    </h1>
-                </div>
-
-                <div class="card-body">
-                    @if($customer_logs->count())
-                        <table class="table table-sm table-striped">
-                            <thead>
-                            <tr>
-                                <th>客户名称</th>
-                                <th>状态</th>
-                                <th>创建用户</th>
-                                <th>详情</th>
-                                <th>编辑时间</th>
-                                <th class="text-xs-right">操作</th>
-                            </tr>
-                            </thead>
-
-                            <tbody>
-                            @foreach($customer_logs as $customer_log)
-                                <tr>
-                                    <td>{{$customer_log->customer->name}}</td>
-                                    <td>{{$customer_log->customerLogStatus->name}}</td>
-                                    <td>{{$customer_log->user->name}}</td>
-                                    <td>{{$customer_log->description}}</td>
-                                    <td>{{$customer_log->updated_at->diffForHumans()}}</td>
-
-                                    <td class="text-xs-right">
-                                        <a class="btn btn-sm btn-primary"
-                                           href="{{ route('customer_logs.show', $customer_log->id) }}">
-                                            查
-                                        </a>
-                                        @can('update',$customer_log)
-                                            <a class="btn btn-sm btn-warning"
-                                               href="{{ route('customer_logs.edit', $customer_log->id) }}">
-                                                改
-                                            </a>
-                                        @endcan
-                                        <form action="{{ route('customer_logs.destroy', $customer_log->id) }}"
-                                              method="POST" style="display: inline;"
-                                              onsubmit="return confirm('删除！无法恢复！您确定么?');">
-                                            {{csrf_field()}}
-                                            <input type="hidden" name="_method" value="DELETE">
-
-                                            <button type="submit" class="btn btn-sm btn-danger">删</button>
-                                        </form>
-                                    </td>
-                                </tr>
-                            @endforeach
-                            </tbody>
-                        </table>
-                        {!! $customer_logs->render() !!}
-                    @else
-                        <h3 class="text-xs-center alert alert-info">Empty!</h3>
-                    @endif
-                </div>
-            </div>
-        </div>
-    </div>
-@stop

resources/views/customer/customer_logs/show.blade.php

@@ -1,59 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-    <div class="container">
-        <div class="col-md-10 offset-md-1">
-            <div class="card ">
-                <div class="card-header">
-                    <h1>客户日志</h1>
-                </div>
-
-                <div class="card-body">
-                    <div class="card-block bg-light">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <a class="btn btn-link" href="{{ route('customer_logs.index') }}"><- 返回</a>
-                            </div>
-                            @can('update',$customer_log)
-                            <div class="col-md-6">
-                                <a class="btn btn-sm btn-warning float-right mt-1"
-                                   href="{{ route('customer_logs.edit', $customer_log->id) }}">
-                                    编辑
-                                </a>
-                            </div>
-                            @endcan
-                        </div>
-                    </div>
-                    <br>
-
-                    <p id="customer"><b>客户信息</b></p>
-                    <table class="table table-sm table-striped" aria-describedby="customer">
-                        <tr>
-                            <th>客户名称</th>
-                            <th>公司名称</th>
-                        </tr>
-                        <tr>
-                            <th>{{ $customer_log->customer->name }}</th>
-                            <th>{{ $customer_log->customer->company_name }}</th>
-                        </tr>
-                    </table>
-
-                    <label><b>状态</b></label>
-                    <p>
-                        {{ $customer_log->customerLogStatus->name }}
-                    </p>
-                    <label><b>创建用户</b></label>
-                    <p>
-                        {{ $customer_log->user->name }}
-                    </p>
-                    <label><b>详情</b></label>
-                    <p>
-                        {{ $customer_log->description }}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-@endsection

routes/web.php

@@ -597,8 +597,8 @@ Route::group(['prefix'=>'customer'],function(){
     });
     Route::get('relating',function (){return view('customer.relating');});
     Route::group(['prefix' => 'customer'], function () {
-        Route::resource('customer_log_statuses', 'CustomerLogStatusesController', ['only' => ['index', 'show', 'create', 'store', 'update', 'edit', 'destroy']]);
-        Route::resource('customer_logs', 'CustomerLogsController', ['only' => ['index', 'show', 'create', 'store', 'update', 'edit', 'destroy']]);
+        Route::resource('customerLogStatus', 'CustomerLogStatusController', ['only' => ['index', 'show', 'create', 'store', 'update', 'edit', 'destroy']]);
+        Route::resource('customerLog', 'CustomerLogController', ['only' => ['index', 'show', 'create', 'store', 'update', 'edit', 'destroy']]);
     });
     Route::resource('customer', 'CustomerBaseController');
 

文档/WAS项目规范.md

@@ -1,3 +1,5 @@
+## 全局
+    PHP中长文本如无拼接必要性使用定界符(<<<)来声明
 ##命名
 	支持中文命名
 		取消IDE中的Non-ASCII验证