From c03e10c3a9c4c44344163a6923b08cfd75d93eb0 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 24 Feb 2025 22:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Admin/YeWu/AppointmentService.php    |  4 ++++
 el-admin/.env.production                          |  2 +-
 .../src/views/AppointmentMngr/AppointmentList.vue | 15 +++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

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 @@
 		<div class="head">
 			<el-row>
 				<el-form-item>
-					<el-tag class="ml-2" type="success" style="margin-right: 20px;">机构名称</el-tag>
+					<el-tag class="ml-2" type="success" style="margin-right: 8px;">类型</el-tag>
+					<el-select filterable v-model="searchInfo.type" placeholder="体检类型" clearable style="width:130px; margin-right: 8px;">
+						<el-option  label="健康证" value="1" />
+						<el-option  label="老年人" value="2" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-tag class="ml-2" type="success" style="margin-right: 8px;">机构名称</el-tag>
 					<el-select filterable v-model="searchInfo.orgId" placeholder="请选择体检机构" clearable>
 						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name"
 							:value="item.id" />
@@ -13,7 +20,7 @@
 					<el-input v-model="searchInfo.userinfo" placeholder="姓名/身份证" />
 				</el-form-item>
 				<el-form-item>
-					<el-tag class="ml-2" type="success" style=" margin-left: 20px;margin-right: 20px;">时间段</el-tag>
+					<el-tag class="ml-2" type="success" style=" margin-left: 8px;margin-right: 8px;">时间段</el-tag>
 					<div>
 						<el-date-picker v-model="searchInfo.dateRange" value-format="YYYY-MM-DD" type="daterange"
 							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -67,9 +74,9 @@
 			<el-table-column prop="created_at" label="创建时间" />
 			<el-table-column label="操作" >
 				<template #default="scope">
-					<div style="display: flex;">
-						<el-button @click="ShowPic(scope.row)">查看附件</el-button>
+					<div style="display: flex;"> 
 						<el-button type="primary" @click="del(scope.row.id)">删除</el-button>
+						<el-button v-if="scope.row.type==1" @click="ShowPic(scope.row)">查看附件</el-button>
 					</div>
 
 				</template>