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

app/Http/Controllers/UnitController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Components\AsyncResponse;
+use App\Unit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+
+class UnitController extends Controller
+{
+    use AsyncResponse;
+    public function index()
+    {
+        if(!Gate::allows('计量单位-查询')){ return redirect(url('/'));  }
+        $units=Unit::query()->paginate(50);
+        return view('maintenance.unit.index',['units'=>$units]);
+    }
+
+    public function destroy($id)
+    {
+        if(!Gate::allows('计量单位-删除')){ return redirect(url('/'));  }
+        Unit::destroy($id);
+        return ['success'=>true];
+    }
+
+    public function save()
+    {
+        $this->gate("计量单位-录入");
+        $errors = $this->validatorUnit(request(),request("id"))->errors();
+        if (count($errors)>0)$this->success(["errors"=>$errors]);
+
+        $obj = ["name"=>request("name"),"sequence"=>request("sequence") ?? 0];
+        if (request("id")){
+            Unit::query()->update($obj);
+            $this->success();
+        }
+        $this->success(Unit::query()->create($obj));
+    }
+
+    protected function validatorUnit(Request $request,$id){
+        if ($id){$name=$id;}
+        $validator=Validator::make($request->input(),[
+            'name'=>['required','max:10',isset($name)?"unique:units,name,$name":'unique:units,name'],
+        ],[
+            'required'=>':attribute 为必填项',
+            'max'=>':attribute 过长',
+            'unique'=>':attribute 已存在',
+        ],[
+            'name'=>'计量单位名称',
+        ]);
+        return $validator;
+    }
+
+    public function getUnits()
+    {
+        return ["success"=>true,"data"=>app("UnitService")->getSelection()];
+    }
+}

app/Http/Controllers/UnitsController.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Unit;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Validator;
-
-class UnitsController extends Controller
-{
-
-    public function index()
-    {
-        if(!Gate::allows('计量单位-查询')){ return redirect(url('/'));  }
-        $units=Unit::paginate(50);
-        return view('maintenance.unit.index',['units'=>$units]);
-    }
-
-    public function create()
-    {
-        if(!Gate::allows('计量单位-录入')){ return redirect(url('/'));  }
-        return view('maintenance.unit.create');
-    }
-
-
-    public function store(Request $request)
-    {
-        if(!Gate::allows('计量单位-录入')){ return redirect(url('/'));  }
-        $id=false;
-        $this->validatorUnit($request,$id)->validate();
-        $units=$request->input('Unit');
-        if(Unit::create($units)){
-            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
-            return redirect('maintenance/unit')->with('successTip','新计量单位“'.$request->input('Unit.name').'”添加成功');
-        };
-    }
-
-    public function edit($id)
-    {
-        if(!Gate::allows('计量单位-编辑')){ return redirect(url('/'));  }
-        $unit=Unit::find($id);
-        return view('maintenance.unit.edit',['unit'=>$unit]);
-    }
-
-    public function update(Request $request, $id)
-    {
-        if(!Gate::allows('计量单位-编辑')){ return redirect(url('/'));  }
-        $this->validatorUnit($request,$id)->validate();
-        $data=$request->input('Unit');
-        $unit=Unit::find($id);
-        $unit->fill($data);
-        if ($unit->save()){
-            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
-            return redirect('maintenance/unit')->with('successTip','计量单位“'.$request->input('Unit.name').'”修改成功');
-        }
-    }
-
-    public function destroy($id)
-    {
-        if(!Gate::allows('计量单位-删除')){ return redirect(url('/'));  }
-        $unit=Unit::find($id);
-        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($unit),Auth::user()['id']);
-        $result=$unit->delete();
-        return ['success'=>$result];
-    }
-
-    protected function validatorUnit(Request $request,$id){
-        if ($id){$name=$id;}
-        $validator=Validator::make($request->input(),[
-            'Unit.name'=>['required','max:10',isset($name)?"unique:units,name,$name":'unique:units,name'],
-        ],[
-            'required'=>':attribute 为必填项',
-            'max'=>':attribute 过长',
-            'unique'=>':attribute 已存在',
-        ],[
-            'Unit.name'=>'计量单位名称',
-        ]);
-        return $validator;
-    }
-
-    public function getUnits()
-    {
-        return ["success"=>true,"data"=>app("UnitService")->getSelection()];
-    }
-}

app/Unit.php

@@ -13,6 +13,6 @@ class Unit extends Model
 
     use ModelTimeFormat;
     protected $fillable=[
-        'name'
+        'name',"sequence"
     ];
 }

database/migrations/2021_02_20_162232_change_units_table_add_sequence_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeUnitsTableAddSequenceColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('units', function (Blueprint $table) {
+            $table->integer("sequence")->default(0)->comment("排序");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('units', function (Blueprint $table) {
+            $table->dropColumn("sequence");
+        });
+    }
+}

resources/sass/text.scss

@@ -151,4 +151,9 @@
     box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
     border-radius: 10px;
     background   : #ededed;
+}
+
+//虚线边框-红色
+.border-dashed-red {
+    border:2px dashed red;
 }

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户-录入更新@endsection
+@section('title')编辑-客户@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户-客户标签@endsection
+@section('title')客户标签-客户@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户@endsection
+@section('title')客户日志状态@endsection
 
 @section('content')
     <div id="nav2">

