From e124791945140d31dbc6869ab57eaecdc5701ee2 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Wed, 16 Apr 2025 17:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8A=A5=E9=81=93=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/inputBox.vue                 |  5 ++---
 pages/modify_visitor/modify_visitor.vue |  2 +-
 pages/visitors/visitors.vue             | 21 +++++++++++++++++++--
 pages/waiting_method/waiting_method.vue | 24 +++++++++++++++++++++---
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/components/inputBox.vue b/components/inputBox.vue
index 7a343c1..566808b 100644
--- a/components/inputBox.vue
+++ b/components/inputBox.vue
@@ -140,10 +140,10 @@ export default {
 			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1457);
 			box-sizing: border-box;
 			margin: 0 auto;
-			font-size: 32rpx;
+			font-size: 32rpx;
 			line-height: 32rpx;
 			letter-spacing: 1rpx;
-			padding: 36rpx 0;
+			padding: 36rpx 0;
 			.top-wrapper{
 				display: flex;
 				background: #FFFFFF;
@@ -192,7 +192,6 @@ export default {
 			}
 		}
 		.errmsg{
-			color: #FD0000;
 			margin: 0 auto;
 			width: 100%;
 			display: flex;
diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue
index 614b59d..bdf44ab 100644
--- a/pages/modify_visitor/modify_visitor.vue
+++ b/pages/modify_visitor/modify_visitor.vue
@@ -9,7 +9,7 @@
 
 		<view class="submit-wrapper btPadding" v-if="!vid">
 			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit" v-if="!vid">
-				确认添加
+				确认新增
 			</view>
 			<view :class="'btn btn3 submit'+(canSubmit?' primary':' noclick')" :hover-class="(canSubmit?'hover':'')" @click="submit" v-else>
 				确认修改
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index cde9ae9..6fdb747 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -29,9 +29,9 @@
 		</view>
 		
 		
-		<view class="submit flex baodao-submit"  v-if="type == 3 && !hasBaoDaoData" @click="toPrebook">
+		<view class="submit flex baodao-submit"  v-if="type == 3 && !hasBaoDaoData">
 			<view :class="'btn cancel btn1 PfScMedium'" hover-class="hover" @click="reback">返回</view>
-			<view class="btn primary btn1 PfScMedium" hover-class="hover"  @click="cancelBook">预约时间</view>
+			<view class="btn primary btn1 PfScMedium" hover-class="hover"  @click="appointTime">预约时间</view>
 		</view>
 
 		<view class="submit"  v-if="type == 1" @click="toPrebook">
@@ -159,6 +159,15 @@
 			}
 		},
 		methods: {
+			reback(){
+				uni.navigateBack(-1)
+			},
+			// 预约时间 -跳转就诊人页面-预约时间
+			appointTime(){
+				uni.navigateTo({
+					url:'/pages/visitors/visitors?type=1'
+				})
+			},
 			modifyVistor(visitor){
 				uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor))
 				this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id)
@@ -267,6 +276,14 @@
 				}
 
 				uni.setStorageSync('active_visitors', JSON.stringify(this.activeVisitors))
+				// 确认报道 => 跳转候诊方式
+				if(this.type == 3 && this.hasBaoDaoData){
+					uni.navigateTo({
+						url:'/pages/waiting_method/waiting_method'
+					})
+					return
+				}
+				// 预约人员
 				uni.navigateTo({
 					url:"/pages/prebook/prebook"
 				})
diff --git a/pages/waiting_method/waiting_method.vue b/pages/waiting_method/waiting_method.vue
index 3be95c9..9493ba5 100644
--- a/pages/waiting_method/waiting_method.vue
+++ b/pages/waiting_method/waiting_method.vue
@@ -4,10 +4,10 @@
 			{{hospital_depart_name}}
 		</view>
 
-		<user-card v-for="(item, key) in visitorList" :dataitem="item" @clickEvent="changeType" :index="key"></user-card>
+		<user-card v-for="(item, key) in active_visitors" :dataitem="item" @clickEvent="changeType" :index="key"></user-card>
 
 		<view class="submit">
-			<view class="bot primary btn btn2 submitbtn PfScMedium" hover-class="hover">
+			<view class="bot primary btn btn2 submitbtn PfScMedium" hover-class="hover" @click="submitWaitType">
 				确认候诊方式
 			</view>
 		</view>
@@ -23,6 +23,7 @@
 			return {
 				cssUrl:this.cssUrl,
 				depart_id:0,
+				active_visitors:[],
 				hospital_depart_name:'',
 				visitorList:[
 					{name:'张三',type:1},
@@ -34,7 +35,10 @@
 			userCard
 		},
 		onLoad(option) {
-			var depart_info = uni.getStorageSync('depart')
+			// 来自 确认报道页面选中的就诊人
+			var active_visitors = JSON.parse(uni.getStorageSync('active_visitors'));
+			this.active_visitors = active_visitors;
+			var depart_info = uni.getStorageSync('depart');
 			if(depart_info) {
 				depart_info = JSON.parse(depart_info)
 				this.hospital_depart_name = depart_info.hospital_name + ' ' + depart_info.depart_name
@@ -64,6 +68,20 @@
 			},
 			changeType(info) {
 				console.log(info)
+				// 存储每一项的候诊方式
+				this.active_visitors[info.key].type = info.type;
+			},
+			submitWaitType(){
+				// 跳转就诊记录待完成
+				// this.active_visitors待完成
+				// jiekou 更新数据----待完成
+				
+				this.$http.req('user/get_visitors', {}, 'POST').then(data=>{
+					
+					uni.navigateTo({
+						url:'/pages/prebook_list/prebook_list'
+					})
+				});
 			}
 			
 		}