was 修改tittle

app/Http/Controllers/LaborReportController.php

@@ -12,6 +12,7 @@ use App\UserDutyCheck;
 use App\UserWorkgroup;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Maatwebsite\Excel\Facades\Excel;
@@ -63,7 +64,6 @@ class LaborReportController extends Controller
      */
     public function index(Request $request)
     {
-        //if(!Gate::allows('人事管理')){ return redirect(url('/'));  }
         if(!Gate::allows('人事管理-临时工报表')){ return redirect(url('/'));  }
         $user=Auth::user();
         if (!$user)return redirect('/');
@@ -83,9 +83,8 @@ class LaborReportController extends Controller
         if(Gate::allows('人事管理-临时工报表-可见全部组')||Gate::allows('人事管理-门卫审核')){
             $laborReportsBuilder->orWhereNull('user_workgroup_id');
         }
-        $laborReportsPaginate=$laborReportsBuilder->orderBy('id','DESC')->paginate(50);
-        $laborReports=$laborReportsPaginate->sortBy('name');
-        //$laborReports->values()->all();
+        $laborReports=$laborReportsBuilder->orderBy('id','DESC')->orderBy('name','desc')->paginate(50);
+        //$laborReports=$laborReportsPaginate->sortBy('name');
         foreach ($laborReports as $laborReport){
 //            if (!$laborReport->group_user_id){
 //                //三十分钟之内组长未审核实行软删除
@@ -101,9 +100,9 @@ class LaborReportController extends Controller
                 $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }
         }
+        $request=$request->input();
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',compact('laborReports','laborReportsPaginate','userWorkGroups','laravelEchoPrefix','permittingWorkgroups'));
-
+        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','request'));
     }
     public function export($id,Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }

app/Http/Controllers/UserDutyCheckController.php

@@ -230,6 +230,7 @@ class UserDutyCheckController extends Controller
             'type' => '临时工',
         ]);
         $userDetail->save();
+        $userDetail->updateUserName();
         $userLabor = new UserLabor([
             'user_id' => $user->id,
             'labor_company_id' => $labor_company_id,

app/UserDetail.php

@@ -28,6 +28,11 @@ class UserDetail extends Model
     public function userDutyChecks(){
         return $this->hasMany('App\UserDutyCheck','user_id','user_id');
     }
+    public function updateUserName(){
+        if ($this['mobile_phone']==$this['user']['name'])
+            $this['user']->update(['name'=>$this['full_name']]);
+    }
+
     public function getUserLaborCompanyAttribute()
     {
         $laborCompanyId=$this['userLabor']['labor_company_id']??0;

public/js/app.js

@@ -61628,6 +61628,8 @@ module.exports = yeast;
 
 __webpack_require__(/*! ./bootstrap */ "./resources/js/bootstrap.js");
 
+__webpack_require__(/*! ./mounted */ "./resources/js/mounted.js");
+
 window.Vue = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.common.js");
 window.tempTip = __webpack_require__(/*! ./utilities/tempTip */ "./resources/js/utilities/tempTip.js");
 window.getGetVal = __webpack_require__(/*! ./utilities/getGetVal */ "./resources/js/utilities/getGetVal.js");
@@ -61710,6 +61712,29 @@ window.initEcho = function () {
 
 /***/ }),
 
+/***/ "./resources/js/mounted.js":
+/*!*********************************!*\
+  !*** ./resources/js/mounted.js ***!
+  \*********************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+//解决input number类型上下滚动 禁用滚轮事件
+setTimeout(function () {
+  for (var i = 0; i < $("input[type='number']").length; i++) {
+    $("input[type='number']")[i].setAttribute('onmousewheel', 'return false'); //禁止谷歌浏览器、Opera浏览器以及360浏览器等采用谷歌内核的浏览器
+
+    $("input[type='number']")[i].addEventListener('DOMMouseScroll', MouseWheel, false); //禁止Firefox浏览器
+  }
+}, 100);
+
+function MouseWheel(event) {
+  event = event || window.event;
+  event.preventDefault();
+}
+
+/***/ }),
+
 /***/ "./resources/js/utilities/datetimeRelating.js":
 /*!****************************************************!*\
   !*** ./resources/js/utilities/datetimeRelating.js ***!
@@ -61945,8 +61970,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\wamp64\www\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -61962,4 +61987,4 @@ module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss *
 
 /***/ })
 
-/******/ });
+/******/ });

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

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

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

@@ -6,7 +6,7 @@
             <ul class="nav nav-pills">
                 @can('订单管理-查询')
                     <li class="nav-item">
-                        <a class="nav-link text-dark" href="{{url('order/index/delivering')}}" :class="{active:isActive('delivering',3)}">查询</a>
+                        <a class="nav-link" href="{{url('order/index/delivering')}}" :class="{active:isActive('delivering',3)}">查询</a>
                     </li> @endcan
             </ul>
         </div>

resources/views/order/menu.blade.php

@@ -8,7 +8,7 @@
             </li> @endcan
             @can('订单管理-波次-查询')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('wave/index/')}}" :class="{active:isActive('wave',1)}">波次</a>
+                    <a class="nav-link" href="{{url('order/wave/index/')}}" :class="{active:isActive('wave',2)}">波次</a>
             </li> @endcan
         </ul>
     </div>

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

