diff --git a/src/api/doctor/resident.js b/src/api/doctor/resident.js
index 5edfb6ef3fd6525b9f7922c9dcb2b3e0e609b47a..5257ecd3f758290e70dac1d94444633b10963fc5 100644
--- a/src/api/doctor/resident.js
+++ b/src/api/doctor/resident.js
@@ -2,6 +2,7 @@ import {fetchBase} from '@/api/doctor/doctorFetch'
// 居民档案ID查询居民信息
export function queryResidentInfo(params) {
+ debugger
return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/detailed`, body: params, loading: true })
}
diff --git a/src/residentWX/ResidentWX.vue b/src/residentWX/ResidentWX.vue
index 7151f230f50245882016641c5e9cac456faab9dd..67f4364d503d2382a2acc008cee70926a23c1a9e 100644
--- a/src/residentWX/ResidentWX.vue
+++ b/src/residentWX/ResidentWX.vue
@@ -13,6 +13,8 @@
<script>
import { getDict } from '@/api/base.js'
import { useStore } from './store/index.js'
+import { ref } from 'vue'
+import { queryResidentInfo } from '@/api/doctor/resident'
export default {
data() {
@@ -41,7 +43,13 @@ export default {
},
setup() {
const store = useStore()
- return { store }
+ const baseInfo = ref(null)
+ return { store, baseInfo }
+ },
+ provide() {
+ return {
+ getBaseInfo: () => this.baseInfo
+ }
},
created() {
this.init()
@@ -52,7 +60,17 @@ export default {
const res = await getDict()
this.store.$patch({ dict: res.data || {} })
this.visible = true
- }
+ await this.load()
+ },
+ load() {
+ const query = {
+ residentInfoId: '2020761970'
+ }
+ queryResidentInfo(query).then(res => {
+ debugger
+ this.baseInfo = res.data || {}
+ })
+ },
}
}
</script>
diff --git a/src/residentWX/guide/List.vue b/src/residentWX/guide/List.vue
index 5e0d5e6c9a47adf7668ae552e7fa50e46cd3bd07..a5520b012694e625852e42c59ec9cf4e15589f3f 100644
--- a/src/residentWX/guide/List.vue
+++ b/src/residentWX/guide/List.vue
@@ -78,6 +78,7 @@ export default {
},
onMore() {
+ debugger
this.pagination.pageIndex++
this.load()
},
diff --git a/src/residentWX/visit/List.vue b/src/residentWX/visit/List.vue
index 844bd4be4e2bb5754bb0dceb827535c26b5909a0..2a16a88bcc59042e9eb9fd27ff645ba949de8125 100644
--- a/src/residentWX/visit/List.vue
+++ b/src/residentWX/visit/List.vue
@@ -19,10 +19,10 @@
<div v-for='item in list' :key='item.id' class='p-4 mt-3 card' @click.stop='toDetail(item)'>
<div class='flex items-center'>
<div class='detail-left'>
- 随访情况
+ 慢病类型
</div>
<div class='detail-right'>
- {{ item.visitSituationName }}
+ {{ item.diseaseTypeName }}
</div>
</div>
<div class='mt-3 flex items-center'>
@@ -35,56 +35,39 @@
</div>
<div class='mt-3 flex items-center'>
<div class='detail-left'>
- 随访医生
- </div>
- <div class='detail-right'>
- {{ item.serveDoctorName }}
- </div>
- </div>
- <div class='mt-3 flex items-center'>
- <div class='detail-left'>
- 服务类型
+ 下次随访日期
</div>
<div class='detail-right'>
- {{ item.serveTypeName }}
+ {{ item.nextVisitDate || '-' }}
</div>
</div>
<div class='mt-3 flex items-center'>
<div class='detail-left'>
- 随访机构
+ 随访医生
</div>
<div class='detail-right'>
- {{ item.serveUnitName }}
+ {{ item.serveDoctorName }}
</div>
</div>
<div class='mt-3 flex items-center'>
<div class='detail-left'>
- 下次随访日期
+ 随访方式
</div>
<div class='detail-right'>
- {{ item.nextVisitDate || '-' }}
+ {{ item.serveTypeName }}
</div>
</div>
<div class='mt-3 flex items-center'>
<div class='detail-left'>
- 数据来源
+ 随访机构
</div>
<div class='detail-right'>
- {{ item.sourceName || '-' }}
+ {{ item.serveUnitName }}
</div>
</div>
<van-divider class='mt-3' />
- <div class='flex justify-end'>
- <van-button round type='primary' class='card-bt' style='margin-right: .12rem'
- @click.stop='editBtn(item)' v-show='item.allowUpdate ==1'>修改
- </van-button>
- <van-button round type='primary' class='card-bt' @click.stop='delBtn(item)'
- v-show='item.allowUpdate ==1'>删除
- </van-button>
- </div>
-
<span class='px-3 float-bt'>
通用随访
</span>
@@ -134,6 +117,7 @@ export default {
},
tabList() {
const list = [
+ { title: '全部', name: -1, code: '' },
{ title: '高血压', name: 1, code: '1' },
{ title: '糖尿病', name: 2, code: '2' },
{ title: '冠心病', name: 3, code: '4' },
@@ -146,6 +130,7 @@ export default {
}
},
mounted() {
+ debugger
const list = this.$refs.list
list.addEventListener('scroll', () => {
if (list.scrollTop > 0) {
diff --git a/src/residentWX/visit/detail/CurrencyFUDetail.vue b/src/residentWX/visit/detail/CurrencyFUDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..174aa054d1a0770c6d9747513cfafb11f145a37b
--- /dev/null
+++ b/src/residentWX/visit/detail/CurrencyFUDetail.vue
@@ -0,0 +1,65 @@
+<!--通用随访详情-->
+<template>
+ <div>
+ <van-nav-bar title='随访详情' left-text='' left-arrow @click-left='toBack'></van-nav-bar>
+ <van-collapse v-model='activeNames'>
+ <van-collapse-item title='居民信息' name='1'>
+ 代码是写出来给人看的，附带能在机器上运行。
+ </van-collapse-item>
+ <van-collapse-item title='标题2' name='2'>
+ 技术无非就是那些开发它的人的共同灵魂。
+ </van-collapse-item>
+ <van-collapse-item title='标题3' name='3'>
+ 在代码阅读过程中人们说脏话的频率是衡量代码质量的唯一标准。
+ </van-collapse-item>
+ </van-collapse>
+
+ </div>
+</template>
+
+<script>
+import { showToast } from 'vant'
+import { fetchCurrencyById } from '@/api/doctor/generalFU'
+
+export default {
+ name: 'CurrencyFUDetail.vue',
+ data() {
+ return {
+ activeNames: [],
+ detailInfo: {}
+ }
+ },
+ computed: {
+ routerDetail() {
+ return this.$route.query
+ }
+ },
+ created() {
+ this.load()
+ },
+ methods: {
+ async load() {
+ if (!this.routerDetail.relationId) {
+ showToast('未获取到信息')
+ return
+ }
+ let par = {
+ id: this.routerDetail.relationId
+ }
+ fetchCurrencyById(par).then(res => {
+ let result = res.data || {}
+ this.info = result
+ this.residentInfo = result.residentsRecord || {}
+ }).finally(() => {
+ })
+ },
+ toBack() {
+ this.$router.back()
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index a60a8f0373bd401871236424212ff7f99d2a5ec8..24080506e472a19e458852b5d882ed15bd1dfb07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -108,13 +108,16 @@ const routes = [
name: 'resident-screening-secondDetail',
component: () => import(/* webpackChunkName: "residentWX-screening" */ '@/residentWX/screening/detail/SecondDetail.vue')
},
- },
{
path: 'visit/list',
- name: 'residentWX-visitList',
- component: () => import(/* webpackChunkName: "residentWX-screening" */ '@/residentWX/visit/List.vue')
+ name: 'residentWX-visit-List',
+ component: () => import(/* webpackChunkName: "residentWX-visit" */ '@/residentWX/visit/List.vue')
+ },
+ {
+ path: 'visit/currencyFUDetail/:id',
+ name: 'resident-visit-currencyFUDetail',
+ component: () => import(/* webpackChunkName: "residentWX-screening" */ '@/residentWX/visit/detail/CurrencyFUDetail.vue')
},
-
// 健康指导宣教
{
path: 'guide/list',