Owner删除BUG

app/Http/Controllers/OwnerController.php

@@ -124,7 +124,9 @@ class OwnerController extends Controller
     public function destroy(Owner $owner)
     {
         if(!Gate::allows('货主-删除')){ return redirect(url('/'));  }
-        $re=$owner->delete();
+        $re=$owner->update([
+            "deleted_at" => date('Y-m-d H:i:s'),
+        ]);
         $this->log(__METHOD__,__FUNCTION__,$owner->toJson(),Auth::user()['id']);
         return ['success'=>$re];
     }
@@ -138,7 +140,9 @@ class OwnerController extends Controller
     {
         if(!Gate::allows('货主-删除')){ return ['success'=>'false','fail_info'=>"没有权限"];  }
         $id=$request->input('id');
-        $owner=Owner::query()->whereNotNull('deleted_at')->where('id',$id)->delete();
+        $owner=Owner::query()->whereNotNull('deleted_at')->where('id',$id)->update([
+            "deleted_at" => null,
+        ]);
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','owner'=>$owner];
     }

app/Http/Controllers/UserLaborController.php

@@ -41,16 +41,6 @@ class UserLaborController extends Controller
         return view('maintenance.userLabor.index',['userLabors'=>$userLabors]);
     }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
     public function relieve(Request $request){
         $user_id=$request->input('user_id');
         if (!$user_id) return ['error'=>'传递空值！'];
@@ -64,17 +54,6 @@ class UserLaborController extends Controller
         return ['success'=>true,'userLabor'=>$userLabor];
     }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
     /**
      * Display the specified resource.
      *
@@ -115,7 +94,7 @@ class UserLaborController extends Controller
     {
         if(!Gate::allows('临时工-编辑')){ return redirect(url('/'));  }
         $userLabor=UserLabor::with(['userDetail','laborCompany'])->find($id);
-        $laborCompanies=LaborCompany::select('id','name')->get();
+        $laborCompanies=LaborCompany::query()->select('id','name')->get();
         return view('maintenance.userLabor.edit',['userLabor'=>$userLabor,'laborCompanies'=>$laborCompanies,]);
     }
 
@@ -174,7 +153,7 @@ class UserLaborController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\Response|array
      */
     public function destroy($id)
     {

resources/views/store/checkingReceive/show.blade.php

@@ -30,11 +30,11 @@
                 <div class="col-12 row">
                     <div class="col-6">
                         <div v-if="inputMode=='regular'">
-                            <div class="btn btn-sm btn-outline-primary">手动输入</div>
-                            <div class="btn btn-sm btn-outline-danger">扫描输入</div>
+                            <div class="btn btn-sm btn-outline-primary" @click="status.barcodeDisable=false">手动输入</div>
+                            <div class="btn btn-sm btn-outline-danger" @click="status.barcodeDisable=true">扫描输入</div>
                         </div>
                         <input type="text" id="barcode" class="form-control" placeholder="扫入条码"
-                               {{--:disabled="status.barcodeDisable" @focusin="focusOutDocument" @focusout="focusDocument" v-model="inputting.barcode"--}}>
+                               :disabled="status.barcodeDisable" {{-- @focusin="focusOutDocument" @focusout="focusDocument" v-model="inputting.barcode"--}}>
 
                         <div v-if="inputMode=='regular'">
                         <div class="card-title">生产日期：</div>
@@ -63,7 +63,7 @@
                                    {{--v-model="inputting.batch_number" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
                         </div>
                     </div>
-                    <div class="col-12" v-if="commitButtonVisible && inputMode=='regular'" >
+                    <div class="col-12" v-if="status.commitButtonVisible && inputMode=='regular'" >
                         <button class="btn btn-success btn form-control" {{--@click="commitGoods"--}}>确定</button>
                     </div>
                 </div>
@@ -152,7 +152,10 @@
                 @endforeach
             ],
             inputMode : 'regular',
-            commitButtonVisible:false,
+            status:{
+                barcodeDisable : true,
+                commitButtonVisible:false,
+            },
         },
         mounted(){
             $('#container').removeClass('d-none');