From 67155ef49bf5a326c7e582393f2f0cb503acf8e1 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Wed, 4 Jun 2025 14:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=9D=BF=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E4=B8=8E=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/visitorAccount.vue       | 12 ++++++++----
 pages/visitors_new/visitors_new.vue | 29 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue
index ac4de3f..fe7ec67 100644
--- a/components/visitorAccount.vue
+++ b/components/visitorAccount.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :class="'visitor-account-com'+(open?' default-open':'')+(isOpen?' openstyle':'')">
 	<!-- <view class="visitor-account-com"> -->
-		<uni-collapse @change="change">
+		<uni-collapse @change="change($event)" catchtap="noop" data-type="collapse">
 			<uni-collapse-item :title="title ? title : ''" :thumb="thumb" :errmsg="errmsg" :disabled="disabled" :open="isOpen" v-if="visitorInfo">
 				<view class="collapse-list">
 					<view class="account-list">
@@ -90,10 +90,14 @@ export default {
 	},
 	methods: {
 		change(e) {
-			if(e[0] != 0) {
-				this.$emit('closeEvent')
-				return;
+			this.$emit('changeOpen')
+			if(this.isOpen){
+				return
 			}
+			// if(e[0] != 0) {
+			// 	this.$emit('closeEvent')
+			// 	return;
+			// }
 			const object = {
 				visitor_id: this.visitor_id,
 				depart_id: this.depart_id
diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue
index 65becda..d7abde7 100644
--- a/pages/visitors_new/visitors_new.vue
+++ b/pages/visitors_new/visitors_new.vue
@@ -5,7 +5,7 @@
 		<view class="uni-card-wrapper" v-for="(item,key) in visitor_list" @click.stop="modifyVisitor" :data-item="item">
 			<uni-card  v-if="(visitor_id==0 || (visitor_id!=0 && visitor_id==item.id)) && pageShow"  :title="item.name" :extra="'身份证：'+item.idcard_txt"  :class="((visitor_list && item.h_list && item.h_list.length>0)?'':'empty')" margin="0 0 0rpx 0" shadow="none" :border="false" padding="24rpx">
 				<view class="visitor-account">
-					<VisitorAccount @closeEvent="closeCollapse" @getinfo="get_visitor_info" :isOpen="isOpen" :title="item2.hospital+' '+item2.depart" v-for="(item2,key2) in item.h_list" :visitorInfo="visitorInfo" v-if="visitor_list && item.h_list && item.h_list.length>0" :depart_id="item2.depart_id" :visitor_id="item.id" :thumb="cssUrl+'hicon.svg'" :errmsg="(!item2.weeks ? (item2.days?(item2.days+'天未看病，请及时复诊'):'') : (' '+(item2.weeks<=10?item2.weeks:('超过10')))+'周未看病，请及时复诊')"/>
+					<VisitorAccount @closeEvent="closeCollapse" @getinfo="get_visitor_info" @changeOpen="changeOpenFun(key,key2)" :isOpen="item2.isOpen" :title="item2.hospital+' '+item2.depart" v-for="(item2,key2) in item.h_list" :visitorInfo="visitorInfo" v-if="visitor_list && item.h_list && item.h_list.length>0" :depart_id="item2.depart_id" :visitor_id="item.id" :thumb="cssUrl+'hicon.svg'" :errmsg="(!item2.weeks ? (item2.days?(item2.days+'天未看病，请及时复诊'):'') : (' '+(item2.weeks<=10?item2.weeks:('超过10')))+'周未看病，请及时复诊')"/>
 				</view>
 			</uni-card>
 		</view>
@@ -39,17 +39,20 @@
 			this.pageInit()
 		},
 		methods: {
+			changeOpenFun(key,key2){
+				this.visitor_list[key].h_list[key2].isOpen = !this.visitor_list[key].h_list[key2].isOpen
+			},
 			modifyVisitor(e) {
 				var visitor = e.currentTarget.dataset.item
 
-				var is_jump = true
-				if(visitor.h_list && visitor.h_list.length > 0) {
-					is_jump = false
-					if(e.detail.y < 291){
-						is_jump = true
-					}
-				}
-				if(!is_jump) return
+				// var is_jump = true
+				// if(visitor.h_list && visitor.h_list.length > 0) {
+				// 	is_jump = false
+				// 	if(e.detail.y < 291){
+				// 		is_jump = true
+				// 	}
+				// }
+				// if(!is_jump) return
 				uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor))
 				this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id)
 			},
@@ -63,7 +66,13 @@
 				this.$refs.visitors.getVisitors()
 			},
 			setVisitorListData(e) {
-				this.visitor_list = e
+				this.visitor_list = e.map(item=>{
+					if(item.h_list && item.h_list.length > 0){
+						item.h_list.forEach((item1)=>{item1.isOpen = false})
+					}
+					return item
+				})
+
 				this.pageShow = true
 			},
 			getVisitorListData(visitor_id){