临时工申请系统添加功能

app/Http/Controllers/LaborApplyController.php

@@ -80,10 +80,8 @@ class LaborApplyController extends Controller
 
     public function update(Request $request, LaborApply $laborApply)
     {
-        $laborApply->actual_num = $request->input('actual_num');
-        $laborApply->status = '任务完结';
-        $laborApply->save();
-        return redirect(route('laborApply.index'))->with('success', '填写实到人数成功！');
+        $laborApply->update($request->all());
+        return redirect(route('laborApply.index'))->with('success', '申请更新成功！');
     }
 
     public function destroy(LaborApply $laborApply)

app/Http/Controllers/LaborCompanyDispatchController.php

@@ -73,7 +73,7 @@ class LaborCompanyDispatchController extends Controller
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function laborCompanyReceivingOrder(LaborCompanyDispatch $laborCompanyDispatch,Request $request)
+    public function laborCompanyReceivingOrder(LaborCompanyDispatch $laborCompanyDispatch, Request $request)
     {
         /** @var Carbon $dispatch_date */
         $dispatch_date = $laborCompanyDispatch->dispatch_date;
@@ -88,4 +88,13 @@ class LaborCompanyDispatchController extends Controller
         $laborCompanyDispatch->save();
         return redirect()->back()->with('success', '接单成功！');
     }
+
+    public function personnelCheck(LaborCompanyDispatch $laborCompanyDispatch, Request $request)
+    {
+        $laborCompanyDispatch->status = $request->status;
+        $laborCompanyDispatch->save();
+        return redirect()->back()->with('success', '人事确认成功！');
+
+    }
+
 }

app/LaborCompanyDispatch.php

@@ -35,8 +35,9 @@ class LaborCompanyDispatch extends Model
         'status' => [
             '' => 0,
             '创建' => 1,
-            '劳务接单' => 2,
-            '任务完结' => 3,
+            '人事确认' => 2,
+            '劳务接单' => 3,
+            '任务完结' => 4,
         ],
     ];
 

resources/views/personnel/laborApply/dispatch/index.blade.php

@@ -19,8 +19,50 @@
                             <span v-if="labor_company_dispatch.exceed_max_labor_num_status==2"><i
                                     class="fa fa-thermometer-full" style="color: red" aria-hidden="true"></i></span>
                         </div>
+                    </td>
+                    <td class="">
+                        @can('劳务所')
+                            <div class="float-left ml-3" v-if="labor_company_dispatch.status==='人事确认'">
+                                <form :action="getBaseUrl(labor_company_dispatch) + '/laborCompanyReceivingOrder'"
+                                      method="post"
+                                      accept-charset="UTF-8" onsubmit="return confirm('是否确认接单！')">
+                                    @csrf
+                                    @method('PATCH')
+                                    <input type="number" name="status" hidden value="3">
+                                    <button type="submit" class="btn btn-outline-primary btn-sm" role="button">劳务接单
+                                    </button>
+                                </form>
+                            </div>
+                            <div class="float-left ml-3" v-if="labor_company_dispatch.status==='劳务接单'">
+                                <a :href="getCreateOrEditDetailUrl(labor_company_dispatch)"
+                                   class="btn btn-outline-secondary btn-sm" role="button">
+                                    @{{
+                                    labor_company_dispatch.labor_company_dispatch_details.length>0?'修改明细':'录入明细'
+                                    }}
+                                </a>
+                            </div>
+                        @endcan()
+                        @can('人事管理')
+                            <div class="float-left ml-3" v-if="labor_company_dispatch.status==='创建'">
+                                <form :action="getBaseUrl(labor_company_dispatch) + '/personnelCheck'" method="post"
+                                      accept-charset="UTF-8" onsubmit="return confirm('是否确认！')">
+                                    @csrf
+                                    @method('PATCH')
+                                    <input type="text" name="status" hidden value="人事确认">
+                                    <button type="submit" class="btn btn-outline-primary btn-sm" role="button">人事确认
+                                    </button>
+                                </form>
+                            </div>
 
+                            <div class="float-left ml-3" v-if="labor_company_dispatch.status==='创建'">
+                                <a :href="getEditlLaborCompanyDispatchUrl(labor_company_dispatch)"
+                                   class="btn btn-outline-secondary btn-sm" role="button">
+                                    修改派遣人数
+                                </a>
+                            </div>
+                        @endcan()
                     </td>
+
                     <td>@{{ labor_company_dispatch.labor_company.name }}</td>
                     <td>@{{ labor_company_dispatch.status }}</td>
                     <td>@{{ labor_company_dispatch.man_num }}</td>
@@ -49,35 +91,6 @@
                         </div>
                     </td>
                     <td>@{{ labor_company_dispatch.dispatch_date }}</td>
