diff --git a/App.vue b/App.vue
index 54e3a7c..3e7d6ad 100644
--- a/App.vue
+++ b/App.vue
@@ -239,14 +239,14 @@
height: 40rpx !important;
}
- .pages-visitors-visitors /deep/ .uni-actionsheet__cell{
+ .pages-visitors-visitors ::v-deep .uni-actionsheet__cell{
color:#31333B !important;
font-size: 34rpx;
line-height: 112rpx;
height: 112rpx;
padding: 0rpx 6rpx;
}
- .pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet {
+ .pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet {
left: 0;
right: 0;
bottom: 0;
@@ -255,15 +255,15 @@
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
- .pages-visitors-visitors /deep/ .uni-actionsheet__menu{
+ .pages-visitors-visitors ::v-deep .uni-actionsheet__menu{
border-radius: 20rpx 20rpx 0 0;
}
- .pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__cell:before {
+ .pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet__cell:before {
border-top: 2rpx solid #EEEEEE;
color: #EEEEEE;
}
- .pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__action{
+ .pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet__action{
margin-top: 24rpx;
margin-bottom: 10rpx;
}
diff --git a/components/preBookList.vue b/components/preBookList.vue
index 2306204..f0d28f9 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -12,8 +12,8 @@
{{item.status_desc}}
前方{{item.wait_visit_count}}人
-
- 2诊室13床
+
+ {{item.bed_desc}}
@@ -130,7 +130,7 @@ export default {
color: #30C563;
margin-top: 28rpx;
}
-
+
.status{
display: flex;
justify-content: flex-end;
@@ -148,7 +148,7 @@ export default {
min-width: 128rpx;
box-sizing: border-box;
}
-
+
&.status_wait{
view{
background: #F8FFF7;
diff --git a/components/userCard.vue b/components/userCard.vue
index 81c60a8..e0810ef 100644
--- a/components/userCard.vue
+++ b/components/userCard.vue
@@ -86,7 +86,7 @@ export default {
overflow: hidden;
&.popup-user-card{
- /deep/ {
+ ::v-deep {
.uni-card__header{
display: none !important;
}
@@ -109,7 +109,7 @@ export default {
}
}
- /deep/ {
+ ::v-deep {
.uni-easyinput{
margin-bottom: 24rpx;
.uni-easyinput__content-input{
diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue
index 9bd201b..b362126 100644
--- a/components/visitorAccount.vue
+++ b/components/visitorAccount.vue
@@ -104,7 +104,7 @@ export default {
height: auto;
overflow: hidden;
&.default-open{
- /deep/{
+ ::v-deep{
.uni-collapse-item__title{
display: none !important;
}
@@ -120,7 +120,7 @@ export default {
}
}
}
- /deep/{
+ ::v-deep{
.uni-collapse-item__wrap{
background: #F9FAFB;
.uni-collapse-item__wrap-content{
diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue
index 994709a..d9f574b 100644
--- a/pages/book_detail/book_detail.vue
+++ b/pages/book_detail/book_detail.vue
@@ -5,7 +5,7 @@
-
+
治疗记录
@@ -16,7 +16,7 @@
-
+
返回
@@ -24,7 +24,7 @@
-
+
{{poptitle}}
@@ -37,7 +37,7 @@
-
+
@@ -46,7 +46,7 @@
import listBox from '@/components/listBox.vue';
import visitorAccount from '@/components/visitorAccount.vue'
import userCard from '@/components/userCard.vue';
-
+
export default {
data() {
return {
@@ -85,7 +85,7 @@
// if(option.index) this.redirect = '/pages/index/index'
if(option.id) this.bookId = option.id
if(option.depart_id) this.depart_id = option.depart_id
-
+
},
onShow() {
if(!this.bookId || !this.depart_id){
@@ -170,10 +170,10 @@
this.showCancelBook = false
}
this.list[0].custom = ""+bookInfo.status_desc+"
"
-
-
+
+
this.list[1].custom = "2诊室13床"
-
+
this.list[2].rightTitle = bookInfo.name
this.list[3].rightTitle = bookInfo.hospital_name
this.list[4].rightTitle = bookInfo.depart_name
@@ -199,7 +199,7 @@
box-sizing: border-box;
.ccpop{
&.bed-edit-pop{
- /deep/{
+ ::v-deep{
.uni-data-checklist{
display: none !important;
}
@@ -211,12 +211,12 @@
}
}
}
- /deep/{
+ ::v-deep{
uni-view[name="content"]{
border-radius: 40rpx;
}
}
- }
+ }
.list-box,.bot-con{
width: calc(100% - 34rpx);
height: auto;
@@ -243,17 +243,17 @@
backdrop-filter: blur(54.4rpx);
box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181, 181, 181, 0.1319);
align-items: center;
-
+
.btn.btn1{
border-radius: 12rpx;
width: 300rpx;
height: 90rpx;
}
}
-
+
.list-box{
.item-wrapper{
- .item-inner /deep/{
+ .item-inner ::v-deep{
.bi{
align-items: center;
column-gap: 12rpx;
@@ -314,7 +314,7 @@
}
}
}
-
+
.queue-text{
height: 40rpx;
font-size: 28rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index de1fb06..6085543 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,7 @@
![]()
-
+
{{doctorInfo.doctor_info.doctor_detail}}
@@ -29,14 +29,14 @@
-
+
出诊信息
![]()
-
+
@@ -46,14 +46,14 @@
-
- 医保定点
+
+
-
+
{{item.address}}
-
+
@@ -63,20 +63,20 @@
![]()
导航
-
+
-
+
-
+
出诊：{{ item.workdate_desc }}
-
+
@@ -84,14 +84,14 @@
-
-
+
+
预约看病
-
-
+
+
-
+
-
+
@@ -177,6 +177,14 @@
preBookList,
},
onLoad(option) {
+ // define('DEPART_TYPE_FULL', 0); // 全功能
+ // define('DEPART_TYPE_COUNT', 1); // 仅计数
+ // define('DEPART_TYPE_CARD', 2); // 仅名片
+ // $GLOBALS['depart_type_list'] = array(
+ // DEPART_TYPE_FULL => '全功能',
+ // DEPART_TYPE_COUNT => '仅计数',
+ // DEPART_TYPE_CARD => '仅名片'
+ // );
if(option.code && option.state) {
this.code = option.code
this.state = option.state
@@ -249,7 +257,7 @@
this.$http.req('common/get_user_info', {code:this.code,state:this.state}, 'POST').then(data=>{
if(data == -1) return
this.$settoken.setToken(data.jwttoken)
-
+
this.setLoginUserInfo(data)
this.getDoctorInfo()
// var rebackPagePath = uni.getStorageSync('rebackPagePath')
@@ -259,7 +267,7 @@
// })
// }
});
-
+
},
async getDoctorInfo() {
await this.$http.req('user/index_info', {}, 'GET').then(data=>{
@@ -267,7 +275,6 @@
this.pageShow = true;
let visitFlag = true;
this.doctorInfo = data;
- console.log(data)
if(this.doctorInfo.doctor_info && this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){
this.doctor_dept = this.doctorInfo.doctor_info.depart_name;
}
@@ -275,7 +282,7 @@
this.hospitals = this.doctorInfo.hospital_departs;
this.doctor_dept = this.doctorInfo.hospital_departs[0]['depart_name'];
this.doctorInfo.doctor_info.depart_name = this.doctor_dept;
-
+
for (var index = 0; index < this.hospitals.length; index++) {
var element = this.hospitals[index];
this.collapseValue[index] = []
@@ -353,8 +360,8 @@
let lats = z * Math.sin(theta) + 0.006;
return {
lng: lngs,
- lat: lats
- }
+ lat: lats
+ }
}
}
}
@@ -456,7 +463,7 @@
margin-bottom: 36rpx;
border-bottom: 2rpx solid #F1F1F1;
padding-bottom: 36rpx;
-
+
&:last-child{
margin-bottom: 0rpx;
padding-bottom: 0rpx;
@@ -542,7 +549,7 @@
}
.notice-collapse {
margin-top: 24rpx;
- /deep/ {
+ ::v-deep {
.uni-collapse-item__title-box{
padding: 0;
display: flex;
@@ -599,10 +606,10 @@
letter-spacing: 0.22rpx;
color: #666666;
}
-
+
}
}
-
+
.bot{
margin-top: 16rpx;
}
@@ -630,7 +637,7 @@
width: 714rpx;
margin: 0 auto;
}
-
-
+
+
}
diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue
index bdf44ab..9927d90 100644
--- a/pages/modify_visitor/modify_visitor.vue
+++ b/pages/modify_visitor/modify_visitor.vue
@@ -58,7 +58,6 @@
title: '新增就诊人'
});
}
- console.log(88888)
},
onShow() {
if(this.vid) this.getVisitorInfo()
@@ -75,21 +74,24 @@
var addtimer = setTimeout(function() {
that.adding = false
}, 5000);
-
+
var req = 'user/add_visitor'
var method = 'POST'
if(this.vid){
param.id = this.vid
req = 'user/update_visitor'
}
-
+
this.$http.req(req, param, method, true).then(data=>{
clearTimeout(addtimer)
this.adding = false
if(this.vid){
uni.removeStorageSync('visitor_info_'+ this.vid)
}
- this.$func.toPage('/pages/visitors/visitors?type='+this.type)
+
+ uni.navigateBack()
+
+ // this.$func.toPage('/pages/visitors/visitors?type='+this.type)
});
},
getVisitorInfo() {
@@ -202,5 +204,5 @@
}
}
}
-
+
diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue
index e7c9959..c22daf8 100644
--- a/pages/visit_detail/visit_detail.vue
+++ b/pages/visit_detail/visit_detail.vue
@@ -208,7 +208,7 @@
box-sizing: border-box;
.ccpop{
&.bed-edit-pop{
- /deep/{
+ ::v-deep{
.uni-data-checklist{
display: none !important;
}
@@ -220,7 +220,7 @@
}
}
}
- /deep/{
+ ::v-deep{
uni-view[name="content"]{
border-radius: 40rpx;
}
@@ -262,7 +262,7 @@
.list-box{
.item-wrapper{
- .item-inner /deep/{
+ .item-inner ::v-deep{
.bi{
align-items: center;
column-gap: 12rpx;
diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue
index 6fdb747..47c7d14 100644
--- a/pages/visitors/visitors.vue
+++ b/pages/visitors/visitors.vue
@@ -1,9 +1,9 @@
-
+
{{hospital_depart_name}}
-
+
@@ -22,26 +22,25 @@
![]()
-
+
![]()
今日没有预约哦，请先预约时间
-
-
+
返回
预约时间
-
+
确认预约（已选{{selectCount}}位）
请确保预约就诊前在门诊先挂号
-
-
+
+
确认以上患者已到（已选{{selectCount}}位）
@@ -78,10 +77,10 @@
超{{-item.remain_num}}次
-
+
-
+
import pop from '@/components/pop.vue';
-
+
export default {
data() {
return {
cssUrl:this.cssUrl,
- type:1,
+ type:-1,
res:true,
popContent:'删除张杨明后，就诊记录还可以查到，确定删除吗？',
popTitle:'确认删除',
@@ -114,7 +113,9 @@
popIndex:0,
depart_id:0,
hospital_depart_name:'',
- hasBaoDaoData:false
+ hasBaoDaoData:false,
+ type:-1,
+ pageshow:false,
}
},
components:{
@@ -126,7 +127,7 @@
depart_info = JSON.parse(depart_info)
this.hospital_depart_name = depart_info.hospital_name + ' ' + depart_info.depart_name
}
-
+
if(option.type) {
this.type = option.type
}else{
@@ -142,6 +143,14 @@
this.$pop.modelShow('请先选择要预约的医院科室', '/pages/index/index')
return
}
+
+ if(this.type == 3 && !option.depart_id) {
+ this.$pop.modelShow('签到二维码有误或已过期！', '/pages/index/index')
+ return
+ }
+
+ if(this.type == 3) this.depart_id = option.depart_id
+
},
onReady() {
if(this.type == 2){
@@ -152,11 +161,13 @@
uni.setNavigationBarTitle({
title:'确认报到'
})
+ this.getDepartInfo();
}else{
uni.setNavigationBarTitle({
title:'请选择就诊人'
})
}
+
},
methods: {
reback(){
@@ -231,6 +242,16 @@
}
});
},
+ getDepartInfo() {
+ this.$http.req('user/get_depart_info', {depart_id:this.depart_id}, 'POST').then(data=>{
+ this.type = data.type
+ if(this.type == 2){
+ this.$pop.modelShow('签到二维码已过期', '/pages/index/index')
+ return;
+ }
+ this.pageshow = true
+ });
+ },
showPopCom() {
this.$refs.popcom.open()
},
@@ -269,7 +290,7 @@
this.$pop.modelShow('请选择就诊人')
return
}
-
+
this.activeVisitors = []
for (var i = 0; i < this.visitUsers.length; i++) {
if(this.visitUsers[i].select) this.activeVisitors.push(this.visitUsers[i])
@@ -453,7 +474,7 @@
color: #FFFFFF;
}
}
-
+
.submit{
position: fixed;
width: 100%;
diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue
index 36b0c7d..0f0e058 100644
--- a/pages/visitors_new/visitors_new.vue
+++ b/pages/visitors_new/visitors_new.vue
@@ -36,14 +36,14 @@
cssUrl:this.cssUrl,
depart_id:0,
hospital_depart_name:'',
- value:'',
- type: 0,
- types: [{
- text: '等医生叫号',
- value: 0
- }, {
- text: '找床位候诊',
- value: 1
+ value:'',
+ type: 0,
+ types: [{
+ text: '等医生叫号',
+ value: 0
+ }, {
+ text: '找床位候诊',
+ value: 1
}],
}
},
@@ -73,7 +73,7 @@