人事管理，打卡页面修改

app/Http/Controllers/QRCodeController.php

@@ -17,7 +17,7 @@ class QRCodeController extends Controller
 {
     //进入打卡页面
     public function goGetQRCode(){
-        $warehouses=Warehouse::get();
+        $warehouses=Warehouse::with('userWorkgroups')->get();
         return view("personnel/checking-in/getQRcode",compact('warehouses'));
     }
 
@@ -122,13 +122,13 @@ class QRCodeController extends Controller
         return ['importAndExportQRCodes'=>$importAndExportQRCodes,'last_refresh_date'=>Cache::get('last_refresh_date'),'csrf_Token'=>$csrfToken];
     }
 
-    //点击仓获取仓下所有工作组页面
-    public function getUserWorkGroups(Request $request){
-        $warehouseId=$request->input('warehouseId');
-        $userWorkgroups=UserWorkgroup::where('warehouse_id',$warehouseId)->get();
-        if (!$userWorkgroups)return view('exception.404',['error'=>'未找到工作组！']);
-        return view('personnel/checking-in/getUserWorkGroups',['userWorkgroups'=>$userWorkgroups]);
-    }
+//    //点击仓获取仓下所有工作组页面
+//    public function getUserWorkGroups(Request $request){
+//        $warehouseId=$request->input('warehouseId');
+//        $userWorkgroups=UserWorkgroup::where('warehouse_id',$warehouseId)->get();
+//        if (!$userWorkgroups)return view('exception.404',['error'=>'未找到工作组！']);
+//        return view('personnel/checking-in/getUserWorkGroups',['userWorkgroups'=>$userWorkgroups]);
+//    }
 
     //进入工作组二维码显示页面
     public function QRCode(Request $request){

resources/views/personnel/checking-in/getQRcode.blade.php

@@ -9,12 +9,23 @@
         <div class="card col-md-10 offset-md-1 p-0">
             <div class="card-body">
                 <div class="list-group list-group-horizontal-lg align-content-center">
-                <a target="_blank" class="btn list-group-item col-md-2 list-group-item-info" type="button" :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
+                <a target="_blank" class="btn col-md-2 btn-outline-primary"  :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
                 </div>
-                <div class="list-group list-group-horizontal-lg align-content-center" v-if="warehouses">
-                    <a class="btn list-group-item col-md-2" type="button" :href="('{{url('personnel/checking-in/getUserWorkGroups?warehouseId=')}}'+warehouse.id)"  :class="warehouse==checkedWarehouse ? 'btn-primary' : 'btn-outline-primary'"
-                       v-for="warehouse in warehouses">@{{ warehouse.name }}</a>
+                <br>
+                <div class="card align-content-center" v-if="warehouses" v-for="warehouse in warehouses">
+                    <div class="card-body">
+                        <div class="card-title"> <span>@{{ warehouse.name }}</span></div>
+                    </div>
+                    <div class="row mb-3 ml-2">
+
+                        <div class="col-2" v-for="userWorkgroup in warehouse.user_workgroups">
+                            <a target="_blank"  class="btn" :href="('{{url('personnel/checking-in/QRCode?userWorkgroupId=')}}'+userWorkgroup.id)"  :class="userWorkgroup==checkedUserWorkgroup ? 'btn-primary' : 'btn-outline-primary'"
+                              >@{{ userWorkgroup.name }}</a>
+                        </div>
+                    </div>
+
                 </div>
+
                 <h3 v-else>还未录入仓库，请先录入仓库！</h3>
             </div>
         </div>
@@ -25,12 +36,8 @@
         new Vue({
             el:"#page",
             data:{
-                warehouses:[
-                    @foreach($warehouses as $warehouse)
-                    {!! $warehouse !!},
-                    @endforeach
-                ],
-                checkedWarehouse:'',
+                warehouses:{!! $warehouses !!},
+                checkedUserWorkgroup:'',
             },
         });
     </script>

routes/web.php

@@ -149,8 +149,8 @@ Route::resource('store/storeItem','StoreItemsController');
 Route::get('personnel/checking-in/goGetQRCode','QRCodeController@goGetQRCode');
 //进入组二维码显示页面
 Route::get('personnel/checking-in/QRCode','QRCodeController@QRCode');
-//打卡页面点击仓库获取所有的工作组
-Route::get('personnel/checking-in/getUserWorkGroups','QRCodeController@getUserWorkGroups');
+////打卡页面点击仓库获取所有的工作组
+//Route::get('personnel/checking-in/getUserWorkGroups','QRCodeController@getUserWorkGroups');
 
 //进入进出场二维码显示页面
 Route::get('personnel/checking-in/importAndExportQRCode','QRCodeController@importAndExportQRCode');