二次加工管理-显示排除掉状态为“交接完成”的，并且在搜索栏添加一个“勾选条件”：“显示交接完成的记录”，勾上才包含该状态记录

app/Http/Controllers/ProcessController.php

@@ -78,6 +78,7 @@ class ProcessController extends Controller
                 });
             }
         }
+        if (!$request->is_accomplish)$processes=$processes->where('status','!=','交接完成');
         $processes=$processes->paginate($request->input('paginate')??50);
         return $processes;
     }
@@ -126,8 +127,10 @@ class ProcessController extends Controller
         $id=$request->input('id');
         $processDailies=ProcessDaily::with(['processDailyParticipants','process'])->orderBy('date','DESC')
             ->where('process_id',$id)->get();
+        $process=Process::find($id);
         if (count($processDailies)>0){
-            $result=$this->createDeficiencyData($processDailies,$today);
+            if ((($process->amount)-($process->completed_amount))<=0 || $process->status=='交接完成')$result=true;
+            else $result=$this->createDeficiencyData($processDailies,$today);
             if ($result){
                 $processDailies=ProcessDaily::with(['processDailyParticipants','process'])
                     ->orderBy('date','DESC')->where('process_id',$id)->get();

resources/views/process/index.blade.php

@@ -63,13 +63,15 @@
                                    <option value="待验收">待验收</option>
                                    <option value="交接完成">交接完成</option>
                                </select>
+                                <input hidden name="is_accomplish" v-model="filterData.is_accomplish">
                                <button class="btn btn-sm btn-outline-dark pull-left ml-5" type="submit">按条件搜索</button></div>
                            </td>
                            <td colspan="6"></td>
                        </tr>
                        <tr>
                            <td colspan="9">
-                               <span class="dropdown">
+                               <div class="form-inline">
+                                   <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
                                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                                             导出Excel
@@ -78,7 +80,14 @@
                                             <a class="dropdown-item" @click="processExport(1)" href="javascript:">导出勾选内容</a>
                                             <a class="dropdown-item" @click="processExport(2)" href="javascript:">导出所有页</a>
                                         </div>
-                                    </span>
+                                   </span>
+                                   <div class="form-check ml-4">
+                                        <label class="form-check-label text-muted">
+                                            <input v-if="filterData.is_accomplish" checked @click="is_checked($event)" type="checkbox" class="form-check-input">
+                                            <input v-else @click="is_checked($event)" type="checkbox" class="form-check-input">显示交接完成的记录
+                                        </label>
+                                   </div>
+                               </div>
                            </td>
                        </tr>
                    </table>
@@ -541,7 +550,7 @@
                 ],
                 errors:{},
                 checkData:[],
-                filterData:{paginate:50,date_start:'',date_end:'',owner_id:'',commodity_barcode:'',wms_code:'',status:''},
+                filterData:{paginate:50,date_start:'',date_end:'',owner_id:'',commodity_barcode:'',wms_code:'',status:'',is_accomplish:''},
                 processDailies:[],
                 processDailyParticipants:[],
                 isShow:{
@@ -572,7 +581,7 @@
                 isBeingFilterConditions:function(){
                     for(let key in this.filterData){
                         if(this.filterData[key]){
-                            if(key==='paginate')continue;
+                            if(key==='paginate' || key==='is_accomplish')continue;
                             return true
                         }
                     }
@@ -674,7 +683,7 @@
                         location.href = "{{url('process?checkSign=-1&date_start=')}}" +
                             data.date_start + "&date_end=" + data.date_end + "&owner_id=" +
                             data.owner_id + "&commodity_barcode=" + data.commodity_barcode + "&wms_code=" + data.wms_code +
-                            "&status=" + data.status;
+                            "&status=" + data.status+"$is_accomplish="+data.is_accomplish;
                     }
                 },
                 //获取登记工时
@@ -1498,6 +1507,13 @@
                         tempTip.show('网络错误：' + err);
                     })
                 },
+                is_checked(e){
+                    if (e.target.checked) this.filterData.is_accomplish=e.target.checked;
+                    else this.filterData.is_accomplish='';
+                    setTimeout( res=>{
+                        this.submit();
+                    },1);
+                }
             },
         });
     </script>