resources/views/customer/finance/billConfirmation.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户管理-账单确认@endsection
+@section('title')账单确认-客户管理@endsection
 
 @section('content')
     @component('customer.finance.menu')@endcomponent

resources/views/customer/finance/instantBill.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户管理-即时账单@endsection
+@section('title')即时账单-客户管理@endsection
 
 @section('content')
     @component('customer.finance.menu')@endcomponent

resources/views/customer/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')相关设置@endsection
+@section('title')客户管理@endsection
 
 @section("content")
     @component('customer.project.menu')@endcomponent

resources/views/customer/project/area.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts.app')
 @section('title')
-    客户管理-面积报表
+    面积报表-客户管理
 @endsection
 @section('content')
     @component('customer.project.menu')@endcomponent

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户管理-项目录入@endsection
+@section('title')项目编辑-客户管理@endsection
 @section("head")<link href="{{ mix('css/animation.css') }}" rel="stylesheet">@endsection
 @section('content')
     @component('customer.project.menu')
@@ -10,7 +10,7 @@
         @endif
     @endcomponent
     <div class="container-fluid card d-none" id="container">
-        <div class="card-body offset-2">
+        <div class="card-body offset-1">
             <div class="row">
                 <div class="col-2 form-inline cursor-pointer text-dark" @click="switchBase('one')">
                     <div class="h-100 w-25">
@@ -196,7 +196,7 @@
                 selectedResult:"",
                 searchItem:{},//搜索子项集
                 searchBase:5,//搜索基数
-                hover:{},
+                hover:{},//可悬浮列表
             },
             mounted(){
                 let type = "{{$type ?? ''}}";
@@ -243,7 +243,7 @@
                 },
                 //清除垃圾数据
                 _clearRefuse(){
-                    this.errors = [];
+                    this.errors = {};
                     this.importError = [];
                     this.selectedResult = "";
                     this.searchResult = [];
@@ -298,7 +298,9 @@
                 next(){
                     switch (this.base) {
                         case "one":
-                            if (this._verifyOne())this.base = "two";
+                            this._verifyOne(()=>{
+                                this.base = "two";
+                            });
                             break;
                         case "two":
                             if (this._verifyTwo())this.base = "three";
@@ -310,7 +312,9 @@
                 success(){
                     switch (this.base) {
                         case "one":
-                            if (this._verifyOne())window.location.href = "{{url('customer/project/index')}}";
+                            this._verifyOne(()=>{
+                                window.location.href = "{{url('customer/project/index')}}";
+                            });
                             break;
                         case "two":
                             if (this._verifyTwo())window.location.href = "{{url('customer/project/index')}}";
@@ -334,40 +338,31 @@
                     }
                 },
                 //验证基础信息
-                _verifyOne(){
-                    if (!this.owner.name){
-                        this.errors["name"] = ["项目名称为必填项"];
-                        this.$forceUpdate();
+                _verifyOne(func){
+                    if (!this.owner.code){
+                        this.$set(this.errors,"code",["项目代码为必填项"]);
                         return false;
                     }
-                    if (!this.owner.code){
-                        this.errors["code"] = ["项目代码为必填项"];
-                        this.$forceUpdate();
+                    if (!this.owner.name){
+                        this.$set(this.errors,"name",["项目名称为必填项"]);
                         return false;
                     }
                     if (this.owner.name !== this.ownerTemp.name || this.owner.code !== this.ownerTemp.code){
                         let url = "{{url('maintenance/owner/apiStore')}}";
                         let params = {name:this.owner.name,code:this.owner.code,id:this.owner.id};
-                        let result = undefined;
                         window.tempTip.postBasicRequest(url,params,res=>{
                             if (res.errors){
                                 this.errors = res.errors;
-                                this.$forceUpdate();
-                                result = false;
                                 return;
                             }
-                            this.errors = [];
+                            this.errors = {};
                             this.owner.id = res.id;
                             this.ownerTemp.id = res.id;
                             this.ownerTemp.name = res.name;
                             this.ownerTemp.code = res.code;
-                            result = true;
+                            func();
                         });
-                        while (result){
-                            if (typeof result !== "undefined")return result;
-                        }
-                    }
-                    return true;
+                    }else func();
                 },
                 //验证详细描述
                 _verifyTwo(){
@@ -377,7 +372,6 @@
                     if (!this.owner.warehouse_id) error["warehouse_id"] = ["必须选择仓库"];
                     if (JSON.stringify(error) !== "{}"){
                         this.errors = error;
-                        this.$forceUpdate();
                         return;
                     }
                     let url = "{{url('customer/project/projectUpdate')}}";
@@ -395,7 +389,6 @@
                         window.tempTip.postBasicRequest(url,params,res=>{
                             if (res.errors){
                                 this.errors = res.errors;
-                                this.$forceUpdate();
                                 result = false;
                                 return;
                             }
@@ -563,6 +556,7 @@
                 },
                 //保存模型
                 saveModel(){
+                    this._clearRefuse();
                     switch (this.type) {
                         case "storage":
                             this._verifyStorage();
@@ -582,7 +576,6 @@
                     }
                 },
                 _verifyStorage(){
-                    let error = {};
                     if (!this.model.storage.counting_type)error["counting_type"] = ["未选择计费类型"];
                     if (!this.model.storage.name)error["name"] = ["未填写名称"];
                     if (!this.model.storage.using_type)error["using_type"] = ["未选择用仓类型"];
@@ -592,7 +585,6 @@
                     if (!this.model.storage.time_unit_id)error["time_unit_id"] = ["未选择计时单位"];
                     if (JSON.stringify(error) !== "{}"){
                         this.errors = error;
-                        this.$forceUpdate();
                         return;
                     }
                     let url = "{{url('maintenance/priceModel/apiStoreStorage')}}";
@@ -619,7 +611,7 @@
                             unit_id : "",
                             time_unit_id : "",
                         };
-                        this.errors = [];
+                        this.errors = {};
                     });
                 },
                 _verifyOperation() {
@@ -636,15 +628,14 @@
                         }
                     }
                     if (!this.model.operation.name){
-                        this.errors["name"] = ["名称不得为空"];
-                        this.$forceUpdate();
+                        this.$set(this.errors,"name",["名称不得为空"]);
                         return;
                     }
                     if (this.model.operation.isDiscount){
                         let sign = false;
                         this.model.operation.discount_count.forEach((item,i)=>{
                             if (!item || (i!==0 && item<=this.model.operation.discount_count[i-1])){
-                                this.errors["discount_count_"+i] = ["非法满减值"];
+                                this.$set(this.errors,"discount_count_"+i,["非法满减值"]);
                                 sign = true;
                             }
                         });
@@ -654,14 +645,12 @@
                         }
                     }
                     if (this.model.operation.isSingle && !this.model.operation.total_price){
-                        this.errors["total_price"] = ["按单价格不存在"];
-                        this.$forceUpdate();
+                        this.$set(this.errors,"total_price",["按单价格不存在"]);
                         return;
                     }
                     if (this.model.operation.isDiscount && this.model.operation.isSingle){
                         if (!this.model.operation.total_discount_price[0]){
-                            this.errors["total_discount_price"] = ["满减价格不存在"];
-                            this.$forceUpdate();
+                            this.$set(this.errors,"total_discount_price",["满减价格不存在"]);
                             return;
                         }
                         this.model.operation.total_discount_price.forEach((item,i)=>{
@@ -713,7 +702,7 @@
                         if (params.id) this.selectedModel.operation[params.index] = res;
                         else this.selectedModel.operation.push(res);
                         this._resetOperation();
-                        this.errors = [];
+                        this.errors = {};
                     });
                 },
                 _verifyOperationItem(itemIndex){//验证作业费子项信息完整
@@ -762,7 +751,6 @@
                     }
                     if (JSON.stringify(error) !== "{}"){
                         this.errors = error;
-                        this.$forceUpdate();
                         return;
                     }
                     let url = "{{url('maintenance/priceModel/apiStoreExpress')}}";
@@ -789,7 +777,7 @@
                             additional_weight:"",
                             items:[],
                         };
-                        this.errors = [];
+                        this.errors = {};
                         this.importError = [];
                         $(".selectpicker").filter('.express').selectpicker('val',[]);
                     });
