Browse Source

Merge pull request 'bug-rework-2025-0603' (#12) from bug-rework-2025-0603 into master

Reviewed-on: kuaileadmin/acupuncture_register_system_uniapp#12
master
超级管理员 3 months ago
parent
commit
7386235713
  1. 2
      components/bookBox.vue
  2. 2
      components/userCard.vue
  3. 2
      components/visitorList.vue
  4. 6
      main.js
  5. 14
      pages.json
  6. 10
      pages/book_detail/book_detail.vue
  7. 29
      pages/index/index.vue
  8. 4
      pages/modify_visitor/modify_visitor.vue
  9. 8
      pages/prebook/prebook.vue
  10. 4
      pages/usercenter/usercenter.vue
  11. 15
      pages/visit_detail/visit_detail.vue
  12. 23
      pages/visitors/visitors.vue
  13. 6
      pages/waiting_method/waiting_method.vue
  14. 12
      中医针灸改版2.0_2025_03_06/需求拆分.txt
  15. 14
      针灸挂号系统功能拆分.txt

2
components/bookBox.vue

@ -6,7 +6,7 @@
<view>{{item.month}}.{{ item.day }}</view>
<view class="PfScMedium">{{item.week_desc}}</view>
</view>
<view :class="'bot'+((item.work_desc !== '不出诊')?' active':'')+(key==0?' PfScMedium':'')">
<view :class="'bot'+((item.work_desc !== '不可预约')?' active':'')+(key==0?' PfScMedium':'')">
{{item.work_desc}}
</view>
</view>

2
components/userCard.vue

@ -13,7 +13,7 @@
</view>
<view class="card-cus-txt" v-if="type == 0">
首次就诊建议等待医生叫号
首次预约建议等待医生叫号
</view>
<view class="card-cus-txt" v-else>

2
components/visitorList.vue

@ -3,7 +3,7 @@
<view class="nav">
<view class="add PfScMedium" @click="addVisitor" v-if="add">
<img :src="cssUrl + 'add_visitor.svg'">
<text>增加就诊</text>
<text>增加预约</text>
</view>
<view :class="'item ' + (userSelectIndex == 0 ? ' active' : '')" @click="selectUser(0)">全部</view>
<view :class="'item' + (userSelectIndex == (key + 1) ? ' active' : '')" v-for="(item, key) in vistors"

6
main.js

@ -285,6 +285,12 @@ function req(url, data={}, method = 'POST', header={}) {
}
return;
}
if (rs.confirm && rdata.code!=CODE_LOGIN_EXIPRE && rdata.msg && rdata.msg.indexOf('用户信息不存在') > -1) {
removeLogin();
navToPath('/pages/index/index')
return;
}
}
});

14
pages.json

