平台推送增加搜索 条件

Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php

@@ -24,6 +24,13 @@ class PingTaiPushController extends Controller
         if (isset($searchInfo['dateRange']) && count($searchInfo['dateRange'])==2) {
             $list = $list->whereBetween('created_at', $searchInfo['dateRange']);
         }
+        if (isset($searchInfo['userinfo']) && !empty($searchInfo['userinfo'])) {
+            $list = $list->where(function($query) use ($searchInfo) {
+                $query->where('name', 'like', '%' . $searchInfo['userinfo'] . '%')
+                    ->orWhere('tel', '=', $searchInfo['userinfo'])
+                    ->orWhere('identifierValue', '=', $searchInfo['userinfo']);
+            });
+        }
         if (isset($searchInfo['orgname'])) {
 
             $list = $list->where('hospitalName', 'like', '%' . $searchInfo['orgname'] . '%');

el-admin/.env.production

@@ -1,6 +1,6 @@
 ENV = 'production'
-VITE_APP_API = 'http://192.168.50.123:33583/common/la/public/api/'
-VITE_APP_FILE = 'http://192.168.50.123:33583/common/la/public'
+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_66666666 = 'http://172.31.68.39:33583/common/la/public/api/'
-VITE_APP_FILE_66666666 = 'http://172.31.68.39:33583/common/la/public'
+VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/'
+VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public'

el-admin/src/views/MedicalCenter/HealthCheckList.vue

@@ -45,6 +45,13 @@
 					 <span v-else style="color: #ccc;">暂无报告</span>
 				</template>
 			</el-table-column>
+			<!-- <el-table-column label="操作" >
+				<template #default="scope">
+					<div style="display: flex;"> 
+						<el-button type="primary" @click="del(scope.row.id)">删除</el-button>
+					</div>
+				</template>
+			</el-table-column> -->
 		</el-table>
 		<div class="page">
 			<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
@@ -78,11 +85,11 @@
 	})
 	const PageSizeChange = (e) => { // 修改每页数量
 		pageSize.value = e
-		GetUserList()
+		GetList()
 	}
 	const PageCurrentChange = (e) => { //切换页码
 		currentPage.value = e
-		GetUserList()
+		GetList()
 	}
 	
 	//获取列表

el-admin/src/views/PingTai/PushList.vue

@@ -9,6 +9,12 @@
 							:value="item.hospitalCode" />
 					</el-select>
 				</el-form-item>
+				<el-form-item>
+					<el-tag class="ml-2" type="success" style=" margin-left: 20px;margin-right: 20px;">体检人</el-tag>
+					<div>
+					 <el-input v-model="searchInfo.userinfo" placeholder="姓名/身份证/手机号" />
+					</div>
+				</el-form-item>
 				<el-form-item>
 					<el-tag class="ml-2" type="success" style=" margin-left: 20px;margin-right: 20px;">时间段</el-tag>
 					<div>