@@ -803,7 +791,6 @@
                     if (!this.model.logistic.other_unit_range) error.other_unit_range = ["区间值不得为空"];
                     if (JSON.stringify(error) !== "{}"){
                         this.errors = error;
-                        this.$forceUpdate();
                         return;
                     }
                     let url = "{{url('maintenance/priceModel/apiStoreLogistic')}}";
@@ -829,7 +816,7 @@
                             ranges:[],
                             logistics:[],
                         };
-                        this.errors = [];
+                        this.errors = {};
                         this.importError = [];
                         $(".selectpicker").filter('.logistic').selectpicker('val',[]);
                     });
@@ -840,7 +827,6 @@
                     if (!this.model.directLogistic.base_km) error.base_km = ["起步公里数不得为空"];
                     if (JSON.stringify(error) !== "{}"){
                         this.errors = error;
-                        this.$forceUpdate();
                         return;
                     }
                     let url = "{{url('maintenance/priceModel/apiStoreDirectLogistic')}}";
@@ -859,7 +845,7 @@
                         this.model.directLogistic = {
                             items:[],
                         };
-                        this.errors = [];
+                        this.errors = {};
                         this.importError = [];
                     });
                 },
@@ -1561,6 +1547,15 @@
                     this.model.operation.total_discount_price.push("");
                     arr.push('');
                 },
+                //删除阶梯满减阈值
+                delDiscount(index){
+                    this.model.operation.items.forEach((item,i)=>{
+                        delete item.discount_price[index];
+                        this.$set(this.model.operation.items,i,item);
+                    });
+                    this.$delete(this.model.operation.total_discount_price,index);
+                    this.$delete(this.model.operation.discount_count,index);
+                },
             },
         });
     </script>

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')客户管理-项目查询@endsection
+@section('title')项目查询-客户管理@endsection
 
 @section('content')
     @component('customer.project.menu')@endcomponent

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

@@ -29,7 +29,7 @@
     <label class="col-2">特征</label>
     <label class="col-8">
         <label v-if="model.operation.feature">@{{ model.operation.featureFormat }}</label><br>
-        <button type="button" class="btn btn-dark col-2 ml-2" @click="showAddFeatureModal(-1,model.operation.feature)">调整特征</button>
+        <button type="button" class="btn btn-dark w-75 ml-2" @click="showAddFeatureModal(-1,model.operation.feature)">调整特征</button>
     </label>
 </div>
 <div class="row mt-3" v-if="model.operation.operation_type == '出库'">
