diff --git a/Laravel/app/Services/Admin/YeWu/AppointmentService.php b/Laravel/app/Services/Admin/YeWu/AppointmentService.php index 18fbedd..e3af07a 100644 --- a/Laravel/app/Services/Admin/YeWu/AppointmentService.php +++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php @@ -31,6 +31,10 @@ class AppointmentService $sql=$sql .' and a.calendar_id = ? '; array_push($canshu, $arr['searchInfo']['calendarId']); } + if(isset($arr['searchInfo']['type'])){ + $sql=$sql .' and a.type = ? '; + array_push($canshu, $arr['searchInfo']['type']); + } if($arr['searchInfo']['dateRange']){ diff --git a/el-admin/.env.production b/el-admin/.env.production index d476a58..3e024d3 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,5 +1,5 @@ ENV = 'production' -VITE_APP_API_6666666 = 'http://192.168.50.123:33583/common/la/public/api/' +VITE_APP_API_66666666 = 'http://192.168.50.123:33583/common/la/public/api/' VITE_APP_FILE_66666666 = 'http://192.168.50.123:33583/common/la/public' VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/' diff --git a/el-admin/src/views/AppointmentMngr/AppointmentList.vue b/el-admin/src/views/AppointmentMngr/AppointmentList.vue index 70d158a..db25802 100644 --- a/el-admin/src/views/AppointmentMngr/AppointmentList.vue +++ b/el-admin/src/views/AppointmentMngr/AppointmentList.vue @@ -3,7 +3,14 @@