客户原型HTML上传

app/Http/Controllers/ClientController.php

@@ -51,6 +51,15 @@ class ClientController extends Controller
     public function instantBillIndex(){
         return view('client.instantBill.index');
     }
+    public function valueAddedServiceIndex(){
+        return view('client.valueAddedService.index');
+    }
+    public function valueAddedServiceCreate(){
+        return view('client.valueAddedService.create');
+    }
+    public function relating(){
+        return view('client.relating');
+    }
 
     /**
      * Store a newly created resource in storage.

app/Http/Controllers/JobTypeController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class JobTypeController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('maintenance.jobType.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('maintenance.jobType.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  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

app/JobType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class JobType extends Model
+{
+    //
+}

database/migrations/2020_06_18_111452_create_job_types_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobTypesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('job_types', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('job_types');
+    }
+}

resources/views/client/menu.blade.php

@@ -18,7 +18,10 @@
                 <a class="nav-link" href="{{url('client/instantBill')}}" :class="{active:isActive('instantBill',2)}">即时账单</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link text-muted" href="{{url('client/base')}}" :class="{active:isActive('',2)}">基础资料</a>
+                <a class="nav-link" href="{{url('client/valueAddedService')}}" :class="{active:isActive('valueAddedService',2)}">增值服务</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-muted" href="{{url('client/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
             </li>
         </ul>
     </div>

resources/views/client/menuRelating.blade.php

@@ -0,0 +1,28 @@
+<div class="container-fluid nav3">
+    <div class="card" >
+        <ul class="nav">
+
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/storage')}}" :class="{active:isActive('storage',3)}">仓储费计价模型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/task')}}" :class="{active:isActive('task',3)}">作业费计价模型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/expressage')}}" :class="{active:isActive('expressage',3)}">快递费计价模型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/logistic')}}" :class="{active:isActive('logistic',3)}">物流费计价模型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/Nonstop')}}" :class="{active:isActive('Nonstop',3)}">直发车计价模型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/jobType')}}" :class="{active:isActive('jobType',2)}">类型</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('maintenance/unit')}}" :class="{active:isActive('unit',3)}">单位</a>
+            </li>
+        </ul>
+    </div>
+</div>

resources/views/client/relating.blade.php

@@ -0,0 +1,9 @@
+@extends('layouts.app')
+
+@section('content')
+    <div id="nav2">
+    @component('client.menu')@endcomponent
+    @component('client.menuRelating')@endcomponent
+    </div>
+@endsection
+

resources/views/client/valueAddedService/create.blade.php

@@ -0,0 +1,41 @@
+@extends('layouts.app')
+
+@section('content')
+    @component('client.valueAddedService.menu')@endcomponent
+<form class="card col-md-8 offset-md-2 card-body">
+    <div class="form-inline mt-3">
+        <label class="col-2 text-info">货主</label>
+        <select class="form-control col-7">
+            <option></option>
+        </select>
+    </div>
+    <div class="form-inline mt-3">
+        <label class="col-2 text-info">子项目</label>
+        <select class="form-control col-7">
+            <option></option>
+        </select>
+    </div>
+    <div class="form-inline mt-3">
+        <label class="col-2 text-info">类型</label>
+        <select class="form-control col-7">
+            <option></option>
+        </select>
+    </div>
+    <div class="form-inline mt-3">
+        <label class="col-2 text-info">单位</label>
+        <select class="form-control col-7">
+            <option></option>
+        </select>
+    </div>
+    <div class="form-inline mt-3">
+        <label class="col-2">单价</label>
+        <input class="form-control col-7">
+    </div>
+    <div class="form-group mt-3">
+        <div class="col-7 offset-2">
+            <input type="submit" class="btn btn-success form-control">
+        </div>
+    </div>
+</form>
+@endsection
+

resources/views/client/valueAddedService/index.blade.php

@@ -0,0 +1,51 @@
+@extends('layouts.app')
+
+@section('content')
+    @component('client.valueAddedService.menu')@endcomponent
+    <div class="card m-2">
+        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
+            <tr>
+                <th>货主名</th>
+                <th>子项目</th>
+                <th>类型</th>
+                <th>单位</th>
+                <th>单价</th>
+                <th>操作</th>
+            </tr>
+            <tr>
+                <td rowspan="4" style="vertical-align: middle">货主1</td>
+                <td rowspan="3" style="vertical-align: middle">子项目1</td>
+                <td>卸货费</td>
+                <td>T/m³</td>
+                <td>5.8</td>
+                <td>
+                    <button class="btn btn-sm btn-outline-info">改</button>
+                    <button class="btn btn-sm btn-outline-danger">删</button>
+                </td>
+            </tr>
+            <tr>
+                <td>集装箱掏箱费</td>
+                <td>个</td>
+                <td>200</td>
+                <td><button class="btn btn-sm btn-outline-info">改</button>
+                    <button class="btn btn-sm btn-outline-danger">删</button></td>
+            </tr>
+            <tr>
+                <td>打托</td>
+                <td>个</td>
+                <td>500</td>
+                <td><button class="btn btn-sm btn-outline-info">改</button>
+                    <button class="btn btn-sm btn-outline-danger">删</button></td>
+            </tr>
+            <tr>
+                <td>子项目2</td>
+                <td>贴标/制标</td>
+                <td>件</td>
+                <td>0.8</td>
+                <td><button class="btn btn-sm btn-outline-info">改</button>
+                    <button class="btn btn-sm btn-outline-danger">删</button></td>
+            </tr>
+        </table>
+    </div>
+@endsection
+

resources/views/client/valueAddedService/menu.blade.php

@@ -0,0 +1,16 @@
+<div id="nav2">
+    @component('client.menu')
+    @endcomponent
+    <div class="container-fluid nav3">
+        <div class="card menu-third" >
+            <ul class="nav nav-pills">
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('client/valueAddedService')}}" :class="{active:isActive('',3)}">查询</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('client/valueAddedService/create')}}" :class="{active:isActive('create',3)}">录入</a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>

resources/views/maintenance/jobType/create.blade.php

@@ -0,0 +1,31 @@
+@extends('layouts.app')
+@section('title')新建作业类型@endsection
+
+@section('content')
+    <div id="nav2">
+        @component('maintenance.menu')@endcomponent
+        @component('maintenance.jobType.menu')@endcomponent
+    </div>
+    <div class="container-fluid">
+        <div class="card col-md-8 offset-md-2">
+            <div class="card-body">
+                <form method="POST" action="{{ url('maintenance/unit') }}">
+                    @csrf
+                    <div class="form-group row">
+                        <label class="col-2" >类型代码</label>
+                        <input class="form-control col-8">
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-2" >类型名称</label>
+                        <input class="form-control col-8">
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-8 offset-2">
+                            <input type="submit" class="btn btn-success form-control">
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/maintenance/jobType/index.blade.php

@@ -0,0 +1,29 @@
+
+@extends('layouts.app')
+@section('title')运输价格模型@endsection
+
+@section('content')
+    <span id="nav2">
+        @component('maintenance.menu')@endcomponent
+        @component('maintenance.jobType.menu')@endcomponent
+    </span>
+    <div class="container-fluid card">
+        <table class="m-2 table table-sm table-hover table-striped table-bordered text-nowrap">
+            <tr>
+                <th>ID</th>
+                <th>代码</th>
+                <th>名称</th>
+                <th>操作</th>
+            </tr>
+            <tr>
+                <td>1</td>
+                <td>TB</td>
+                <td>贴标</td>
+                <td>
+                    <button class="btn btn-sm btn-outline-info">改</button>
+                    <button class="btn btn-sm btn-outline-danger">删</button>
+                </td>
+            </tr>
+        </table>
+    </div>
+@endsection

resources/views/maintenance/jobType/menu.blade.php

@@ -0,0 +1,13 @@
+
+<div class="container-fluid nav3">
+    <div class="card" >
+        <ul class="nav nav-pills">
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('maintenance/jobType')}}" :class="{active:isActive('',3)}">查询</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('maintenance/jobType/create')}}"  :class="{active:isActive('create',3)}">录入</a>
+            </li>
+        </ul>
+    </div>
+</div>

resources/views/maintenance/menu.blade.php

@@ -57,6 +57,9 @@
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/priceModel/storage')}}" :class="{active:isActive('priceModel',2)}">计价模型</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/jobType')}}" :class="{active:isActive('jobType',2)}">作业类型</a>
+                </li>
             @can('计费模型')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/waybillPriceModel')}}" :class="{active:isActive('waybillPriceModel',2)}">计费模型</a>

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

@@ -153,8 +153,8 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
                 </td>
-                <td>@can('订单管理-编辑')<button v-if="order.releasestatus==='N'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap">冻结</button>@endcan</td>
                 <td>@{{ i+1 }}</td>
+                <td>@can('订单管理-编辑')<button v-if="order.releasestatus==='N'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap">冻结</button>@endcan</td>
                 <td class="text-dark font-weight-bold text-nowrap">@{{ order.orderno }}</td>
                 <td class="text-muted text-nowrap">@{{ order.codename_c }}</td>
                 <td class="text-nowrap">@{{ order.addtime }}</td>