@@ -39,17 +39,19 @@
     </div>
     <div class="col-8 row" v-if="model.operation.isDiscount">
         <div class="col-1 cursor-pointer"><span class="fa fa-plus" @click="addDiscount(model.operation.discount_count)"></span></div>
-        <label class="col-3" for="discount">满减阈值</label>
-        <input id="discount" v-model="model.operation.discount_count[0]"
+        <label class="col-2" for="discount">满减阈值</label>
+        <input id="discount" v-model="model.operation.discount_count[0]" :class="errors['discount_count_0'] ? 'is-invalid' : ''"
                class="form-control form-control-sm col-6" step="1" type="number" min="0">
     </div>
 </div>
 <div class="row mt-1" v-for="(value,i) in model.operation.discount_count" v-if="model.operation.isDiscount && i!=0">
     <label class="col-2"></label><div class="col-2"></div>
     <div class="col-8 row">
-        <label class="offset-1 col-3">满减阈值@{{ i+1 }}</label>
+        <label class="offset-1 col-2">满减阈值@{{ i+1 }}</label>
         <input v-model="model.operation.discount_count[i]" :placeholder="Number(model.operation.discount_count[i-1])+1"
+               :class="errors['discount_count_'+i] ? 'is-invalid' : ''"
                class="form-control form-control-sm col-6" step="1" type="number" :min="Number(model.operation.discount_count[i-1])+1">
+        <div class="col-1 cursor-pointer text-danger font-weight-bold h4" @click="delDiscount(i)">&times;</div>
     </div>
 </div>
 <div class="row mt-3">
@@ -81,26 +83,26 @@
         </div>
         <div class="card-body">
             <div class="row mt-2">
-                <div class="col-3">
+                <div class="col-2">
                     <label>
-                        <select class="form-control form-control-sm mt-1" v-model="model.operation.items[0].type">
+                        <select class="form-control mt-1" v-model="model.operation.items[0].type">
                             <option value="0">起步数</option>
                             <option value="1">起步费</option>
                         </select>
                     </label>
                 </div>
-                <div class="col-9">
+                <div class="col-10">
                     <div class="row" v-if="model.operation.items[0].type == 0">
-                        <label class="col-3">起步数</label>
-                        <label class="col-5 mb-0"><input id="amount" type="number" :class="errors['items.0.amount'] ? 'is-invalid' : ''"
+                        <label class="col-2">起步数</label>
+                        <label class="col-8 mb-0"><input id="amount" type="number" :class="errors['items.0.amount'] ? 'is-invalid' : ''"
                                                          v-model="model.operation.items[0].amount" class="form-control" step="1"></label>
                     </div>
                     <div class="row mt-0" v-if="errors['items.0.amount']">
                         <div class="offset-3"><small class="text-danger font-weight-bold ml-3">起步数为必填项</small></div>
                     </div>
                     <div class="row mt-2" v-if="model.operation.items[0].type == 0">
-                        <label class="col-3">单位</label>
-                        <label class="col-5 mb-0"><select v-model="model.operation.items[0].unit_id" class="form-control" :class="errors['items.0.unit_id'] ? 'is-invalid' : ''">
+                        <label class="col-2">单位</label>
+                        <label class="col-6 mb-0"><select v-model="model.operation.items[0].unit_id" class="form-control" :class="errors['items.0.unit_id'] ? 'is-invalid' : ''">
                                 <option v-for="unit in pool.units" :value="unit.id" v-if="unit.name=='件' || unit.name=='箱'">@{{ unit.name }}</option>
                             </select></label>
                     </div>
@@ -108,17 +110,19 @@
                         <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单位为必选项</small></div>
                     </div>
                     <div class="row mt-2">
-                        <label class="col-3">起步费</label>
-                        <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[0].unit_price"
+                        <label class="col-2">起步费</label>
+                        <label class="col-8 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[0].unit_price"
                                                          :class="errors['items.0.unit_price'] ? 'is-invalid' : ''"></label>
                     </div>
                     <div class="row mt-0" v-if="errors['items.0.unit_price']">
                         <div class="offset-3"><small class="text-danger font-weight-bold ml-3">起步费为必填项</small></div>
                     </div>
                     <div class="row mt-2" v-if="model.operation.isDiscount" v-for="(value,i) in model.operation.discount_count">
-                        <label class="col-3">满减起步费(@{{ value }}单)</label>
-                        <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[0].discount_price[i]"
-                                                         :class="errors['items.0.discount_price'] ? 'is-invalid' : ''"></label>
+                        <label class="col-2">满减起步费</label>
+                        <label class="col-8 mb-0"><input type="number" min="0" step="0.001"
+                             :placeholder="value ? (model.operation.discount_count[i+1] ? value+'-'+model.operation.discount_count[i+1]+' 单' : value+'+ 单') : ''"
+                             class="form-control" v-model="model.operation.items[0].discount_price[i]"
+                             :class="errors['items.0.discount_price'] ? 'is-invalid' : ''"></label>
                     </div>
                 </div>
             </div>
@@ -139,8 +143,8 @@
         </div>
         <div class="card-body">
             <div class="row mt-2">
