diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
index e033b6f..a1d4e0f 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
@@ -168,6 +168,9 @@ class PlanController extends Controller
if (!isset($searchInfo['date'])) {
$searchInfo['date'] = date('Y-m-d');
}
+ if (isset($searchInfo['plan_type']) and $searchInfo['plan_type']===0) {
+ $list = $list->where(['a.type' => 0]);
+ }
$list = $list->where(['a.date' => $searchInfo['date']]);
$list = $list->orderBy('a.time', 'asc')->get();
$plan_model=DB::table('plan_model_time')
@@ -181,7 +184,7 @@ class PlanController extends Controller
if ($v1->model_id == $v->model_id and $v1->time == $v->time) {
$list[$k]->plan_type_name = $v1->plan_type_name;
$list[$k]->plan_type_id = $v1->plan_type_id;
- if (isset($searchInfo['plan_type']) and !empty($searchInfo['plan_type']) and $v1->plan_type_id==$searchInfo['plan_type']) {
+ if (isset($searchInfo['plan_type']) and !empty($searchInfo['plan_type']) and $v1->plan_type_id==$searchInfo['plan_type'] and $v->type<>0) {
$list_l[]=$list[$k];
}
break;
@@ -368,9 +371,13 @@ class PlanController extends Controller
$list[$k]->plan_type_name = '';
foreach ($plan_model as $k1 => $v1) {
- if ($v1->model_id == $v->model_id and $v1->time == $v->time) {
+ if ($v1->model_id == $v->model_id and $v1->time == $v->time ) {
$list[$k]->plan_type_name = $v1->plan_type_name;
$list[$k]->plan_type_id = $v1->plan_type_id;
+ if ($v->type==0) {
+ $list[$k]->plan_type_name = '预留';
+ $list[$k]->plan_type_id = 0;
+ }
break;
}
}
diff --git a/admin/src/views/PlanMngr/Plan.vue b/admin/src/views/PlanMngr/Plan.vue
index 7a209ff..0e656a4 100644
--- a/admin/src/views/PlanMngr/Plan.vue
+++ b/admin/src/views/PlanMngr/Plan.vue
@@ -25,6 +25,8 @@