Merge remote-tracking branch 'origin/waybill_ZD' into waybill_ZD

app/Http/Controllers/BillingModelsController.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\BillingModel;
-use App\Carrier;
-use App\Province;
-use App\Unit;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Validator;
-
-class BillingModelsController extends Controller
-{
-    public function index()
-    {
-        if(!Gate::allows('计费模型-查询')){ return redirect(url('/'));  }
-        $billingModels= BillingModel::paginate(50);
-        return view('waybill.billingModel.index',['billingModels'=>$billingModels]);
-    }
-
-
-    public function create()
-    {
-        if(!Gate::allows('计费模型-录入')){ return redirect(url('/'));  }
-        $carriers=Carrier::get();
-        $provinces=Province::with('cities')->get();
-        $units=Unit::get();
-        return view('waybill.billingModel.create',['carriers'=>$carriers,'provinces'=>$provinces,'units'=>$units]);
-    }
-
-
-    public function store(Request $request)
-    {
-        if(!Gate::allows('计费模型-录入')){ return redirect(url('/'));  }
-        $this->validateBillingModel($request)->validate();
-        $billingModel=$request->input('BillingModel');
-        BillingModel::create($billingModel);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
-        return redirect('billingModel')->with('successTip','新计费模型录入成功');
-    }
-
-
-
-    public function edit($id)
-    {
-        if(!Gate::allows('计费模型-编辑')){ return redirect(url('/'));  }
-        $billingModel=BillingModel::find($id);
-        $carriers=Carrier::get();
-        $provinces=Province::with('cities')->get();
-        $units=Unit::get();
-        return view('waybill.billingModel.edit',['billingModel'=>$billingModel,'carriers'=>$carriers,'provinces'=>$provinces,'units'=>$units]);
-    }
-
-
-    public function update(Request $request, $id)
-    {
-        if(!Gate::allows('计费模型-编辑')){ return redirect(url('/'));  }
-        $this->validateBillingModel($request)->validate();
-        $billingModel=BillingModel::find($id);
-        $billingModel->fill($request->input('BillingModel'));
-        if ($billingModel->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
-            return redirect('billingModel')->with('successTip','新计费模型修改成功');
-        }
-    }
-
-    public function destroy($id)
-    {
-        if(!Gate::allows('计费模型-删除')){ return redirect(url('/'));  }
-        $billingModel=BillingModel::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($billingModel),Auth::user()['id']);
-        $result=$billingModel->delete();
-        return ['success'=>$result];
-    }
-
-    protected function validateBillingModel(Request $request){
-        $min = $request->input('BillingModel.range_min');
-        $validator= Validator::make($request->input(),[
-            'BillingModel.province_id'=>'required|integer',
-            'BillingModel.carrier_id'=>'required|integer',
-            'BillingModel.unit_id'=>'required|integer',
-            'BillingModel.city_id'=>'required|Integer',
-            'BillingModel.range_min'=> 'required|min:0|numeric',
-            'BillingModel.range_max'=> "required|min:{$min}|numeric",
-            'BillingModel.unit_price'=>'required|min:0|numeric',
-            'BillingModel.initial_weight'=>'required|min:0|numeric',
-        ],[
-            'required'=>':attribute 为必填项',
-            'min'     =>':attribute 数值过小',
-            'max'      => ':attribute 数值过大',
-            'numeric' =>':attribute 应为数字',
-            'integer'=> ':attribute 选择错误',
-        ],[
-            'BillingModel.province_id'=>'省份',
-            'BillingModel.carrier_id'=>'承运商',
-            'BillingModel.unit_id'=>'计重单位',
-            'BillingModel.city_id'=>'城市',
-            'BillingModel.range_min'=>'价格区间最小值',
-            'BillingModel.range_max'=>'价格区间最大值',
-            'BillingModel.unit_price'=>'单价',
-            'BillingModel.initial_weight'=>'始重',
-        ]);
-        return $validator;
-    }
-}

app/Http/Controllers/CarTypesController.php

@@ -28,7 +28,8 @@ class CarTypesController extends Controller
     public function store(Request $request)
     {
         if(!Gate::allows('车型-录入')){ return redirect(url('/'));  }
-        $this->validatorCarType($request)->validate();
+        $id=false;
+        $this->validatorCarType($request,$id)->validate();
         $carTypes=$request->input('CarType');
         if(CarType::create($carTypes)){
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -46,7 +47,7 @@ class CarTypesController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('车型-编辑')){ return redirect(url('/'));  }
-        $this->validatorCarType($request)->validate();
+        $this->validatorCarType($request,$id)->validate();
         $data=$request->input('CarType');
         $carType=CarType::find($id);
         $carType->fill($data);
@@ -65,9 +66,10 @@ class CarTypesController extends Controller
         return ['success'=>$result];
     }
 
