From 147bdc74b21285a1c816486ab021443dde2b2ecb Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Wed, 23 Jul 2025 12:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E7=81=B8=E6=AC=A1=E6=95=B0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/visitorAccount.vue | 2 +- pages/visitors/visitors.vue | 7 ++--- pages/visitors_new/visitors_new.vue | 51 +++++++++++++++++++++++-------------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue index fe7ec67..f4d26d5 100644 --- a/components/visitorAccount.vue +++ b/components/visitorAccount.vue @@ -77,7 +77,7 @@ export default { default: 0 }, visitorInfo: { - type: Object, + type: [Object, Array], default: () => { } }, }, diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 7a76d29..d954660 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -16,12 +16,9 @@ 首次 - {{item.sex}}| {{ item.age }}岁 |手机号:{{ item.phone }} - @@ -34,7 +31,7 @@ 今日没有预约哦,请先预约时间 - + 返回 现在预约 @@ -46,7 +43,7 @@ - + 请先勾选就诊人,可多选 确认以上患者已到(已选{{selectCount}}位) diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue index f8f41b3..1dfc3e9 100644 --- a/pages/visitors_new/visitors_new.vue +++ b/pages/visitors_new/visitors_new.vue @@ -2,10 +2,10 @@ - + @@ -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) { - this.visitorInfo = false - + async get_visitor_info(param) { 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) } } }