From 7098b2c4555471c2b394e03b21e042724603c76f Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Tue, 22 Jul 2025 16:41:26 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 +-- pages/visitors/visitors.vue | 64 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/main.js b/main.js index a2ad206..329477d 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -// const NODE_ENV = 'development'; -const NODE_ENV = 'production'; +const NODE_ENV = 'development'; +// const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 4ff136f..4eba802 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -13,7 +13,7 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - 新 + 首次 + + + + + + + + + + {{item.name}} + 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 + 首次 + + + + {{item.sex}}| {{ item.age }}岁 + |手机号：{{ item.phone }} + + + + + + + @@ -36,12 +61,14 @@ + 请先勾选就诊人，可多选 确认预约（已选{{selectCount}}位） + 请先勾选就诊人，可多选 确认以上患者已到（已选{{selectCount}}位） @@ -320,7 +347,7 @@ } this.$http.req('api/user/get_visitors', obj, 'POST').then(data=>{ - this.visitUsers = data; + this.visitUsers = data; if(this.visitUsers.length == 0 && !obj.get_preview) { this.addVisitor() return; @@ -385,7 +412,7 @@ uni.setStorageSync('active_visitors', JSON.stringify(this.activeVisitors)) // 确认报道 => 跳转候诊方式 - if((this.type == 0 || this.type == 1) && !this.is_preview){ + if((this.type == 0 || this.type == 1) && !this.is_preview){ uni.setStorageSync('methods_set_wait', 1) this.$nav.navToPath('/pages/waiting_method/waiting_method') return @@ -499,17 +526,28 @@ } &.active{ border: 2rpx solid #39D067; - .status{ - display: block; + .status:first-of-type{ + display: none !important; + } + .status:nth-of-type(2){ + display: block !important; } } .status{ - right: 0; - bottom: 0; - width: 98rpx; - height: 98rpx; + right: 24rpx; + bottom: 37rpx; + width: 36rpx; + height: 36rpx; + z-index: 2; + } + + .status:first-of-type{ + display: block; + } + .status:nth-of-type(2){ display: none; } + .bg{ bottom: 0; right: 0; @@ -587,6 +625,12 @@ color: #B3B4BC; margin-top: 33rpx; } + .choose-desc{ + font-size: 28rpx; + text-align: center; + color: #21B955; + margin-bottom: 19rpx; + } } .list-wrapper2{ .item{ From 8c243c117df29a112e7979837914744e4d5afaf3 Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Tue, 22 Jul 2025 16:43:29 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors/visitors.vue | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 4eba802..966605c 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -10,19 +10,6 @@ - - {{item.name}} - 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - 首次 - - - - {{item.sex}}| {{ item.age }}岁 - |手机号：{{ item.phone }} - - - From eba5ff510574eb64143d5e3d870ebf7cd015449d Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Tue, 22 Jul 2025 16:44:56 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors/visitors.vue | 47 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 966605c..dfd5460 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -10,17 +10,10 @@ - - - - - - - {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - 首次 + 新 - - - - + - @@ -48,14 +36,12 @@ - 请先勾选就诊人，可多选 确认预约（已选{{selectCount}}位） - 请先勾选就诊人，可多选 确认以上患者已到（已选{{selectCount}}位） @@ -513,28 +499,17 @@ } &.active{ border: 2rpx solid #39D067; - .status:first-of-type{ - display: none !important; - } - .status:nth-of-type(2){ - display: block !important; + .status{ + display: block; } } .status{ - right: 24rpx; - bottom: 37rpx; - width: 36rpx; - height: 36rpx; - z-index: 2; - } - - .status:first-of-type{ - display: block; - } - .status:nth-of-type(2){ + right: 0; + bottom: 0; + width: 98rpx; + height: 98rpx; display: none; } - .bg{ bottom: 0; right: 0; @@ -612,12 +587,6 @@ color: #B3B4BC; margin-top: 33rpx; } - .choose-desc{ - font-size: 28rpx; - text-align: center; - color: #21B955; - margin-bottom: 19rpx; - } } .list-wrapper2{ .item{ From 5a6783f41c8145d352520780a1c861274ef51951 Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Tue, 22 Jul 2025 16:45:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors/visitors.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index dfd5460..83cf3f9 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -13,7 +13,7 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - 新 + 首次 + @@ -38,12 +40,14 @@ + 请先勾选就诊人，可多选 确认预约（已选{{selectCount}}位） + 请先勾选就诊人，可多选 确认以上患者已到（已选{{selectCount}}位） @@ -501,17 +505,28 @@ } &.active{ border: 2rpx solid #39D067; - .status{ - display: block; + .status:first-of-type{ + display: none !important; + } + .status:nth-of-type(2){ + display: block !important; } } .status{ - right: 0; - bottom: 0; - width: 98rpx; - height: 98rpx; + right: 24rpx; + bottom: 37rpx; + width: 36rpx; + height: 36rpx; + z-index: 2; + } + + .status:first-of-type{ + display: block; + } + .status:nth-of-type(2){ display: none; } + .bg{ bottom: 0; right: 0; @@ -589,6 +604,12 @@ color: #B3B4BC; margin-top: 33rpx; } + .choose-desc{ + font-size: 28rpx; + text-align: center; + color: #21B955; + margin-bottom: 19rpx; + } } .list-wrapper2{ .item{ 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 7/9] =?UTF-8?q?=E9=92=88=E7=81=B8=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E9=BB=98=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) } } } From 68886570be142e32ddfa5ebafd7b67cc1cb966c4 Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Wed, 23 Jul 2025 14:32:47 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=92=88=E7=81=B8=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 ++-- pages/visitors_new/visitors_new.vue | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 329477d..a2ad206 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -const NODE_ENV = 'development'; -// const NODE_ENV = 'production'; +// const NODE_ENV = 'development'; +const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue index 1dfc3e9..d6f640f 100644 --- a/pages/visitors_new/visitors_new.vue +++ b/pages/visitors_new/visitors_new.vue @@ -88,6 +88,9 @@ }, getVisitorListData(visitor_id){ this.visitor_id = visitor_id + this.visitor_list = false + this.pageShow = false + this.$refs.visitors.getVisitors() }, async get_visitor_info(param) { var obj = new Object() From f3443aae16b931f2784a53dabd72ecc31565ecde Mon Sep 17 00:00:00 2001 From: longchao <1432334894@qq.com> Date: Wed, 23 Jul 2025 14:34:20 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors_new/visitors_new.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue index d6f640f..278406b 100644 --- a/pages/visitors_new/visitors_new.vue +++ b/pages/visitors_new/visitors_new.vue @@ -48,7 +48,6 @@ this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id) }, stopModifyVisitor(e) { - console.log(e) }, closeCollapse() { this.isOpen = false @@ -82,8 +81,6 @@ } } - console.log(this.visitorInfo, 88888) - this.pageShow = true }, getVisitorListData(visitor_id){ @@ -105,13 +102,7 @@ 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) } } }