Skip to content

F
frontend-h5
Commit 9dce5686 authored by 芮自成's avatar 芮自成
Browse files
Options

代码合并

parents 934275ec e1b8c3cf
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 57 deletions
src/components/iframePage/IframePage.vue
View file @ 9dce5686
<template>
<div class="h-full iframe-page">
<iframe :src="iframeSrc" style="border: 0;width: 100%;height: 99%" :key="iframeSrc" v-if="iframeSrc" allowFullscreen>
<div class='h-full iframe-page'>
<div class='p-3 text-black text-center shrink-0 doc-nav-bar'>
<span @click='onBack' class='text-12 back-bt'>
<doc-icon type='doc-left2' />
</span>
<span style='min-height: .16rem;display: inline-block'>{{ pageTitle }}</span>
</div>
<iframe :src='iframeSrc' style='border: 0;width: 100%;height: calc(99% - 50px)' :key='iframeSrc' v-if='iframeSrc'
allowFullscreen>
</iframe>
<div v-else/>
<div v-else />
</div>
</template>
......@@ -11,24 +18,26 @@
export default {
props: {
src: String
src: String,
pageTitle: String
},
data() {
return {
iframeSrc: ''
}
},
// computed:{
// stat(){
// return this.$route.params.stat
// }
// },
/* computed: {
pageTitle() {
return this.$route.query.pageTitle || ''
}
},*/
beforeUnmount() {
this.iframeSrc = ''
},
watch: {
src: {
handler() {
debugger
this.load()
},
immediate: true
......@@ -52,16 +61,33 @@ export default {
},
openIframe(treeCode, menuId) {
let res = ''
res = `${this.src}${this.src?.includes('?') ? '&': '?'}source=MB&menuId=${menuId}`
res = `${this.src}${this.src?.includes('?') ? '&' : '?'}source=MB&menuId=${menuId}`
if (treeCode) {
res = `${this.src}${this.src?.includes('?') ? '&': '?'}treeCode=${treeCode}&unitTreeCode=${treeCode}&source=MB&menuId=${menuId}`
res = `${this.src}${this.src?.includes('?') ? '&' : '?'}treeCode=${treeCode}&unitTreeCode=${treeCode}&source=MB&menuId=${menuId}`
}
this.iframeSrc = res
},
onBack() {
this.$router.back()
}
}
}
</script>
<style lang="less" scoped>
<style lang='less' scoped>
// 顶部导航栏
.doc-nav-bar {
position: relative;
border-bottom: 1px solid #3C3C435C;
font-size: 18px;
font-weight: 600;
.back-bt {
position: absolute;
left: .16rem;
top: 50%;
transform: translateY(-50%);
}
}
</style>
src/doctor/followUp/detail/FollowUpDetail.vue
View file @ 9dce5686
......@@ -15,13 +15,13 @@
<script>
import { getVisitManageVByUuId } from '@/api/doctor/generalFU'
// import GwDetail from '@/doctor/followUp/detail/components/GwDetail'
import CrsVisitDetail from '@/doctor/followUp/detail/components/CrsVisitDetail'
import CurrencyFUDetail from '@/doctor/followUp/generalFU/detail/Detail'
import IframePage from '@/components/iframePage/IframePage'
export default {
name: 'FollowUpDetail',
components: { CurrencyFUDetail, CrsVisitDetail },
components: { IframePage, CurrencyFUDetail, CrsVisitDetail },
props: {
// id: [String, Number],
// residentId: [String, Number],
......@@ -64,7 +64,7 @@ export default {
getVisitManageVByUuId(par).then(res => {
let record = res.data
this.detailInfo = record
this.PhlIsShow(record)
// this.PhlIsShow(record)
this.showFU = this.FUIsShow(record)
this.showCommon = this.GAUIsShow(record)
this.showHis = this.HisIsShow(record)
......@@ -103,19 +103,17 @@ export default {
}
return res
},
//判断是否显示报卡随访
//判断是否显示公卫随访
PhlIsShow(record) {
// let res = false
if (record.source == 4) {
// res = true
this.$router.push({
path: `/systemIframe/doctorGWDetail`,
query: {
src: `https://www.baidu.com/`
src: `https://www.baidu.com/`,
pageTitle: `公卫详情`
}
})
}
// return res
}
}
}
......
src/doctor/patientDetail/components/disease/List.vue
View file @ 9dce5686
......@@ -16,13 +16,13 @@
<span class="label shrink-0">诊断评估</span>
<span class="grow" >{{ item.diagnoseResultValue || '-' }}</span>
</div>
<div>
<span class="label">诊断单位</span>
<span>{{ item.diseaseUnitName }}</span>
<div class="flex">
<span class="label shrink-0">诊断单位</span>
<span class="grow text-wrap">{{ item.diseaseUnitName }}</span>
</div>
<div>
<span class="label">诊断科室</span>
<span>{{ item.diseaseOfficeName }}</span>
<div class="flex">
<span class="label shrink-0">诊断科室</span>
<span class="grow text-wrap">{{ item.diseaseOfficeName }}</span>
</div>
<div>
<span class="label">诊断医生</span>
......
src/doctor/patientDetail/components/disease/Visit.vue
View file @ 9dce5686
<template>
<div class="h-full disease-visit" ref="list">
<div class='h-full disease-visit' ref='list'>
<van-pull-refresh v-model='loadingRefresh' @refresh='onRefresh'
:disabled='isRefreshDisable' style="min-height: 100%">
:disabled='isRefreshDisable' style='min-height: 100%'>
<van-list
v-model:loading='loading'
:finished='finished'
......@@ -9,53 +9,56 @@
:immediate-check='false'
@load='onMore'
>
<div class="flex flex-col">
<div class="flex flex-col gap-y-2.5 py-3 px-4 mb-3 doc-list-card"
v-for='item in list' :key="item.id" @click="toDetail(item)">
<div class='flex flex-col'>
<div class='flex flex-col gap-y-2.5 py-3 px-4 mb-3 doc-list-card'
v-for='item in list' :key='item.id' @click='toDetail(item)'>
<div>
<span class="label">服务类型</span>
<span class='label'>服务类型</span>
<span>{{ item.serveTypeName || '-' }}</span>
</div>
<div>
<span class="label">随访日期</span>
<span class='label'>随访日期</span>
<span>{{ item.serveDate }}</span>
</div>
<div>
<span class="label">随访分类</span>
<span class='label'>随访分类</span>
<span>{{ item.visitTypeName || '-' }}</span>
</div>
<div v-if="item.patientNo">
<span class="label">就诊号</span>
<div v-if='item.patientNo'>
<span class='label'>就诊号</span>
<span>{{ item.patientNo || '-' }}</span>
</div>
<div class="text-ellipsis" v-if="item.diagnose">
<span class="label">诊断</span>
<div class='text-ellipsis' v-if='item.diagnose'>
<span class='label'>诊断</span>
<span>{{ item.diagnose || '-' }}</span>
</div>
<div v-if="item.bloodPressure">
<span class="label">血压</span>
<div v-if='item.bloodPressure'>
<span class='label'>血压</span>
<span>{{ item.bloodPressure || '-' }}</span>
</div>
<div>
<span class="label">数据来源</span>
<span class='label'>数据来源</span>
<span>{{ item.sourceName || '-' }}</span>
</div>
<div>
<span class="label">随访医生</span>
<span class='label'>随访医生</span>
<span>{{ item.serveDoctorName || '-' }}</span>
</div>
<div class="text-ellipsis">
<span class="label">随访机构</span>
<div class='text-ellipsis'>
<span class='label'>随访机构</span>
<span>{{ item.serveUnitName || '-' }}</span>
</div>
<div class="divider"></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" v-if="item.allowUpdate == 1">转诊</van-button>-->
<van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
v-if="!(item.allowUpdate !==1 || item.serveType == 5)">修改</van-button>
<van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
v-if="!(item.allowUpdate !==1 || item.serveType == 5)">删除</van-button>
<div class='divider'></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" v-if="item.allowUpdate == 1">转诊</van-button>-->
<van-button round size='small' class='doc-btn-primary' @click='editBtn(item)'
v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>修改
</van-button>
<van-button round size='small' class='doc-btn-red' @click='delBtn(item)'
v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>删除
</van-button>
</div>
</div>
</div>
......@@ -117,7 +120,7 @@ export default {
// pageIndex: this.pagination.pageIndex,
// pageSize: this.pagination.pageSize,
residentInfoId: this.residentInfoId,
diseaseType: this.diseaseType,
diseaseType: this.diseaseType
}
getVisitManageList(query, loading).then(res => {
if (this.pagination.pageIndex === 1) {
......@@ -148,8 +151,19 @@ export default {
//数据来源为his时展示 `请在医生PC端查看详情`
showConfirmDialog({
message: '请在医生PC端查看详情'
}).then(() => {}).catch((err) => {})
}).then(() => {
}).catch((err) => {
})
} else if (record.source == 4) {
// 判断是否显示公卫随访
this.$router.push({
path: `/systemIframe/doctorGWDetail`,
query: {
src: `https://www.baidu.com/`,
pageTitle: `公卫详情`
}
})
} else {
//随访详情
this.$router.push({
......@@ -157,7 +171,7 @@ export default {
query: {
relationUuid: record.relationUuid,
residentInfoId: this.residentInfoId,
diseaseType: this.diseaseType,
diseaseType: this.diseaseType
}
})
}
......@@ -181,6 +195,6 @@ export default {
}
</script>
<style lang="less" scoped>
<style lang='less' scoped>
</style>
src/router/index.js
View file @ 9dce5686
......@@ -2,7 +2,7 @@ import { createRouter, createWebHashHistory } from 'vue-router'
const doctorIframeConfig = {
component: () => import(/* webpackChunkName: "iframe-page" */'@/components/iframePage/IframePage.vue'),
props: route => ({ src: route.query.src })
props: route => ({ src: route.query.src, pageTitle: route.query.pageTitle })
}
const routes = [
......
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