Преглед изворни кода

临时工申请系统 添加确认人记录

ANG YU пре 4 година
родитељ
комит
d8c32e21ca

+ 2 - 1
app/Http/Controllers/LaborCompanyDispatchController.php

@@ -21,7 +21,7 @@ class LaborCompanyDispatchController extends Controller
         /** @var Builder $builder */
         $builder = LaborCompanyDispatch::query()
             ->filter($filters)
-            ->with(['laborCompany', 'laborCompanyDispatchDetails','warehouse']);
+            ->with(['laborCompany', 'laborCompanyDispatchDetails','warehouse','checkUser']);
 
         /** @var User $user */
         $user = auth()->user();
@@ -97,6 +97,7 @@ class LaborCompanyDispatchController extends Controller
     public function personnelCheck(LaborCompanyDispatch $laborCompanyDispatch, Request $request)
     {
         $laborCompanyDispatch->status = $request->status;
+        $laborCompanyDispatch->check_user_id = auth()->id();
         $laborCompanyDispatch->save();
         return redirect()->back()->with('success', '人事确认成功!');
 

+ 6 - 0
app/LaborCompanyDispatch.php

@@ -25,6 +25,7 @@ class LaborCompanyDispatch extends Model
         'exceed_max_labor_num_status',//是否超过最大允许值 1 未超过 2 超过
         'status',//状态
         'warehouse_id',//仓库ID
+        'check_user_id',//确认人ID
     ];
 
 
@@ -78,6 +79,11 @@ class LaborCompanyDispatch extends Model
         return $this->belongsTo(Warehouse::class);
     }
 
+    public function checkUser(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'check_user_id', 'id');
+    }
+
     public function scopeFilter($query, $filters)
     {
         return $filters->apply($query);

+ 32 - 0
database/migrations/2021_11_08_133051_add_chick_user_id_to_labor_company_dispatches_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddChickUserIdToLaborCompanyDispatchesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('labor_company_dispatches', function (Blueprint $table) {
+            $table->unsignedInteger('check_user_id')->nullable()->comment('确认人ID');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('labor_company_dispatches', function (Blueprint $table) {
+            $table->dropColumn('check_user_id');
+        });
+    }
+}

+ 2 - 0
resources/views/personnel/laborApply/dispatch/index.blade.php

@@ -62,6 +62,7 @@
                             </div>
                         @endcan()
                     </td>
+                    <td>@{{ labor_company_dispatch.check_user?labor_company_dispatch.check_user.name:'' }}</td>
                     <td>@{{ labor_company_dispatch.labor_company.name }}</td>
                     <td>@{{ labor_company_dispatch.warehouse ?labor_company_dispatch.warehouse.name:''}}</td>
                     <td><span :class="getStatusClass(labor_company_dispatch.status)">@{{ labor_company_dispatch.status }}</span>
@@ -182,6 +183,7 @@
                 let column = [
                     {name: 'index', value: '序号', neglect: true},
                     {name: 'do', value: '操作'},
+                    {name: 'check_user', value: '确认人'},
                     {name: 'name', value: '劳务公司'},
                     {name: 'warehouse', value: '仓库'},
                     {name: 'status', value: '状态 '},