-    protected  function validatorCarType(Request $request){
+    protected  function validatorCarType(Request $request,$id){
+        if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
-            'CarType.name'=>'required|max:50|unique:car_types,name',
+            'CarType.name'=>['required','max:50',isset($name)?"unique:car_types,name,$name":'unique:car_types,name'],
             'CarType.model'=>'nullable|alpha_dash|max:50',
             'CarType.length'=>'nullable|numeric|min:0',
             'CarType.load'=>'nullable|numeric|min:0',

app/Http/Controllers/CarriersController.php

@@ -28,7 +28,8 @@ class CarriersController extends Controller
     public function store(Request $request)
     {
         if(!Gate::allows('承运商-录入')){ return redirect(url('/'));  }
-        $this->validatorCarrier($request)->validate();
+        $id=false;
+        $this->validatorCarrier($request,$id)->validate();
         $carriers=$request->input('Carrier');
         if(Carrier::create($carriers)){
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -45,7 +46,7 @@ class CarriersController extends Controller
 
     public function update(Request $request, $id)
     {
-        $this->validatorCarrier($request)->validate();
+        $this->validatorCarrier($request,$id)->validate();
         if(!Gate::allows('承运商-编辑')){ return redirect(url('/'));  }
         $data=$request->input('Carrier');
         $carrier=Carrier::find($id);
@@ -65,9 +66,10 @@ class CarriersController extends Controller
         return ['success'=>$result];
     }
 
-    protected function validatorCarrier(Request $request){
+    protected function validatorCarrier(Request $request,$id){
+        if ($id){$name=$id;};
         $validator=Validator::make($request->input(),[
-            'Carrier.name'=>'max:50|required|unique:carriers,name',
+            'Carrier.name'=>['max:50','required',isset($name)?"unique:carriers,name,$name":'unique:carriers,name'],
             'Carrier.mobile'=>['required','regex:/^(\d{7,11})|(1[3|4|5|7|8][0-9]\d{4,8})$/','unique:carriers,name'],
             'Carrier.delivery_fee'=>'nullable|min:0|numeric|max:999999',
         ],[

app/Http/Controllers/CitiesController.php

@@ -29,7 +29,8 @@ class CitiesController extends Controller
     public function store(Request $request)
     {
         if(!Gate::allows('城市-录入')){ return redirect(url('/'));  }
-        $this->validatorCities($request)->validate();
+        $id=false;
+        $this->validatorCities($request,$id)->validate();
         $cities=$request->input('City');
         if(City::create($cities)){
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -48,7 +49,7 @@ class CitiesController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('城市-编辑')){ return redirect(url('/'));  }
-        $this->validatorCities($request)->validate();
+        $this->validatorCities($request,$id)->validate();
         $data=$request->input('City');
         $city=City::find($id);
         $city->fill($data);
@@ -67,9 +68,10 @@ class CitiesController extends Controller
         return ['success'=>$result];
     }
 
-    public function validatorCities(Request $request){
+    public function validatorCities(Request $request,$id){
+        if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
-            'City.name'=>'required|max:50|unique:cities,name',
+            'City.name'=>'||',['required','max:50',isset($name)?"unique:cities,name,$name":'unique:cities,name'],
         ],[
             'required'=>':attribute 为必填项',
             'unique'=>':attribute 已存在',

app/Http/Controllers/ProvincesController.php

@@ -27,7 +27,8 @@ class ProvincesController extends Controller
     public function store(Request $request)
     {
         if(!Gate::allows('省份-录入')){ return redirect(url('/'));  }
-        $this->validatorProvinces($request)->validate();
+        $id=false;
+        $this->validatorProvinces($request,$id)->validate();
         $provinces=$request->input('Province');
         if(Province::create($provinces)){
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -45,7 +46,7 @@ class ProvincesController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('省份-编辑')){ return redirect(url('/'));  }
-        $this->validatorProvinces($request)->validate();
+        $this->validatorProvinces($request,$id)->validate();
         $data=$request->input('Province');
         $province=Province::find($id);
         $province->fill($data);
@@ -64,9 +65,10 @@ class ProvincesController extends Controller
         return ['success'=>$result];
     }
 
-    protected function validatorProvinces(Request $request){
+    protected function validatorProvinces(Request $request,$id){
+        if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
-            'Province.name'=>'required|max:50|unique:provinces,name',
+            'Province.name'=>'||',['required','max:50',isset($name)?"unique:provinces,name,$name":'unique:provinces,name'],
         ],[
             'required'=>':attribute 为必填项',
             'unique'=>':attribute 已存在',

app/Http/Controllers/UnitsController.php

@@ -28,7 +28,8 @@ class UnitsController extends Controller
     public function store(Request $request)
     {
         if(!Gate::allows('计量单位-录入')){ return redirect(url('/'));  }
-        $this->validatorUnit($request)->validate();
+        $id=false;
+        $this->validatorUnit($request,$id)->validate();
         $units=$request->input('Unit');
         if(Unit::create($units)){
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -46,7 +47,7 @@ class UnitsController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('计量单位-编辑')){ return redirect(url('/'));  }
-        $this->validatorUnit($request)->validate();
+        $this->validatorUnit($request,$id)->validate();
         $data=$request->input('Unit');
         $unit=Unit::find($id);
         $unit->fill($data);
@@ -65,9 +66,10 @@ class UnitsController extends Controller
         return ['success'=>$result];
     }
 
-    protected function validatorUnit(Request $request){
+    protected function validatorUnit(Request $request,$id){
+        if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
-            'Unit.name'=>'required|max:10|unique:units,name',
+            'Unit.name'=>['required','max:10',isset($name)?"unique:units,name,$name":'unique:units,name'],
         ],[
             'required'=>':attribute 为必填项',
             'max'=>':attribute 过长',