-                <label class="col-3">数量</label>
-                <label class="col-5 mb-0"><input id="amount" type="number" :class="errors['items.1.amount'] ? 'is-invalid' : ''"
+                <label class="col-2">数量</label>
+                <label class="col-8 mb-0"><input id="amount" type="number" :class="errors['items.1.amount'] ? 'is-invalid' : ''"
                        v-model="model.operation.items[1].amount" class="form-control" step="1">
                 </label>
                 <div class="col-4"></div>
@@ -149,8 +153,8 @@
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">数量为必填项</small></div>
             </div>
             <div class="row mt-2">
-                <label class="col-3">单位</label>
-                <label class="col-5 mb-0"><select v-model="model.operation.items[1].unit_id" class="form-control" :class="errors['items.1.unit_id'] ? 'is-invalid' : ''">
+                <label class="col-2">单位</label>
+                <label class="col-6 mb-0"><select v-model="model.operation.items[1].unit_id" class="form-control" :class="errors['items.1.unit_id'] ? 'is-invalid' : ''">
                     <option v-for="unit in pool.units" :value="unit.id" v-if="unit.name=='件' || unit.name=='箱'">@{{ unit.name }}</option>
                 </select></label>
             </div>
@@ -158,17 +162,20 @@
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单位为必填项</small></div>
             </div>
             <div class="row mt-2">
-                <label class="col-3">单价</label>
-                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[1].unit_price"
+                <label class="col-2">单价</label>
+                <label class="col-8 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[1].unit_price"
                            :class="errors['items.1.unit_price'] ? 'is-invalid' : ''"></label>
             </div>
             <div class="row mt-0" v-if="errors['items.1.unit_price']">
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单价为必填项</small></div>
             </div>
             <div class="row mt-2" v-if="model.operation.isDiscount" v-for="(value,i) in model.operation.discount_count">
-                <label class="col-3">满减价(@{{ value }}单)</label>
-                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[1].discount_price[i]"
-                                                 :class="errors['items.1.discount_price'] ? 'is-invalid' : ''"></label>
+                <label class="col-2">满减价</label>
+                <label class="col-8 mb-0">
+                    <input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[1].discount_price[i]"
+                           :placeholder="value ? (model.operation.discount_count[i+1] ? value+'-'+model.operation.discount_count[i+1]+' 单' : value+'+ 单') : ''"
+                           :class="errors['items.1.discount_price'] ? 'is-invalid' : ''">
+                </label>
             </div>
         </div>
     </div>
@@ -190,15 +197,15 @@
         </div>
         <div class="card-body">
             <div class="row mt-2">
-                <label class="col-3">数量</label>
-                <label class="col-5 mb-0"><input type="number" step="1" min="0" :class="errors['items.'+i+'.amount'] ? 'is-invalid' : ''" v-model="item.amount" class="form-control"></label>
+                <label class="col-2">数量</label>
+                <label class="col-8 mb-0"><input type="number" step="1" min="0" :class="errors['items.'+i+'.amount'] ? 'is-invalid' : ''" v-model="item.amount" class="form-control"></label>
             </div>
             <div class="row mt-0" v-if="errors['items.'+i+'.amount']">
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">数量为必填项</small></div>
             </div>
             <div class="row mt-2">
-                <label class="col-3">单位</label>
-                <label class="col-5 mb-0"><select v-model="item.unit_id" class="form-control" :class="errors['items.'+i+'.unit_id'] ? 'is-invalid' : ''">
+                <label class="col-2">单位</label>
+                <label class="col-6 mb-0"><select v-model="item.unit_id" class="form-control" :class="errors['items.'+i+'.unit_id'] ? 'is-invalid' : ''">
                     <option v-for="unit in pool.units" :value="unit.id" v-if="unit.name=='件' || unit.name=='箱'">@{{ unit.name }}</option>
                 </select></label>
             </div>
@@ -206,24 +213,25 @@
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单位为必选项</small></div>
             </div>
             <div class="row mt-2">
-                <label class="col-3">单价</label>
-                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="item.unit_price"
+                <label class="col-2">单价</label>
+                <label class="col-8 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="item.unit_price"
                        :class="errors['items.'+i+'.unit_price'] ? 'is-invalid' : ''"></label>
             </div>
             <div class="row mt-0" v-if="errors['items.'+i+'.unit_price']">
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单价为必填项</small></div>
             </div>
             <div class="row mt-2" v-if="model.operation.isDiscount" v-for="(value,i) in model.operation.discount_count">
-                <label class="col-3">满减价(@{{ value }}单)</label>
-                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="item.discount_price[i]"
-                                                 :class="errors['items.'+i+'.discount_price'] ? 'is-invalid' : ''"></label>
+                <label class="col-2">满减价</label>
+                <label class="col-8 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="item.discount_price[i]"
+                       :placeholder="value ? (model.operation.discount_count[i+1] ? value+'-'+model.operation.discount_count[i+1]+' 单' : value+'+ 单') : ''"
+                       :class="errors['items.'+i+'.discount_price'] ? 'is-invalid' : ''"></label>
             </div>
             <div class="row mt-2">
-                <label class="col-3">特征：</label>
-                <label class="col-5">
+                <label class="col-2">特征：</label>
+                <label class="col-8">
                     <label v-if="errors['items.'+i+'.feature']" class="text-danger">@{{ errors['items.'+i+'.feature'][0] }}</label>
                     <label v-if="item.feature">@{{ item.featureFormat }}</label><br>