-                    <td class="">
-                        <div class="float-left ml-3">
-                            <a :href="getCreateOrEditDetailUrl(labor_company_dispatch)"
-                               class="btn btn-outline-secondary btn-sm" role="button">
-                                @{{ labor_company_dispatch.labor_company_dispatch_details.length>0?'修改临时工明细':'录入临时工明细'
-                                }}
-                            </a>
-                        </div>
-                        @can('人事管理')
-                            <div class="float-left ml-3">
-                                <a :href="getEditlLaborCompanyDispatchUrl(labor_company_dispatch)"
-                                   class="btn btn-outline-secondary btn-sm" role="button">
-                                    修改派遣人数
-                                </a>
-                            </div>
-                        @endcan()
-                        @can('劳务所')
-                            <div class="float-left ml-3">
-                                <form :action="getLaborCompanyReceivingOrderUrl(labor_company_dispatch)" method="post"
-                                      accept-charset="UTF-8" onsubmit="return confirm('是否确认接单！')">
-                                    @csrf
-                                    @method('PATCH')
-                                    <input type="number" name="status" hidden value="3">
-                                    <button type="submit" class="btn btn-outline-secondary btn-sm" role="button">劳务接单
-                                    </button>
-                                </form>
-                            </div>
-                        @endcan()
-                    </td>
 
                 </tr>
             </table>
@@ -119,13 +132,13 @@
                 _this.form.init();
                 let column = [
                     {name: 'index', value: '序号', neglect: true},
+                    {name: 'do', value: '操作'},
                     {name: 'name', value: '劳务公司'},
                     {name: 'status', value: '状态 '},
                     {name: 'man_num', value: '男工人数'},
                     {name: 'woman_num', value: '女工人数'},
                     {name: 'details', value: '派遣详情'},
                     {name: 'dispatch_date', value: '分配日期'},
-                    {name: 'do', value: '操作'},
                 ];
                 new Header({
                     el: "table",
@@ -155,9 +168,9 @@
                     return url;
                 },
                 /*劳务接单*/
-                getLaborCompanyReceivingOrderUrl(labor_company_dispatch) {
+                getBaseUrl(labor_company_dispatch) {
                     let url = "";
-                    url = "{{ url('personnel/laborApply/laborCompanyDispatch') }}/" + labor_company_dispatch.id + '/LaborCompanyReceivingOrder';
+                    url = "{{ url('personnel/laborApply/laborCompanyDispatch') }}/" + labor_company_dispatch.id;
                     return url;
                 },
             },

resources/views/personnel/laborApply/edit.blade.php

@@ -5,8 +5,9 @@
     <div class="container-fluid" id="list">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
-                <form action="{{ route('laborApply.store') }}" method="POST" accept-charset="UTF-8">
+                <form action="{{ route('laborApply.update',$laborApply->id) }}" method="POST" accept-charset="UTF-8">
                     @csrf
+                    @method( 'PATCH' )
                     @include('shared._error')
                     {{--仓库--}}
                     <div class="from-group row mt-3">
@@ -15,7 +16,7 @@
                             <select class="form-control" id="warehouse_id" name="warehouse_id" required>
                                 <option value="" hidden disabled selected>请选择仓库</option>
                                 @foreach($warehouses as $warehouse)
-                                    <option {{ $warehouse->id == $laborApply->warehouse_id ? 'selected':''}}>{{ $warehouse->name }}</option>
+                                    <option value="{{ $warehouse->id }}" {{ $warehouse->id == $laborApply->warehouse_id ? 'selected':''}}>{{ $warehouse->name }}</option>
                                 @endforeach
                             </select>
                         </div>
@@ -27,7 +28,7 @@
                             <select class="form-control" id="user_workgroup_id" name="user_workgroup_id" required>
                                 <option value="" hidden disabled selected>请选择所属组别</option>
                                 @foreach($userWorkGroups as $userWorkGroup)
-                                    <option {{ $userWorkGroup->id == $laborApply->user_workgroup_id ? 'selected':''}}>{{ $userWorkGroup->name }}</option>
+                                    <option value="{{ $userWorkGroup->id }}" {{ $userWorkGroup->id == $laborApply->user_workgroup_id ? 'selected':''}}>{{ $userWorkGroup->name }}</option>
                                 @endforeach
                             </select>
                         </div>

routes/web.php

@@ -51,19 +51,19 @@ Route::post('personnel/checking-in/refreshQRCode','QRCodeController@refreshQRCod
 
 //人事管理
 Route::group(['prefix'=>'personnel','middleware'=>'auth'],function() {
+
     //临时开放录入
     Route::put('laborApply/temporaryOpen','LaborApplyController@temporaryOpen')->name('laborApply.temporaryOpen');
     Route::get('laborApply/createDispatch','LaborApplyController@createDispatch')->name('laborApply.createDispatch');
     //劳务派遣查看
     Route::group(['prefix' => 'laborApply'], function () {
-        Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/LaborCompanyReceivingOrder', 'LaborCompanyDispatchController@laborCompanyReceivingOrder')->name('laborCompanyDispatch.LaborCompanyReceivingOrder');
+        Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/laborCompanyReceivingOrder', 'LaborCompanyDispatchController@laborCompanyReceivingOrder')->name('laborCompanyDispatch.laborCompanyReceivingOrder');
+        Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/personnelCheck', 'LaborCompanyDispatchController@personnelCheck')->name('laborCompanyDispatch.personnelCheck');
         Route::resource('laborCompanyDispatch','LaborCompanyDispatchController')->only(['index','edit','update']);
         Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/create','LaborCompanyDispatchController@createDetail')->name('laborCompanyDispatch.createDetail');
         Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/edit','LaborCompanyDispatchController@editDetail')->name('laborCompanyDispatch.editDetail');
         Route::post('laborCompanyDispatch/{laborCompanyDispatch}/detail','LaborCompanyDispatchController@storeDetail')->name('laborCompanyDispatch.storeDetail');
     });
-
-
     Route::resource('laborApply', 'LaborApplyController');
 
 });