@ -2,13 +2,13 @@
"pages": [{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页"
"navigationBarTitleText": ""
}
},
{
"path": "pages/visitors_new/visitors_new",
"style": {
"navigationBarTitleText": "就诊人"
"navigationBarTitleText": "预约人"
}
},
{
@ -21,7 +21,7 @@
{
"path": "pages/prebook_list/prebook_list",
"style": {
"navigationBarTitleText": "就诊记录",
"navigationBarTitleText": "预约记录",
"enablePullDownRefresh": false
}
},
@ -51,28 +51,28 @@
{
"path": "pages/modify_visitor/modify_visitor",
"style": {
"navigationBarTitleText": "就诊人信息",
"navigationBarTitleText": "预约人信息",
"enablePullDownRefresh": false
}
},
{
"path": "pages/prebook/prebook",
"style": {
"navigationBarTitleText": "预约就诊",
"navigationBarTitleText": "预约",
"enablePullDownRefresh": false
}
},
{
"path": "pages/visitors/visitors",
"style": {
"navigationBarTitleText": "选择就诊人",
"navigationBarTitleText": "选择预约人",
"enablePullDownRefresh": false
}
},
{
"path": "pages/visit_detail/visit_detail",
"style": {
"navigationBarTitleText": "就诊详情"
"navigationBarTitleText": "预约详情"
}
},
{

10
pages/book_detail/book_detail.vue

@ -12,7 +12,7 @@
</view>
<view class="bot-con">
<view class="title PfScMedium">就诊提醒</view>
<view class="title PfScMedium">预约提醒</view>
<view class="content" v-html="notice"></view>
</view>
<view class="btPadding pagebt"></view>
@ -55,12 +55,12 @@
list:[
{'leftTitle':'候诊状态','custom':"",show:true,edit:true},
{'leftTitle':'所在床位','rightTitle':'',show:true,edit:true},
{'leftTitle':'就诊人','rightTitle':'',show:true,edit:false},
{'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false},
{'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false},
{'leftTitle':'预约人','rightTitle':'',show:true,edit:false},
{'leftTitle':'服务机构','rightTitle':'',show:true,edit:false},
{'leftTitle':'预约科室','rightTitle':'',show:true,edit:false},
{'leftTitle':'医生','rightTitle':'',show:true,edit:false},
{'leftTitle':'排队情况','custom':"",show:true,edit:false},
{'leftTitle':'就诊时间','custom':"",show:true,edit:false}
{'leftTitle':'预约时间','custom':"",show:true,edit:false}
],
showCancelBook:false,
bookId:false,

29
pages/index/index.vue

@ -16,12 +16,12 @@
</view>
<view class="block desc-wrapper" v-if="doctorInfo.doctor_info.doctor_detail">
<view class="title-wrapper flex">
<!-- <view class="title-wrapper flex">
<view class="title">
医生简介
</view>
<img :src="cssUrl+'right_bg.png'" alt="">
</view>
</view> -->
<view class="con">
{{doctorInfo.doctor_info.doctor_detail}}
@ -29,13 +29,12 @@
</view>
<view class="block hospital-wrapper" v-if="hospitals">
<view class="title-wrapper flex">
<!-- <view class="title-wrapper flex">
<view class="title">
出诊信息
</view>
<img :src="cssUrl+'right_bg.png'" alt="">
</view>
</view> -->
<view class="item" v-for="(item,key) in hospitals">
<view class="top flex">
@ -59,12 +58,12 @@
</view>
</view>
<view class="center">
<view class="center" v-if="item.workdate_desc">
出诊{{ item.workdate_desc }}
</view>
<uni-collapse ref="collapse" v-model="collapseValue[key]" class="notice-collapse" v-if="item.notice">
<uni-collapse-item title="就诊须知">
<uni-collapse-item title="预约须知">
<view class=" content" >
<view class="text" v-html="item.notice"></view>
</view>
@ -72,7 +71,7 @@
</uni-collapse>
<view class="bot primary btn btn2" hover-class="hover" @click="toVisitors(item)" v-if="item.type==0">
预约看病
开始预约
</view>
</view>
</view>
@ -81,7 +80,7 @@
<view class="header flex">
<view class="title-wrapper flex booklist">
<view class="title">
最近就诊
最近预约
</view>
<img :src="cssUrl+'right_bg.png'" alt="">
</view>
@ -122,7 +121,8 @@
loginToken:false,
state:'',
workdate:[],
user_type:-1
user_type:-1,
show_info:false,
}
},
components:{
@ -142,7 +142,7 @@
this.doctor_id = getApp().globalData.doctorId
if(!this.doctor_id) return
var title = '预约就诊'
var title = ''
if(this.code) title = '登录'
uni.setNavigationBarTitle({
title:title
@ -243,6 +243,11 @@
this.doctorInfo = data;
this.user_type = this.doctorInfo.user_type;
var title = this.doctorInfo.doctor_info.doctor_name+'主页'
uni.setNavigationBarTitle({
title:title
})
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;
}
@ -267,7 +272,7 @@
}
this.hospital_departs = this.doctorInfo.hospital_departs.map((item,index)=>{
item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id]
if(this.doctorInfo.workdate_desc) item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id]
return item
})
});

4
pages/modify_visitor/modify_visitor.vue

@ -50,11 +50,11 @@
if(option.vid) {
this.vid = option.vid
uni.setNavigationBarTitle({
title: '修改就诊人'
title: '修改预约人'
});
}else{
uni.setNavigationBarTitle({
title: '新增就诊人'
title: '新增预约人'
});
}
},

8
pages/prebook/prebook.vue

@ -18,7 +18,7 @@
</view>
</view>
<view class="item member-style" v-else>
<view class="left">就诊</view>
<view class="left">预约</view>
<view class="right over2 over5">
<text v-for="(item,key) in activeVisitors">
<text v-if="key<=9">{{nums[key]}}</text><text v-else>n.</text>{{item.name}}
@ -30,7 +30,7 @@
<view class="right">{{doctor_name}}</view>
</view>
<view class="item">
<view class="left">就诊医院</view>
<view class="left">服务机构</view>
<view class="right over2 over5">{{depart.hospital_name}} {{depart.depart_name}}</view>
</view>
<view class="item">
@ -98,7 +98,7 @@
this.doctor_name = this.doctorInfo.doctor_info.doctor_name
if(!this.departId && this.depart) {
this.$pop.modelShow('请先选择要预约的医院科室', redi_path)
this.$pop.modelShow('请先选择要预约的服务机构科室', redi_path)
return
}
this.depart = JSON.parse(this.depart)
@ -182,7 +182,7 @@
}
if(uids.length <= 0){
this.$pop.modelShow('请选择预约就诊人')
this.$pop.modelShow('请选择预约预约人')
console.log(88888);
return
}