-                    <button type="button" class="btn btn-dark ml-2" @click="showAddFeatureModal(i)">调整特征</button>
+                    <button type="button" class="btn w-75 btn-dark ml-2" @click="showAddFeatureModal(i)">调整特征</button>
                 </label>
             </div>
         </div>

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

@@ -358,6 +358,9 @@
                     <h5><span class="ml-0 fa fa-question-circle-o cursor-pointer"
                               data-toggle="tooltip" data-placement="top" title="引入克隆一份已存在模型"></span></h5>
                 </div>
+                <div class="mt-1 offset-2" v-if="errors">
+                    <p v-for="val in errors" class="small text-danger font-weight-bold">@{{ val[0] }}</p>
+                </div>
             </div>
         </div>
     </div>

resources/views/customer/project/report.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts.app')
 @section('title')
-    客户管理-项目报表
+    项目报表-客户管理
 @endsection
 @section('content')
     @component('customer.project.menu')@endcomponent

resources/views/inventory/statement/changeInventory.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')库存管理-动库报表@endsection
+@section('title')动库报表-库存管理@endsection
 @section('content')
     @component('inventory.statement.menu')@endcomponent
 <div id="list" class="d-none card container-fluid" style="min-width: 1500px">

resources/views/inventory/statement/dailyLog.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')库存管理-库存体积@endsection
+@section('title')库存体积-库存管理@endsection
 
 @section('content')
     @component('inventory.statement.menu')@endcomponent

resources/views/inventory/statement/inventoryCompare.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')库存管理-库存-库存对比@endsection
+@section('title')库存对比-库存管理@endsection
 
 @section('content')
     @component('inventory.statement.menu')@endcomponent

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')盘点-任务-{!! $inventoryAccount->id !!}@endsection
+@section('title')库存盘点-库存管理@endsection
 
 @section('content')
     @component('inventory.stockInventory.menu')

resources/views/inventory/stockInventory/mission.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')盘点-任务@endsection
+@section('title')盘点任务-库存管理@endsection
 
 
 @section('content')

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')权限@endsection
+@section('title')权限-基础设置@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建车辆@endsection
+@section('title')录入-车辆@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/carType/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑车辆@endsection
+@section('title')编辑-车辆@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')车辆@endsection
+@section('title')查询-车辆@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建承运商@endsection
+@section('title')录入-承运商@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/carrier/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑承运商@endsection
+@section('title')编辑-承运商@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,6 +1,6 @@
 
 @extends('layouts.app')
-@section('title')承运商@endsection
+@section('title')查询-承运商@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建城市@endsection
+@section('title')录入-城市@endsection
 @section('content')
     <div id="nav2">
         @component('maintenance.menu')@endcomponent

resources/views/maintenance/city/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑城市@endsection
+@section('title')编辑-城市@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')城市@endsection
+@section('title')查询-城市@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建商品@endsection
+@section('title')录入-商品@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/commodity/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑商品@endsection
+@section('title')编辑-商品@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')商品@endsection
+@section('title')查询-商品@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建劳务所@endsection
+@section('title')录入-劳务所@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/laborCompany/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑劳务所@endsection
+@section('title')编辑-劳务所@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')劳务所@endsection
+@section('title')查询-劳务所@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')日志@endsection
+@section('title')查询-日志@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建承运商@endsection
+@section('title')录入-承运商@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/logistic/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑承运商@endsection
+@section('title')编辑-承运商@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')承运商@endsection
+@section('title')查询-承运商@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建测量设备@endsection
+@section('title')录入-测量设备@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/measuringMachine/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑测量设备@endsection
+@section('title')编辑-测量设备@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')测量设备@endsection
+@section('title')查询-测量设备@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建货主@endsection
+@section('title')录入-货主@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/owner/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑货主@endsection
+@section('title')编辑-货主@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')货主@endsection
+@section('title')查询-货主@endsection
 
 @section('content')
     <span id="nav2">

resources/views/maintenance/owner/recycle.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')停运货主@endsection
+@section('title')停用-货主@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,7 +1,5 @@
 @extends('layouts.app')
-@section('title')新建纸箱@endsection
-
-
+@section('title')录入-纸箱@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/paperBox/edit.blade.php

@@ -1,7 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑纸箱@endsection
-
-
+@section('title')编辑-纸箱@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/paperBox/import.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')导入纸箱@endsection
+@section('title')导入-纸箱@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')纸箱@endsection
+@section('title')查询-纸箱@endsection
 
 @section('content')
     <div id="list">

