针灸次数默认展开

components/visitorAccount.vue

@@ -77,7 +77,7 @@ export default {
 			default: 0
 		},
 		visitorInfo: {
-			type: Object,
+			type: [Object, Array],
 			default: () => { }
 		},
 	},

pages/visitors/visitors.vue

@@ -16,12 +16,9 @@
 					<view class="book-date-first" v-if="is_preview && item.first_visit">首次</view>
 				</view>
 				<view class="bot line36 flex">
-					<!-- <view class="flex">女 <view class="gap">|</view>  25岁</view>
-					<view v-if="item.phone" class="flex"><view class="gap">|</view> 手机号：1778989678</view> -->
 					<view class="flex">{{item.sex}}<view class="gap">|</view> {{ item.age }}岁</view>
 					<view v-if="item.phone" class="flex"><view class="gap">|</view>手机号：{{ item.phone }}</view>
 				</view>
-				<!-- <img class="status" :src="cssUrl+'visitor_select_active.svg'"> -->
 
 				<img class="status" :src="cssUrl+'check_false.svg'">
 				<img class="status" :src="cssUrl+'check_true.svg'">
@@ -34,7 +31,7 @@
 			<text>今日没有预约哦，请先预约时间</text>
 		</view>
 
-		<view class="submit flex baodao-submit"  v-if="type == 0 && !is_preview">
+		<view class="submit flex baodao-submit" v-if="type == 0 && !is_preview && !((type == 1 || type == 0) && !is_preview && visitUsers && visitUsers.length > 0)">
 			<view :class="'btn cancel btn1 PfScMedium'" hover-class="hover" @click="reback">返回</view>
 			<view class="btn primary btn1 PfScMedium" hover-class="hover"  @click="appointTime">现在预约</view>
 		</view>

pages/visitors_new/visitors_new.vue

@@ -2,10 +2,10 @@
 	<view class='waiting-method-page'>
 		<visitor-list @clickEvent="getVisitorListData" @dataEvent="setVisitorListData" ref="visitors" :add="true"></visitor-list>
 
-		<view class="uni-card-wrapper" v-for="(item,key) in visitor_list" @click.stop="modifyVisitor" :data-item="item">
+		<view class="uni-card-wrapper" v-for="(item,key) in visitor_list" @click.stop="modifyVisitor" :data-item="item" v-if="pageShow">
 			<uni-card  v-if="(visitor_id==0 || (visitor_id!=0 && visitor_id==item.id)) && pageShow"  :title="item.name"  :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" @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')))+'周未看病，请及时复诊')"/>
+					<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[item.id][item2.depart_id]" 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>
@@ -27,7 +27,7 @@
 				visitor_list:false,
 				visitor_id:0,
 				pageShow:false,
-				visitorInfo:{},
+				visitorInfo:[],
 				isOpen:false
 			}
 		},
@@ -44,15 +44,6 @@
 			},
 			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
 				uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor))
 				this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id)
 			},
@@ -63,9 +54,11 @@
 				this.isOpen = false
 			},
 			pageInit() {
+				this.visitor_list = false
+				this.pageShow = false
 				this.$refs.visitors.getVisitors()
 			},
-			setVisitorListData(e) {
+			async setVisitorListData(e) {
 				this.visitor_list = e.map(item=>{
 					if(item.h_list && item.h_list.length > 0){
 						item.h_list.forEach((item1)=>{item1.isOpen = false})
@@ -73,29 +66,49 @@
 					return item
 				})
 
+				for(var key in this.visitor_list) {
+					var item = this.visitor_list[key]
+					this.visitorInfo[item.id] = new Array()
+					for(var key1 in item.h_list){
+						var item2 = item.h_list[key1]
+						this.visitorInfo[item.id][item2.depart_id] = false
+
+						var param = new Object()
+						param.visitor_id = item.id
+						param.depart_id = item2.depart_id
+
+						this.visitor_list[key].h_list[key1].isOpen = true
+						await this.get_visitor_info(param)
+					}
+				}
+
+				console.log(this.visitorInfo, 88888)
+
 				this.pageShow = true
 			},
 			getVisitorListData(visitor_id){
 				this.visitor_id = visitor_id
 			},
-			get_visitor_info(param) {
+			async get_visitor_info(param) {
-				this.visitorInfo = false
-
 				var obj = new Object()
 				obj.depart_id = param.depart_id
 				obj.visitor_id = param.visitor_id
 
-				this.$http.req('api/user/get_visitor_info', obj, 'POST').then(data=>{
+				await this.$http.req('api/user/get_visitor_info', obj, 'POST').then(data=>{
 					if(data == 1) return
-					this.visitorInfo = data
+
+					var visitorinfo = this.visitorInfo
+					visitorinfo[param.visitor_id][param.depart_id] = data
+
+					this.visitorInfo = visitorinfo
 					this.isOpen = true
 					// if((this.visitorInfo.single_items && this.visitorInfo.single_items.length > 0) || (this.visitorInfo.treatment_package && Object.keys(this.visitorInfo.treatment_package).length > 0)) {
 					// 	this.$emit('hasrecord', 1)
 					// }else{
 					// 	this.$emit('hasrecord', 0)
 					// }
-
 				});
+				console.log(this.visitorInfo)
 		}
 	}
 }