4
pages/usercenter/usercenter.vue

@ -9,12 +9,12 @@
<view class="menu">
<view class="item" @click="toVisitors">
<img :src="cssUrl+'user_icon.svg'" alt="">
<view>就诊</view>
<view>预约</view>
</view>
<view class="item" @click="toPrebookList">
<img :src="cssUrl+'message.svg'" alt="">
<view>就诊记录</view>
<view>预约记录</view>
</view>
</view>

15
pages/visit_detail/visit_detail.vue

@ -16,7 +16,7 @@
</view>
<view class="bot-con" v-if="notice">
<view class="title PfScMedium">就诊提醒</view>
<view class="title PfScMedium">预约提醒</view>
<view class="content" v-html="notice"></view>
</view>
<view class="btPadding pagebt"></view>
@ -64,12 +64,12 @@
list:[
{'leftTitle':'候诊状态','custom':"",show:true,edit:false},
{'leftTitle':'所在床位','rightTitle':'',show:false,edit:false},
{'leftTitle':'就诊人','rightTitle':'',show:true,edit:false},
{'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false},
{'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false},
{'leftTitle':'预约人','rightTitle':'',show:true,edit:false},
{'leftTitle':'服务机构','rightTitle':'',show:true,edit:false},
{'leftTitle':'预约科室','rightTitle':'',show:true,edit:false},
{'leftTitle':'医生','rightTitle':'',show:true,edit:false},
{'leftTitle':'排队情况','custom':"",show:true,edit:false},
{'leftTitle':'就诊时间','custom':"",show:true,edit:false}
{'leftTitle':'预约时间','custom':"",show:true,edit:false}
],
showCancelBook:false,
bookId:false,
@ -323,7 +323,12 @@
this.list[2].rightTitle = bookInfo.name
this.list[3].rightTitle = bookInfo.hospital_name
this.list[4].rightTitle = bookInfo.depart_name
if(!bookInfo.depart_name) {
this.list[4].show = false
}
this.list[5].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无'
this.list[6].show = false

23
pages/visitors/visitors.vue

@ -5,14 +5,14 @@
</view>
<view class="header block flex line40" @click="addVisitor" v-if="(type != 3 && type != 0) || is_preview">
<img :src="cssUrl+'add.svg'">增加就诊
<img :src="cssUrl+'add.svg'">增加预约
</view>
<view class="list-wrapper" v-if="(type == 1 || type == 0 || is_preview) && visitUsers && visitUsers.length > 0">
<view :class="'item block'+(item.select?' active':'')" v-for="(item,key) in visitUsers" @click="chooseVisitor(item, key)">
<view class="top flex">
<view class="name PfScSemibold over2">{{item.name}}</view>
<view class="book-date" v-if="type == 0 && item.visit_time && !is_preview">已预约今日 {{ item.visit_time.split('-')[0] }} 就诊</view>
<view class="book-date" v-if="type == 0 && item.visit_time && !is_preview">已预约今日 {{ item.visit_time.split('-')[0] }} 预约</view>
</view>
<view class="bot line36">
身份证号{{item.idcard_txt}}
@ -35,7 +35,6 @@
<view class="bot primary btn btn2 submitbtn" hover-class="hover">
确认预约已选{{selectCount}}
</view>
<view class="tip height40">请确保预约就诊前在门诊先挂号</view>
</view>
<view class="submit" v-if="(type == 1 || type == 0) && !is_preview && visitUsers && visitUsers.length > 0" @click="toPrebook">
@ -97,7 +96,7 @@
data() {
return {
cssUrl:this.cssUrl,
popContent:'删除张杨明后,就诊记录还可以查到,确定删除吗?',
popContent:'删除张杨明后,预约记录还可以查到,确定删除吗?',
popTitle:'确认删除',
popShowCancel:true,
visitUsers:false,
@ -153,7 +152,7 @@
this.depart_id = uni.getStorageSync('depart_id')
if(!this.depart_id && this.type == 1) {
this.$pop.modelShow('请先选择要预约的医院科室!', '/pages/index/index')
this.$pop.modelShow('请先选择要预约的服务机构科室!', '/pages/index/index')
return
}
@ -167,7 +166,7 @@
if(this.type == 2){
uni.setNavigationBarTitle({
title:'就诊人'
title:'预约人'
})
}if(this.type == 3){
uni.setNavigationBarTitle({
@ -175,7 +174,7 @@
})
}else{
uni.setNavigationBarTitle({
title:'请选择就诊人'
title:'请选择预约人'
})
}
},
@ -193,7 +192,7 @@
reback(){
this.$nav.navToPath('/pages/index/index')
},
// --
// --
getDoctorInfo() {
this.$http.req('api/user/index_info', {}, 'GET').then(data=>{
if(data == -1) return
@ -207,7 +206,7 @@
})
if(!hospital || Object.keys(hospital).length === 0) {
this.$pop.modelShow('请先选择要预约的医院科室~', '/pages/index/index')
this.$pop.modelShow('请先选择要预约的服务机构科室~', '/pages/index/index')
return
}
@ -236,7 +235,7 @@
var that = this
uni.showModal({
title:'删除',
content:'删除'+visitor.name+'后,就诊记录还可以查到,确定删除吗?',
content:'删除'+visitor.name+'后,预约记录还可以查到,确定删除吗?',
success(res) {
if(!res.confirm) return
that.$http.req('api/user/del_visitor', {id:visitor.id},'POST').then(data=>{
@ -248,7 +247,7 @@
vistorOption(visitor){
var that = this
uni.showActionSheet({
itemList: ['修改就诊人信息', '删除就诊人'],
itemList: ['修改预约人信息', '删除预约人'],
success: function (res) {
if(res.tapIndex == 0){
that.modifyVistor(visitor)
@ -328,7 +327,7 @@
},
toPrebook(){
if(this.selectCount <= 0){
this.$pop.modelShow('请选择就诊人')
this.$pop.modelShow('请选择预约人')
return
}

6
pages/waiting_method/waiting_method.vue

@ -34,7 +34,7 @@
userCard
},
onLoad(option) {
//
//
var active_visitors = JSON.parse(uni.getStorageSync('active_visitors'));
this.active_visitors = active_visitors;
var depart_info = uni.getStorageSync('depart');
@ -44,7 +44,7 @@
}
this.depart_id = uni.getStorageSync('depart_id')
if(!this.depart_id) {
this.$pop.modelShow('请先选择要预约的医院科室', '/pages/index/index')
this.$pop.modelShow('请先选择要预约的服务机构科室', '/pages/index/index')
return
}
},
@ -79,7 +79,7 @@
this.$http.req('api/user/checkin', obj, 'POST').then(data => {
//
//
if(data == -1) return
this.$nav.navToPath('/pages/prebook_list/prebook_list')
}).catch(err => {

12
中医针灸改版2.0_2025_03_06/需求拆分.txt

@ -1,23 +1,23 @@
中医针灸患者端静态页面及样式改造
1.首页调整
(1)首页医院地址导航在小程序中打开样式
(2)增加就诊须知折叠面板
(2)增加预约须知折叠面板
(3)增加医保定点标签
(4)出诊医院列表样式调整
2.底部公共菜单增加“现场报道”入口
3.首页医院列表部分样式调整
4.选择就诊人列表页面调整
4.选择预约人列表页面调整
进行中
4.新增就诊人页面样式改造
4.新增预约人页面样式改造
5.扫码报道页面
6.确认报道页面
7.确认报道空页面
8.候诊方式页面
9.个人中心页面样式改造
11.就诊人列表页面
12.就诊记录页面
13.就诊详情页面样式改造
11.预约人列表页面
12.预约记录页面
13.预约详情页面样式改造
14.候诊状态,所在床位弹窗
1.首页医院地址导航在小程序中打开调整

14
针灸挂号系统功能拆分.txt

@ -14,23 +14,23 @@
2.用户端首页样式调整
已完成
1.挂号就诊人页面
2.新增就诊人信息页面
1.挂号预约人页面
2.新增预约人信息页面
已完成
1.针灸挂号系统选择就诊人页面
2.修改就诊人信息页面
3.就诊人信息页面
1.针灸挂号系统选择预约人页面
2.修改预约人信息页面
3.预约人信息页面
待完成
一、患者端 静态页面
2.就诊人预约挂号页面
2.预约人预约挂号页面
预计完成 2024-03-11 09:30~2024-03-11 19:00
3.个人中心页面
4.修改个人资料页面
预计完成 2024-03-12 09:30~2024-03-12 19:00
5.就诊人列表页面
5.预约人列表页面
预计完成 2024-03-13 09:30~2024-03-13 19:00
6.预约列表页面

Loading…
Cancel
Save