resources/views/maintenance/priceModel/directLogistic/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-直发车-录入@endsection
+@section('title')录入-直发车-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/directLogistic/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-直发车@endsection
+@section('title')查询-直发车-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/express/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-快递计费-录入@endsection
+@section('title')录入-快递计费-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/express/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-物流计费@endsection
+@section('title')查询-物流-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/logistic/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-快递计费-录入@endsection
+@section('title')录入-快递计费-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/logistic/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-快递计费@endsection
+@section('title')查询-快递-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/operation/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-仓储计费@endsection
+@section('title')录入-作业-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/operation/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-作业计费@endsection
+@section('title')查询-作业-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/storage/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')计费模型-仓储计费@endsection
+@section('title')仓储-计费模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/waybillPriceModel/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建价格模型@endsection
+@section('title')录入-价格模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/waybillPriceModel/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')修改价格模型@endsection
+@section('title')编辑-价格模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/waybillPriceModel/import.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')导入价格模型@endsection
+@section('title')导入-价格模型@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/priceModel/waybillPriceModel/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')运输价格模型@endsection
+@section('title')查询-运输-价格模型@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')作业类型-录入更新@endsection
+@section('title')编辑-作业类型@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')作业类型@endsection
+@section('title')查询-作业类型@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建省份@endsection
+@section('title')录入-省份@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/province/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑省份@endsection
+@section('title')编辑-省份@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')省份@endsection
+@section('title')查询-省份@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建品质标签@endsection
+@section('title')录入-品质标签@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/qualityLabel/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑品质标签@endsection
+@section('title')编辑-品质标签@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')品质标签@endsection
+@section('title')查询-品质标签@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建角色@endsection
+@section('title')录入-角色@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/role/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑角色@endsection
+@section('title')编辑-角色@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')角色@endsection
+@section('title')查询-角色@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建教程@endsection
+@section('title')录入-教程@endsection
 @section('head')
     <link rel="stylesheet" type="text/css" href="{{mix('css/trix.css')}}">
     <script type="text/javascript" src="{{mix('js/trix.js')}}"></script>

resources/views/maintenance/tutorial/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')修改教程@endsection
+@section('title')编辑-教程@endsection
 @section('head')
     <link rel="stylesheet" type="text/css" href="{{mix('css/trix.css')}}">
     <script type="text/javascript" src="{{mix('js/trix.js')}}"></script>

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')教程@endsection
+@section('title')查询-教程@endsection
 
 @section('content')
     <span id="nav2">

resources/views/maintenance/tutorial/show.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')教程详情@endsection
+@section('title')详情-教程@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,35 +0,0 @@
-@extends('layouts.app')
-@section('title')新建单位@endsection
-
-@section('content')
-    <div id="nav2">
-        @component('maintenance.menu')@endcomponent
-        @component('maintenance.unit.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 for="name" class="col-2 col-form-label text-right">单位名称</label>
-                        <div class="col-8">
-                            <input type="text" class="form-control @error('Unit.name') is-invalid @enderror"
-                                   name="Unit[name]" autocomplete="off" value="{{ old('Unit')['name'] }}" required>
-                            @error('Unit.name')
-                            <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $message }}</strong>
-                                    </span>
-                            @enderror
-                        </div>
-                    </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/unit/edit.blade.php

@@ -1,41 +0,0 @@
-@extends('layouts.app')
-@section('title')编辑单位@endsection
-
-@section('content')
-    <div id="nav2">
-        @component('maintenance.menu')
-        @endcomponent
-        @component('maintenance.unit.menu')
-                <li class="nav-item">
-                    <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',4)}">修改</a>
-                </li>
-        @endcomponent
-    </div>
-    <div class="container-fluid">
-        <div class="card">
-            <div class="card-body">
-                <form method="POST" action='{{url("maintenance/unit/{$unit->id}")}}'>
-                    @csrf
-                    @method('PUT')
-                    <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">单位名称</label>
-                        <div class="col-8">
-                            <input type="text" class="form-control @error('Unit.name') is-invalid @enderror"
-                                   name="Unit[name]" autocomplete="off" value="{{old('Unit')['name']?old('Unit')['name']:$unit->name}}" required>
-                            @error('Unit.name')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <div class="col-8 offset-2">
-                            <input type="submit" class="btn btn-outline-dark form-control">
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-@endsection

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

@@ -6,28 +6,50 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.unit.menu')@endcomponent
     </span>
-    <div class="container-fluid">
+    <div class="container-fluid" id="list">
+
+        <div class="modal fade" tabindex="-1" role="dialog" id="modal">
+            <div class="modal-dialog modal-lg modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="row">
+                            <label class="col-2 offset-1" for="name">名称</label>
+                            <input class="col-7 form-control form-control-sm" :class="errors.name ? 'is-invalid' : ''" id="name" type="text" v-model="unit.name">
+                            <span class="invalid-feedback mt-0 offset-3" role="alert" v-if="errors.name">
+                        <strong>@{{ errors.name[0] }}</strong>
+                    </span>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @click="submitUnit()">提交</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <div class="card">
             <div class="card-body">
-                @if(Session::has('successTip'))
-                    <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
-                @endif
-                <table class="table table-striped table-sm" id="list">
+                @can("计量单位-录入")<button class="btn btn-outline-info mb-1 mr-3" @click="openModal()"><span class="fa fa-plus"></span>&nbsp;新&nbsp;&nbsp;增</button>@endcan
+                <table class="table table-striped table-sm" id="table-parent">
                     <tr>
                         <th>ID</th>
                         <th>计量单位名称</th>
                         <th>录入时间</th>
                         <th>操作</th>
                     </tr>
-                    <tr v-for="unit in units">
-                        <td class="text-muted">@{{unit.id}}</td>
-                        <td>@{{unit.name}}</td>
-                        <td class="text-muted">@{{unit.created_at}}</td>
+                    <tr v-for="u in units" draggable="true" :id="'unit-'+u.id"
+                        @drop="drop($event)" @dragover="dragover($event)" @dragstart="dragstart($event)">
+                        <td class="text-muted">@{{u.id}}</td>
+                        <td>@{{u.name}}</td>
+                        <td class="text-muted">@{{u.created_at}}</td>
                         <td>
                             @can('计量单位-编辑')
