diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
index 8a9b9b1..0dd40ac 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
@@ -120,6 +120,12 @@ class WorkMainController extends Controller
if (isset($searchInfo['user_name'])) {
$list = $list->where('s_list.user_name', 'like','%'.$searchInfo['user_name'].'%');
}
+ if (isset($searchInfo['doctor'])) {
+ $list = $list->where('s_list.docotr', 'like','%'.$searchInfo['doctor'].'%');
+ }
+ if (isset($searchInfo['apply_department'])) {
+ $list = $list->where('s_list.reservation_department', 'like','%'.$searchInfo['apply_department'].'%');
+ }
$count = $list;
$count = $count->count();
diff --git a/Laravel/app/Services/Admin/YeWu/PlanListService.php b/Laravel/app/Services/Admin/YeWu/PlanListService.php
index 1b41208..7126f7b 100644
--- a/Laravel/app/Services/Admin/YeWu/PlanListService.php
+++ b/Laravel/app/Services/Admin/YeWu/PlanListService.php
@@ -385,6 +385,7 @@ WHERE
//短信提醒
public function SendMsg($infos,$dotype=1)
{
+
$s=new SendMessgeService();
foreach ($infos as $key => $info) {
$mainInfo = DB::table('s_list as a')
diff --git a/YiJi-admin/src/router/index.js b/YiJi-admin/src/router/index.js
index 0e11b16..de1082c 100644
--- a/YiJi-admin/src/router/index.js
+++ b/YiJi-admin/src/router/index.js
@@ -147,7 +147,7 @@ const router = createRouter({
name: 'AppointmentMngrPlanList',
component: () => import('../views/AppointmentMngr/PlanList.vue'),
meta: {
- title: '预约资源计划'
+ title: '预约资源明细'
}
},{
path: '/appointmentmngr/ratio',
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
index fcda1f9..f8b3db8 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
@@ -614,6 +614,7 @@
//切换资源
let devicesList = ref([])
const resourceChange = () => {
+ PlanInfo.value.devices=[];
loading.value = true
ResourceGetBindDeviceList({
resource_id: PlanInfo.value.resources_id
diff --git a/YiJi-admin/src/views/Login.vue b/YiJi-admin/src/views/Login.vue
index 5f23594..62cad8c 100644
--- a/YiJi-admin/src/views/Login.vue
+++ b/YiJi-admin/src/views/Login.vue
@@ -14,29 +14,33 @@
inactive-action-icon="Sunny" @change="toggleDark" />
-
-
- 登录您的账户
-
-
-
-
-
-
-
-
- 登录
-
-
-
+
+
深圳市南山区妇幼保健院医技检查预约系统
+
+
+ 登录您的账户
+
+
+
+
+
+
+
+
+ 登录
+
+
+
+
深圳市南山区妇幼保健院 版权所有
+ 深圳市南山区妇幼保健院 版权所有
-
+
@@ -48,12 +52,16 @@
ElMessage
} from 'element-plus'
import {
- ref,nextTick,onMounted
+ ref,
+ nextTick,
+ onMounted
} from 'vue'
import {
Lock,
User,
- Iphone,RefreshRight,Key
+ Iphone,
+ RefreshRight,
+ Key
} from '@element-plus/icons-vue'
import {
useToggle
@@ -65,7 +73,7 @@
const isDark = useDark()
const toggleDark = () => useToggle(isDark)
- let loading=ref(false);
+ let loading = ref(false);
let username = ref('')
let pwd = ref('')
@@ -75,10 +83,10 @@
username: username.value,
password: pwd.value,
}
- loading.value=true
+ loading.value = true
//调用登录接口
Login(data).then(res => {
- loading.value=false
+ loading.value = false
if (res.data.status == 'ok') {
sessionStorage.setItem('token', res.data.token);
sessionStorage.setItem('refreshToken', res.data.refresh_token);
@@ -95,17 +103,16 @@
}
- let usernameRef=ref(null);
- let passwordRef=ref(null);
- const focusNextTo=()=>{
+ let usernameRef = ref(null);
+ let passwordRef = ref(null);
+ const focusNextTo = () => {
passwordRef.value.focus()
}
- onMounted(()=>{
- nextTick(()=>{
+ onMounted(() => {
+ nextTick(() => {
usernameRef.value.focus()
})
})
-
\ No newline at end of file
diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue
index d03f740..3db0901 100644
--- a/YiJi-admin/src/views/YeWu/MainList.vue
+++ b/YiJi-admin/src/views/YeWu/MainList.vue
@@ -52,6 +52,14 @@
+
+
+
+
+
+
查询