主工作界面增加医生和科室搜索

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();

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')

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',

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

YiJi-admin/src/views/Login.vue

@@ -14,29 +14,33 @@
 								inactive-action-icon="Sunny" @change="toggleDark" />
 						</div>
 					</div>
-					<el-form  style="width: 400px;" ref="ruleFormRef" status-icon class="demo-ruleForm">
+					<div style="margin-top: -100px;">
-						<el-form-item>
+						<div style="font-size: 36px; margin-left: -100px;margin-bottom: 50px;">深圳市南山区妇幼保健院医技检查预约系统</div>
-							<span style="font-size: 22px;">登录您的账户</span>
+						<el-form style="width: 400px;" ref="ruleFormRef" status-icon class="demo-ruleForm">
-						</el-form-item>
+							<el-form-item>
-						<el-form-item>
+								<span style="font-size: 22px;">登录您的账户</span>
-							<el-input v-model.number="username" ref="usernameRef" @keyup.enter="focusNextTo()" :prefix-icon="User" placeholder="用户名" size="large" />
+							</el-form-item>
-						</el-form-item>
+							<el-form-item>
-						<el-form-item>
+								<el-input v-model.number="username" ref="usernameRef" @keyup.enter="focusNextTo()"
-							<el-input v-model="pwd" type="password" ref="passwordRef" @keyup.enter="login()" autocomplete="off" placeholder="密码" size="large"
+									:prefix-icon="User" placeholder="用户名" size="large" />
-								:prefix-icon="Lock" />
+							</el-form-item>
-						</el-form-item>
+							<el-form-item>
-						<el-form-item>
+								<el-input v-model="pwd" type="password" ref="passwordRef" @keyup.enter="login()"
-							<el-button style="width: 100%;" type="primary" @click="login(ruleFormRef)"
+									autocomplete="off" placeholder="密码" size="large" :prefix-icon="Lock" />
-								size="large">登录</el-button>
+							</el-form-item>
-						</el-form-item>
+							<el-form-item>
-						<div style="height: 160px;"></div>
+								<el-button style="width: 100%;" type="primary" @click="login(ruleFormRef)"
-					</el-form> 
+									size="large">登录</el-button>
+							</el-form-item>
+							<div style="height: 160px;"></div>
+						</el-form>
+					</div>
 					<div class="right_bottom"></div>
 				</el-col>
 			</el-row>
-			 <div style="width: 100% ;text-align: center;height: 20px;">深圳市南山区妇幼保健院 版权所有</div>
+			<div style="width: 100% ;text-align: center;height: 20px;">深圳市南山区妇幼保健院 版权所有</div>
 		</el-container>
-		
+
 	</div>
 </template>
 
@@ -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 usernameRef = ref(null);
-	let passwordRef=ref(null);
+	let passwordRef = ref(null);
-	const focusNextTo=()=>{
+	const focusNextTo = () => {
 		passwordRef.value.focus()
 	}
-	onMounted(()=>{
+	onMounted(() => {
-		nextTick(()=>{
+		nextTick(() => {
 			usernameRef.value.focus()
 		})
 	})
-
 </script>
 
 <style scoped>
@@ -113,8 +120,8 @@
 		/* border: 10px solid red; */
 		width: 100%;
 		height: calc(100vh - 30px);
-display: flex;
+		display: flex;
-flex-direction: column;
+		flex-direction: column;
 	}
 
 	.common-layout .el-main {
@@ -153,5 +160,4 @@ flex-direction: column;
 		padding-top: 10px;
 		padding-bottom: 10px;
 	}
-	
 </style>

YiJi-admin/src/views/YeWu/MainList.vue

@@ -52,6 +52,14 @@
 					<el-input v-model="searchInfo.user_name" placeholder="患者姓名"
 						style="width: 200px;margin-left: 8px;" />
 				</el-form-item>
+				<el-form-item>
+					<el-input v-model="searchInfo.apply_department" placeholder="申请科室"
+						style="width: 200px;margin-left: 8px;" />
+				</el-form-item>
+				<el-form-item>
+					<el-input v-model="searchInfo.doctor" placeholder="医生"
+						style="width: 200px;margin-left: 8px;" />
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="GetList()" style="margin-left: 10px;">查询</el-button>
 				</el-form-item>