-                                <button class="btn btn-sm btn-outline-primary" @click="edit(unit.id)">改</button> @endcan
+                                <button class="btn btn-sm btn-outline-primary" @click="openModal(u)">改</button> @endcan
                             @can('计量单位-删除')
-                                <button class="btn btn-sm btn-outline-dark" @click="destroy(unit)">删</button> @endcan
+                                <button class="btn btn-sm btn-outline-dark" @click="destroy(u)">删</button> @endcan
                         </td>
                     </tr>
                 </table>
@@ -47,16 +69,19 @@
                     {id:'{{$unit->id}}',name:'{{$unit->name}}',created_at:'{{$unit->created_at}}'},
                     @endforeach
                 ],
+                unit:{},
+                errors:{},
+                dom:"",
             },
             methods:{
                 edit:function(id){
                     location.href = "{{url('maintenance/unit')}}/"+id+"/edit";
                 },
                 destroy:function(unit){
-                    if(!confirm('确定要删除单位“' + unit.name + '”吗？')){return};
+                    if(!confirm('确定要删除单位“' + unit.name + '”吗？'))return;
                     let data=this;
                     let url = "{{url('maintenance/unit')}}/"+unit.id;
-                    axios.delete(url,{id:unit.id})
+                    window.axios.delete(url,{id:unit.id})
                         .then(function (response) {
                             if(response.data.success){
                                 for (let i = 0; i < data.units.length; i++) {
@@ -71,12 +96,55 @@
                                 tempTip.setDuration(1000);
                                 tempTip.show('删除单位"'+unit.name+'"失败!')
                             }
-                        })
-                        .catch(function (err) {
+                        }).catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除单位失败!'+'网络错误：' + err);
-                            console.log(err);
+                    });
+                },
+                openModal(unit = null){
+                    if (unit) this.unit={id:unit.id,name:unit.name};
+                    else this.tag={id:"",name:""};
+                    $("#modal").modal("show");
+                },
+                submitUnit(){
+                    let url="{{url('maintenance/unit/save')}}";
+                    let msg=this.unit.id ? "成功修改单位“"+this.unit.name+"”"  : "成功新增单位“"+this.unit.name+"”";
+                    window.tempTip.postBasicRequest(url,this.unit,(res)=>{
+                        if(res && res.errors){
+                            console.log(res.errors);
+                            this.errors = res.errors;
+                            return '';
+                        }
+                        if (this.unit.id){
+                            this.units.some((unit)=> {
+                                if (unit.id === this.unit.id){
+                                    unit.name = this.unit.name;
+                                    return true;
+                                }
+                            });
+                        }else this.units.unshift({
+                            id:res.id,
+                            name:res.name,
+                            created_at:res.created_at,
                         });
+
+                        $("#modal").modal("hide");
+                        return msg;
+                    },true);
+                },
+                dragover(e){
+                    e.preventDefault();
+                    e.currentTarget.after(document.getElementById("dragover-container"))
+                },
+                dragstart(e){
+                    this.dom = e.currentTarget.outerHTML;
+                    e.target.innerHTML = "<tr draggable='true'><td colspan='4' class='text-secondary'><div class='w-100 text-center'>拖拽至此</div></td></tr>";
+                    e.target.className = "border-dashed-red";
+                    e.target.id = "dragover-container";
+                },
+                drop(e){
+                    e.preventDefault();
+                    $("#dragover-container").replaceWith(this.dom);
                 },
             }
         });

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

@@ -6,11 +6,6 @@
             <li class="nav-item">
                 <a class="nav-link" href="{{url('maintenance/unit')}}" :class="{active:isActive('',3)}">查询</a>
             </li> @endcan
-            @can('计量单位-录入')
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/unit/create')}}" :class="{active:isActive('create',3)}">录入</a>
-            </li> @endcan
-            {{$slot}}
         </ul>
     </div>
 </div>

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建用户@endsection
+@section('title')录入-用户@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/user/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑用户@endsection
+@section('title')编辑-用户@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')用户@endsection
+@section('title')查询-用户@endsection
 
 @section('content')
     <span id="nav2">

resources/views/maintenance/userLabor/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')临时工@endsection
+@section('title')编辑-临时工@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')临时工@endsection
+@section('title')查询-临时工@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')项目组-录入更新@endsection
+@section('title')编辑-项目组@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')项目组@endsection
+@section('title')查询-项目组@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')新建工作组@endsection
+@section('title')录入-工作组@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/userWorkgroup/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑工作组@endsection
+@section('title')编辑-工作组@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')工作组@endsection
+@section('title')查询-工作组@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建仓库@endsection
+@section('title')录入-仓库@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/warehouse/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑仓库@endsection
+@section('title')编辑-仓库@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')仓库@endsection
+@section('title')查询-仓库@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')订单管理@endsection
+@section('title')查询-订单管理@endsection
 
 @section('content')
     @component('order.index.menu')@endcomponent

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

@@ -1,5 +1,5 @@
 @extends("layouts.app")
-@section('title')订单管理-自动冻结@endsection
+@section('title')自动冻结-订单管理@endsection
 
 @section('content')
     @component('order.index.menu')@endcomponent