人事勾选导出，人事换组逻辑修改

app/Http/Controllers/UserDutyCheckController.php

@@ -309,7 +309,7 @@ class UserDutyCheckController extends Controller
             //换组判断上一条临时工报表信息是否退组
             $laborReportNow = LaborReport::where('user_id', $user_id)->orderBy('id', 'desc')->first();
             if ($laborReportNow['group_user_id'] && !$laborReportNow['check_out_at']) return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可换组，请联系之前组长!</h1>";
-//            if ($laborReportNow['user_workgroup_id'] == $userWorkgroupID) return "<h1 style='color: darkred;text-align:center'>您已进组,不可再次进组!</h1>";
+            if (!$laborReportNow['group_user_id'] && $laborReportNow['user_workgroup_id']==$userWorkgroupID) return "<h1 style='color: darkred;text-align:center'>当前已进组，请等待组长审核！</h1>";
             //此处表示临时工换组操作
             $newLaborReport = $laborReportService->changeGroupAndMakeLaborReport($user_id, $userWorkgroupID);
             $this->log(__METHOD__, "当日临时工换组新建临时工报表记录__" . __FUNCTION__, json_encode([$user_id, $userWorkgroupID]));

app/Services/LaborReportService.php

@@ -28,7 +28,7 @@ class LaborReportService
     private function conditionQuery(array $params){
         $user=Auth::user();
         $laborReports=LaborReport::query()->with(['user','userDutyCheck','userWorkgroup','laborCompany'])->orderBy('labor_reports.id','DESC');
-        if (!($params["is_export"] ?? false)){
+        if (!($params["is_export"] ?? false)&&!($params['id']??null)){
             $laborReports = $laborReports->whereNotIn('labor_reports.enter_number',function ($builder)use($params){
                 $builder->select('enter_number')->from('labor_reports')
                     ->leftJoin('labor_report_statuses','labor_reports.id','labor_report_statuses.labor_report_id')
@@ -178,14 +178,12 @@ class LaborReportService
         $mobile_phone=$userDetail['mobile_phone'];
         $identity_number=$userDetail['identity_number'];
         $labor_company_id=UserLabor::where('user_id',$user_id)->value('labor_company_id');
-//        $labor_company=LaborCompany::where('id',$labor_company_id)->value('name');
         $laborReport=new LaborReport([
             'user_workgroup_id'=>$userWorkgroupID,
             'user_id'=>$user_id,
             'name'=>$name,
             'mobile_phone'=>$mobile_phone,
             'identity_number'=>$identity_number,
-//            'labor_company'=>$labor_company,
             'labor_company_id'=>$labor_company_id,
             'check_in_at'=>date('Y-m-d H:i:s'),
             'user_duty_check_id'=>$userDutyCheck->id,

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

@@ -111,9 +111,9 @@
         </span>
         </form>
 
-        <div class="row d-none d-xl-block" v-if="inventoryAccountMissions.length>=1&&!listMode">
+        <div class="row d-none d-xl-block" v-if="inventoryAccountMissions.length>=1">
             <div class="col-12 col-md-12 col-sm-12">
-                <table class="table table-sm table-bordered table-info mt-2">
+                <table class="table table-sm table-bordered table-info mt-2" v-if="!listMode">
                     <tr>
                         <td>操作</td>
                         <td>库位</td>
@@ -176,9 +176,9 @@
             </div>
         </div>
 
-        <div class="card-header pt-0">
-            <div id="form"></div>
-        </div>
+{{--        <div class="card-header pt-0">--}}
+{{--            <div id="form"></div>--}}
+{{--        </div>--}}
         <div class="card-body pt-1">
             <label for="all" class="d-none" id="cloneCheckAll">
                 <input id="all" type="checkbox" @click="checkAll($event)">全选