From 11a8414aeb676f40b1fd43c80f7b8e41f3c65812 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 14 Jul 2025 00:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=AB=99=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E9=A2=84=E7=BA=A6=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Yewu/YuYue202506.vue       |  6 ++--
 .../src/views/AppointmentMngr/PlanList.vue    |  3 +-
 .../src/views/AppointmentMngr/PlanModel.vue   |  3 +-
 YiJi-admin/src/views/YeWu/MainList.vue        | 32 +++++++++++++------
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/YiJi-admin/src/components/Yewu/YuYue202506.vue b/YiJi-admin/src/components/Yewu/YuYue202506.vue
index e8ad12c..3b3db54 100644
--- a/YiJi-admin/src/components/Yewu/YuYue202506.vue
+++ b/YiJi-admin/src/components/Yewu/YuYue202506.vue
@@ -809,9 +809,11 @@
 		background-color: #fff;
 		border: 1px solid #e8e8e8;
 		width: 120px;
-		height: 34px;
-		line-height: 34px;
 		cursor: default;
+		display: flex;
+		justify-content: center; /* 水平居中 */
+		align-items: center;      /* 垂直居中 */
+		padding: 4px;
 	}
 
 	.zhenshiButton_active {
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
index 3018a78..c454ffe 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
@@ -670,13 +670,12 @@
 
 	.zhenshiButton {
 		width: 150px;
-		line-height: 36px;
-		height: 36px;
 		border: 1px solid #e8e8e8;
 		text-align: center;
 		margin-top: 4px;
 		border-radius: 4px;
 		cursor: default;
+		padding: 6px 6px;
 	}
 
 	.zhenshiButtonActive {
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
index e00015d..b1a1e58 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
@@ -947,13 +947,12 @@
 
 	.zhenshiButton {
 		width: 150px;
-		line-height: 36px;
-		height: 36px;
 		border: 1px solid #e8e8e8;
 		text-align: center;
 		margin-top: 4px;
 		border-radius: 4px;
 		cursor: default;
+		padding: 6px 6px;
 	}
 
 	.zhenshiButtonActive {
diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue
index 41f3f20..b822349 100644
--- a/YiJi-admin/src/views/YeWu/MainList.vue
+++ b/YiJi-admin/src/views/YeWu/MainList.vue
@@ -1,7 +1,10 @@
 <template>
 	<div v-loading="loading">
-		<el-dialog title="预约列表" class="iframeDialog" v-model="iframe_show" @opened="dialogopened" @closed="closeIfram()">
-			<iframe id="bdIframe" :src="selectedUrl" class="iframe" :key="iframeKey" scrolling="auto"></iframe>
+		<el-dialog title="预约列表" class="iframeDialog" v-model="iframe_show" @opened="dialogopened" @closed="closeYuYueDialog()">
+			<iframe id="bdIframe" :src="selectedUrl" class="iframe" :key="YuYueKey" scrolling="auto"></iframe>
+		</el-dialog>
+		<el-dialog v-model="YuYueVueDialogVisible" width="100%" @close="closeYuYueDialog()">
+			<YuYue202506 :reg_num="tableSelected[0].reg_num" :entrust_ids="entrust_ids" :key="YuYueKey" :episode_id="tableSelected[0].episodeid" appointment_type="4" :dotype="do_type"></YuYue202506>
 		</el-dialog>
 		<div class="head">
 			<el-row>
@@ -295,10 +298,14 @@
 		ElMessageBox
 	} from 'element-plus'
 	import ShenQingDan from '@/components/Yewu/PrintShenQingDan.vue'  
+	import YuYue202506 from '@/components/Yewu/YuYue202506.vue'
+	let YuYueVueDialogVisible=ref(false);
+	let YuYueKey=ref(0);
 	let AutoGroup=ref(true);//自动分组是否开启
 	let shenqingdan_show=ref(false);
 	let do_type = ref(0) //按钮操作类型1预约2改约
 	let loading = ref(false)
+	let entrust_ids=ref('')
 	let searchInfo = ref({
 		dateRange: [],
 		list_status: null,
@@ -471,7 +478,6 @@
 	let selectedUrl = ref('')
 	let fileUrl = import.meta.env.VITE_APP_FILE
 	let iframe_show = ref(false)
-	let iframeKey = ref(0)
 
 	const openIframe = (type) => {
 		console.log(tableSelected.value)
@@ -497,11 +503,19 @@
 		})
 		if(next==false) return false
 		
-		iframeKey.value++
-		iframe_show.value = true
-		selectedUrl.value = fileUrl + '/jq_page/appointment.html?' + encodeURIComponent('regnum=' + tableSelected
-			.value[0].reg_num + '&entrustid=' + entrustids + '&episodeid=' + tableSelected
-			.value[0].episodeid + '&dotype=' + do_type.value + '&appointment_type=4') //appointment_type=4为护士
+		YuYueKey.value++
+		//打开jquery版
+		//iframe_show.value = true
+		//selectedUrl.value = fileUrl + '/jq_page/appointment.html?' + encodeURIComponent('regnum=' + tableSelected
+		//	.value[0].reg_num + '&entrustid=' + entrustids + '&episodeid=' + tableSelected
+		//	.value[0].episodeid + '&dotype=' + do_type.value + '&appointment_type=4') //appointment_type=4为护士
+		
+		//打开 vue版
+		entrust_ids.value=entrustids.join(',')
+		YuYueVueDialogVisible.value=true
+		selectedUrl.value = fileUrl + '/jq_page/appointment.html?' + 'regnum=' + encodeURIComponent(tableSelected
+			.value[0].reg_num) + '&entrustid=' + encodeURIComponent(entrustids) + '&episodeid=' + encodeURIComponent(tableSelected
+			.value[0].episodeid) + '&dotype=' + do_type.value + '&appointment_type=4' //appointment_type=4为护士
 		console.log(selectedUrl.value)
 
 
@@ -663,7 +677,7 @@
 		
 		
 	}
-	const closeIfram=()=>{
+	const closeYuYueDialog=()=>{
 		GetList()
 	}
 	//签到