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

app/Http/Controllers/UserDutyCheckController.php

@@ -304,8 +304,9 @@ class UserDutyCheckController extends Controller
             return response()->view('personnel/checking-in/success', ['group_name' => $group_name ?? '', 'full_name' => $userDetail->full_name, 'check_in_at' => $newLaborReport->check_in_at, 'laravelEchoPrefix' => $laravelEchoPrefix]);
         } else {
             //换组判断上一条临时工报表信息是否退组
-            $laborReportNow = LaborReport::where('user_id', $user_id)->whereNotNull('group_user_id')->orderBy('id', 'desc')->first();
-            if ($laborReportNow && !$laborReportNow['check_out_at']) return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可换组，请联系之前组长!</h1>";
+            $laborReportNow = LaborReport::where('user_id', $user_id)->whereNotNull('user_workgroup_id')->orderBy('id', 'desc')->first();
+            if ($laborReportNow&&$laborReportNow['group_user_id']&&!$laborReportNow['check_out_at']) return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可换组，请联系之前组长!</h1>";
+            if ($laborReportNow && $laborReportNow['user_workgroup_id']==$userWorkgroupID) return "<h1 style='color: darkred;text-align:center'>您已进组,不可再次进组!</h1>";
             $laborReport = LaborReport::where('user_id', $user_id)->where('user_workgroup_id', $userWorkgroupID)->where('created_at', 'like', Carbon::now()->format('Y-m-d'). '%')->orderBy('id', 'desc')->first();
             //此处表示临时工当日换组操作
             if (!$laborReport) {

app/Services/LaborReportService.php

@@ -31,6 +31,7 @@ class LaborReportService
         $enterNumbers=[];
         foreach ($laborStatus as $laborId){
             $enterNumber=LaborReport::where('id',$laborId['labor_report_id'])->value('enter_number');
+            if($enterNumber!=null)
             array_push($enterNumbers,$enterNumber);
         }
         if (!$request->is_export){

resources/js/queryForm/queryForm.js

@@ -566,8 +566,9 @@ const query = function getQueryForm(data) {
         })
         ul_div.hide();
         ul_div.mouseleave(function () {
-            if(_data[condition.name].value){
+            if(_data[condition.name].value.length>0){
                 _this.onsubmit();
+                ul_div.hide();
             }
         });
         return div;
@@ -872,6 +873,9 @@ const query = function getQueryForm(data) {
                 }
             } else {
                 if (![undefined, null, ''].includes(_data[key].value)) {
+                    if(controlJsType(_data[key].value,'array') && _data[key].value.length === 0 ){
+                        continue;
+                    }
                     bool = true;
                 }
             }

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

@@ -232,7 +232,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){