@@ -6,7 +6,7 @@
             <ul class="nav nav-pills">
                 @can('订单管理-波次-查询')
                     <li class="nav-item">
-                        <a class="nav-link text-dark" href="{{url('wave/index/')}}" :class="{active:isActive('wave',1)}">查询</a>
+                        <a class="nav-link" href="{{url('order/wave/index/')}}" :class="{active:isActive('wave',2)}">查询</a>
                     </li> @endcan
             </ul>
         </div>

resources/views/order/wave/search.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')订单管理-波次@endsection
 
 @section("content")
     @component("order.wave.menu")@endcomponent
@@ -72,7 +73,8 @@
                 </tr>
             </table>
             <button type="button" class="btn btn-sm " @click="pervPage" :class="'{{$param['currPage']}}'> 1? 'btn-outline-info ':'disabled'" {{--disabled="'{{$param['currPage']}}'> 1?'':true"--}}>上一页</button>
-            <button type="button" class="btn btn-sm " @click="nextPage" :class="'{{$param['currPage']}}'<'{{$param['pageTotal']}}'? 'btn-outline-info':'disabled'"  :disabled="currPage == pageTotal">下一页</button>
+            <button type="button" class="btn btn-sm " @click="nextPage" :class="'{{$param['currPage']}}'<'{{$param['pageTotal']}}'? 'btn-outline-info':'disabled'" :disabled="currPage == pageTotal">下一页</button>
+
             <input @keyup.enter="pageTurning($event)" class="form-control-sm ml-3 tooltipTarget"
                    :placeholder="'当前页数：'+'{{$param['currPage']}}'+'/'+'{{$param['pageTotal']}}'" title="去往指定页">
             <span class="text-muted m-1">共 {{$param['count']}} 条 </span>
@@ -148,7 +150,7 @@
                     // console.log(ids);
                     tempTip.setDuration(99999)
                     tempTip.waitingTip('取消中，请稍候')
-                    axios.post("{{url("wave/cancelPrinting")}}", {ids: ids}).then(function (res) {
+                    axios.post("{{url("order/wave/cancelPrinting")}}", {ids: ids}).then(function (res) {
                         tempTip.setDuration(5000)
                         tempTip.cancelWaitingTip();
                         if (res.data.success) {
@@ -203,7 +205,7 @@
                     let url = window.location.search ;
                     url = url.length< 2 ? '' : url.substring(1);
                     console.log(search,url);
-                    window.open("{{url('wave/exportExcel?')}}"+search+url);
+                    window.open("{{url('oder/wave/exportExcel?')}}"+search+url);
                     // todo
                    /* let instance = axios.create({
                         {{--url:'{{url("wave/exportExcel")}}',--}}

resources/views/personnel/laborReport/index.blade.php

@@ -202,7 +202,8 @@
                     </tr>
                     </tbody>
                 </table>
-        <div>{{$laborReportsPaginate->links()}}</div>
+        <div class="text-info h5 btn btn">{{$laborReports->count()}}/{{$laborReports->total()}}</div>
+        <div>{{$laborReports->appends($request)->links()}}</div>
         {{--      选择晚饭时长弹框      --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">

resources/views/personnel/menuPersonnel.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')相关设置@endsection
 
 @section('content')
     <div id="nav2">

resources/views/process/menuProcess.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')相关设置@endsection
 
 @section('content')
     <div id="nav2">

resources/views/rejected/recycle.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')已删除@endsection
+@section('title')退货管理回收@endsection
 
 @section('content')
     <div id="nav2">

resources/views/rejected/relating.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')相关设置@endsection
 
 @section('content')
     <div id="nav2">

resources/views/store/fast/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')手动录入@endsection
+@section('title')快速入库@endsection
 
 @section('content')
     <div id="nav2">

resources/views/store/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')称重管理@endsection
+@section('title')入库管理@endsection
 
 @section('content')
     <span id="nav2">

resources/views/waybill/create.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')运输管理-录入@endsection
 
 @section('content')
     <div id="nav2">

resources/views/waybill/delivering.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')运输管理-发运@endsection
 
 @section('content')
     @component('waybill.menu')@endcomponent

resources/views/waybill/menuWaybill.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')相关设置@endsection
 
 @section('content')
     <div id="nav2">

resources/views/weight/menuWeight.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')相关设置@endsection
 
 @section('content')
     <div id="nav2">

resources/views/weight/package/statistics.blade.php

@@ -1,6 +1,6 @@
 
 @extends('layouts.app')
-@section('title')入库管理@endsection
+@section('title')统计@endsection
 
 @section('content')
     <span id="nav2">

routes/web.php

@@ -317,11 +317,11 @@ Route::group(['prefix'=>'order'],function(){
 /**
  * 波次
  */
-Route::group(['prefix'=>'wave'],function(){
+Route::group(['prefix'=>'order'],function(){
     // index
-    Route::get('index','WaveController@index');
+    Route::get('wave/index','WaveController@index');
     // cancel printing by id or ids
-    Route::post('cancelPrinting','WaveController@cancelPrinting');
+    Route::post('wave/cancelPrinting','WaveController@cancelPrinting');
     // export Excel
-    Route::any('exportExcel','WaveController@exportExcelOnParams');
+    Route::any('wave/exportExcel','WaveController@exportExcelOnParams');
 });