|
@@ -3,13 +3,13 @@
|
|
namespace App\Community\Controllers;
|
|
namespace App\Community\Controllers;
|
|
|
|
|
|
use App\Community\Actions\Vaccine\AddVaccine;
|
|
use App\Community\Actions\Vaccine\AddVaccine;
|
|
|
|
+use App\Community\Actions\Vaccine\FasteOrder;
|
|
use App\Community\Actions\Vaccine\Finished;
|
|
use App\Community\Actions\Vaccine\Finished;
|
|
use App\Community\Actions\Vaccine\OrderCance;
|
|
use App\Community\Actions\Vaccine\OrderCance;
|
|
use App\Community\Actions\Vaccine\Reserved;
|
|
use App\Community\Actions\Vaccine\Reserved;
|
|
use App\Models\Docter;
|
|
use App\Models\Docter;
|
|
use App\Models\Order;
|
|
use App\Models\Order;
|
|
use App\Models\OrderVaccine;
|
|
use App\Models\OrderVaccine;
|
|
-use App\Models\TimePeriod;
|
|
|
|
use Encore\Admin\Controllers\AdminController;
|
|
use Encore\Admin\Controllers\AdminController;
|
|
use Encore\Admin\Facades\Admin;
|
|
use Encore\Admin\Facades\Admin;
|
|
use Encore\Admin\Form;
|
|
use Encore\Admin\Form;
|
|
@@ -37,7 +37,7 @@ class OrderVaccinesController extends AdminController
|
|
|
|
|
|
$user = Admin::user();
|
|
$user = Admin::user();
|
|
$is_admin = Admin::user()->inRoles(['administrator','devloper']);
|
|
$is_admin = Admin::user()->inRoles(['administrator','devloper']);
|
|
- //检查是否是门诊医生
|
|
|
|
|
|
+
|
|
$is_docter = $user->docter_id;
|
|
$is_docter = $user->docter_id;
|
|
if(!$is_admin){
|
|
if(!$is_admin){
|
|
$org_id = $user->org_id;
|
|
$org_id = $user->org_id;
|
|
@@ -82,8 +82,11 @@ class OrderVaccinesController extends AdminController
|
|
$filter->between('patients.appoint_start_time','预约时间')->datetime();
|
|
$filter->between('patients.appoint_start_time','预约时间')->datetime();
|
|
});
|
|
});
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+ $grid->tools(function ($tools) {
|
|
|
|
+ $tools->append(new FasteOrder());
|
|
|
|
+ });
|
|
$grid->actions(function ($actions) {
|
|
$grid->actions(function ($actions) {
|
|
|
|
+// $actions->add(new AddOrder());
|
|
if( $actions->row->order_status<= 2 ){
|
|
if( $actions->row->order_status<= 2 ){
|
|
$actions->add(new Reserved());
|
|
$actions->add(new Reserved());
|
|
$actions->add(new OrderCance());
|
|
$actions->add(new OrderCance());
|