Skip to content

F
frontend-h5
Commit 67563129 authored by songrui's avatar songrui
Browse files
Options

疾病列表无限加载bug修复；诊断详情跳转

parent f914ca9f
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 25 deletions
src/doctor/Doctor.vue
View file @ 67563129
......@@ -57,7 +57,7 @@ export default {
if (!token) {
token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') {
token = '6584f8d8-5d17-4bbd-917e-2bd1ac8a1cf3'
token = '10757dc5-8d19-4f8e-9c66-ea55fcc45844'
}
}
if (token) {
......
src/doctor/diagnose/form/DiagnoseForm.vue
View file @ 67563129
<template>
<div class="h-full flex flex-col diagnose-form">
<DocNavBar title="新增慢病诊断" class="shrink-0"></DocNavBar>
<DocNavBar :title="`${id ? '修改' : '新增'}慢病诊断`" class="shrink-0"></DocNavBar>
</div>
</template>
......@@ -10,6 +10,17 @@ import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
export default {
components: {
DocNavBar
},
computed: {
id() {
return this.$route.query.id
},
diseaseType() {
return this.$route.query.diseaseType
},
residentInfoId() {
return this.$route.query.residentInfoId
}
}
}
</script>
......
src/doctor/patientDetail/PatientDetail.vue
View file @ 67563129
......@@ -66,7 +66,8 @@
<GeneralList v-else-if="activeTabItem.id === 'CURRENCY'"/>
<ReferralList v-else-if="activeTabItem.id === 'REFERRAL'"/>
<ConsultationList v-else-if="activeTabItem.id === 'CONSULTATION'"/>
<DiseaseList v-else :diseaseName="activeTabItem.name" :diseaseType="activeTabItem.value"/>
<DiseaseList v-else :key="activeTabItem.value" :diseaseName="activeTabItem.name"
:diseaseType="activeTabItem.value"/>
</div>
<van-popup
v-model:show="addVisible"
......
src/doctor/patientDetail/components/disease/List.vue
View file @ 67563129
......@@ -38,14 +38,14 @@
<span class="label">纳入管理日期</span>
<span>{{ item.manageDate }}</span>
</div>
<!-- <div class="divider"></div>
<div class="divider my-2"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
v-if="item.allowUpdate == 1">修改</van-button>
<van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
v-if="item.allowDelete ==1">删除</van-button>
</div> -->
</div>
</div>
</div>
<div v-for="item in treatmentRecord" :key="item.id"
......@@ -185,13 +185,27 @@ export default {
})
},
onRefresh() {
this.load()
this.load(false)
},
toDetail() {
toDetail(record) {
this.$router.push({
path: '/doctor/diagnose/detail',
query: {
residentInfoId: this.residentInfoId,
diseaseType: this.diseaseType,
id: record.id
}
})
},
editBtn() {
editBtn(record) {
this.$router.push({
path: '/doctor/diagnose/form',
query: {
residentInfoId: this.residentInfoId,
diseaseType: this.diseaseType,
id: record.id
}
})
},
delBtn() {
......
src/doctor/patientDetail/components/disease/Visit.vue
View file @ 67563129
......@@ -136,7 +136,7 @@ export default {
},
onRefresh() {
this.pagination.pageIndex = 1
this.load()
this.load(false)
},
toDetail(record) {
if (!record) return
......
src/doctor/patientDetail/components/screening/Record.vue
View file @ 67563129
......@@ -36,14 +36,14 @@
<span>{{ item.created }}</span>
</div>
</div>
<!-- <div class="divider"></div>
<div class="divider my-3"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary" @click="toFirstDetail(item)">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
<van-button round size="small" class="doc-btn-primary" @click="editFirstBtn(item)"
v-if="item.allowUpdate == 1">修改</van-button>
<van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
<van-button round size="small" class="doc-btn-red" @click="delFirstBtn(item)"
v-if="item.allowDelete ==1">删除</van-button>
</div> -->
</div>
</div>
</div>
<div v-for="item in secondScreenList" :key="item.id"
......@@ -80,14 +80,14 @@
<span>{{ item.created }}</span>
</div>
</div>
<!-- <div class="divider"></div>
<div class="divider my-3"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary" @click="toSecondDetail(item)">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
<van-button round size="small" class="doc-btn-primary" @click='editSecondBtn(item)'
v-if="item.allowUpdate == 1">修改</van-button>
<van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
<van-button round size="small" class="doc-btn-red" @click="delSecondBtn(item)"
v-if="item.allowUpdate == 1">删除</van-button>
</div> -->
</div>
</div>
</div>
</van-pull-refresh>
......@@ -173,10 +173,22 @@ export default {
}
})
},
editBtn() {
editFirstBtn(record) {
this.$router.push({
path: '/doctor/screening/firstForm',
query: { residentInfoId: this.residentInfoId, id:record.id }
})
},
delFirstBtn(record) {
},
delBtn() {
editSecondBtn(record) {
this.$router.push({
path: '/doctor/screening/secondForm',
query: { residentInfoId: this.residentInfoId, id:record.id }
})
},
delSecondBtn(record) {
}
},
......
src/doctor/screening/first/FristForm.vue
View file @ 67563129
<template>
<div class="h-full flex flex-col screening-first">
<DocNavBar title="新增主要慢病高危筛查" class="shrink-0"></DocNavBar>
<DocNavBar :title="`${id ? '修改' : '新增'}主要慢病高危筛查`" class="shrink-0"></DocNavBar>
</div>
</template>
......@@ -10,6 +10,14 @@ import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
export default {
components: {
DocNavBar
},
computed: {
id() {
return this.$route.query.id
},
residentInfoId() {
return this.$route.query.residentInfoId
}
}
}
</script>
......
src/doctor/screening/second/SecondForm.vue
View file @ 67563129
<template>
<div class="h-full flex flex-col screening-second">
<DocNavBar title="新增专病高危筛查" class="shrink-0"></DocNavBar>
<DocNavBar :title="`${id ? '修改' : '新增'}专病高危筛查`" class="shrink-0"></DocNavBar>
</div>
</template>
......@@ -10,6 +10,14 @@ import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
export default {
components: {
DocNavBar
},
computed: {
id() {
return this.$route.query.id
},
residentInfoId() {
return this.$route.query.residentInfoId
}
}
}
</script>
......
src/doctor/workbench/tables/FirstScreen.vue
View file @ 67563129
......@@ -42,7 +42,7 @@
<div class="divider my-3"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">复筛</van-button>
<van-button round size="small" class="doc-btn-primary" @click="toScreen(item)">复筛</van-button>
<van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
</div>
</div>
......@@ -230,6 +230,18 @@ export default {
}
})
},
toScreen(record) {
if (record.residentInfoId == null) {
showToast('暂时无法进行筛查')
return
}
this.$router.push({
path: '/doctor/screening/secondForm',
query: {
residentInfoId: record.residentInfoId
}
})
},
onIgnore(record) {
let params={
relationId:record.screenId,
......
src/doctor/workbench/tables/HighRisk.vue
View file @ 67563129
......@@ -46,7 +46,7 @@
<div class="divider my-3"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click='toDetail(item)'>诊断</van-button>
<van-button round size="small" class="doc-btn-primary" @click='toDiagnose(item)'>诊断</van-button>
<van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
</div>
</div>
......@@ -260,6 +260,19 @@ export default {
}
})
},
toDiagnose(record) {
if (record.residentInfoId == null) {
showToast('暂时无法进行诊断')
return
}
this.$router.push({
path: '/doctor/screening/secondForm',
query: {
residentInfoId: record.residentInfoId,
diseaseType: record.diseaseType
}
})
},
onIgnore(record) {
let params={
relationId: record.screenId,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment