diff --git a/app/Admin/Controllers/Store/StockController.php b/app/Admin/Controllers/Store/StockController.php
index 2b7cd69e..fbf0c055 100644
--- a/app/Admin/Controllers/Store/StockController.php
+++ b/app/Admin/Controllers/Store/StockController.php
@@ -104,6 +104,7 @@ class StockController extends AdminController
// 操作人
$administrator = Admin::user();
$form->input('operator_type', $administrator->getMorphClass());
+ $form->input('operator_name', $administrator->name);
$form->input('operator_id', $administrator->id);
}
});
@@ -121,16 +122,7 @@ class StockController extends AdminController
return ''.$value.'';
})->escape(false);
$show->field('balance');
- $show->field('operator', '操作人')->as(function () {
- $v = $this->operator;
- if ($v instanceof \App\Models\Admin\Administrator) {
- return $v->name . '管理员';
- } else if ($v instanceof \App\Models\User) {
- return $v->phone . '员工';
- }
-
- return '未知身份';
- })->escape(false);
+ $show->field('operator_name', '操作人');
$show->field('remarks', '备注');
$show->field('created_at', '操作时间');
diff --git a/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php b/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
index 0147b06e..86496d56 100644
--- a/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
+++ b/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
@@ -17,8 +17,8 @@ class AddOperatorNameToStockLogs extends Migration
Schema::table('store_stock_logs', function (Blueprint $table) {
$table->string('operator_name');
});
- DB::update("update `store_stock_logs` set `operator_name` = (select `name` from `admin_users` where `store_stock_logs`.`operator_id` = `admin_users`.`id`) where `store_stock_logs`.`operator_type` in ('App\Models\Admin\Administrator', 'admin_users');");
- DB::update("update `store_stock_logs` set `operator_name` = (select `phone` from `users` where `store_stock_logs`.`operator_id` = `users`.`id`) where `store_stock_logs`.`operator_type` in ('App\Models\User');");
+ DB::update("update `store_stock_logs` set `operator_name` = (select `name` from `admin_users` where `store_stock_logs`.`operator_id` = `admin_users`.`id`) where `store_stock_logs`.`operator_type` in ('App\\Models\\Admin\\Administrator', 'admin_users');");
+ DB::update("update `store_stock_logs` set `operator_name` = (select `phone` from `users` where `store_stock_logs`.`operator_id` = `users`.`id`) where `store_stock_logs`.`operator_type` in ('App\\Models\\User');");
}
/**