Skip to content

F
frontend-h5
Commit 41715179 authored by gengchunlei's avatar gengchunlei
Browse files
Options

Merge branch 'chronic-master' of… 

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

 Conflicts:
	src/residentWX/visit/detail/components/HypertensionDetail.vue
	vue.config.js
parents 133b0ee5 b48b78a5
chronic-master-his-1.2.1 chronic-dev chronic-master chronic-master-his-1.1
1 merge request!1Chronic dev
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 26 deletions
src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
View file @ 41715179
......@@ -192,7 +192,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -256,7 +264,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="10" title="用药情况" name="10">
<template #right-icon>
......@@ -293,14 +301,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -310,6 +322,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="13" title="下次随访日期" name="13">
<template #right-icon>
......
src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
View file @ 41715179
......@@ -192,7 +192,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -256,7 +264,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="10" title="用药情况" name="10">
<template #right-icon>
......@@ -293,14 +301,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -310,6 +322,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="13" title="下次随访日期" name="13">
<template #right-icon>
......
src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
View file @ 41715179
......@@ -192,7 +192,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -256,7 +264,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="10" title="用药情况" name="10">
<template #right-icon>
......@@ -293,14 +301,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -310,6 +322,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="13" title="下次随访日期" name="13">
<template #right-icon>
......
src/residentWX/visit/detail/components/CopdDetail.vue
View file @ 41715179
......@@ -190,7 +190,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -254,7 +262,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="10" title="用药情况" name="10">
<template #right-icon>
......@@ -291,14 +299,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -308,6 +320,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="13" title="下次随访日期" name="13">
<template #right-icon>
......
src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
View file @ 41715179
......@@ -192,7 +192,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -256,7 +264,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="10" title="用药情况" name="10">
<template #right-icon>
......@@ -293,14 +301,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -310,6 +322,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="13" title="下次随访日期" name="13">
<template #right-icon>
......
src/residentWX/visit/detail/components/DiabetesDetail.vue
View file @ 41715179
......@@ -219,7 +219,15 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">目前诊断</span>
<span class="text-end">
{{ info.currentDiagnosisName || '-' }}
</span>
</div>
</div>
<!-- <div v-for="(x, xIndex) in info.diagnoseInfoList" :key="xIndex">
<div style="color: #262626">
{{ (store.getDict('CP00086').find(e => e.value === x.currentDiagnoseType)).name }}
</div>
......@@ -283,7 +291,7 @@
</div>
</div>
</div>
</div>
</div> -->
</van-collapse-item>
<van-collapse-item key="11" title="用药情况" name="11">
<template #right-icon>
......@@ -341,14 +349,18 @@
</template>
<div class="list">
<div class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊</span>
<span class="text-end">{{ info.isReferralName }}</span>
</div>
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊原因</span>
<span class="text-end">{{ info.referralReason }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊机构</span>
<span class="text-end">{{ info.referralUnitName }}</span>
</div>
<div class="flex justify-between py-1 border-bottom item">
<div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
<span class="shrink-0 mr-2 label">转诊科室</span>
<span class="text-end">{{ info.referralOfficeName }}</span>
</div>
......@@ -358,6 +370,11 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
<div v-for="(url, index) in info.visitImageList" :key="index" >
<img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
</div>
</div>
</van-collapse-item>
<van-collapse-item key="14" title="下次随访日期" name="14">
<template #right-icon>
......@@ -485,7 +502,6 @@ export default {
this.medicateCase = JSON.parse(medicateCase)
// 胰岛素用量处理
this.insulinDosage = JSON.parse(insulinDosage)
console.log(2, form)
},
// 全部展开、收起
toggleAll() {
......@@ -522,7 +538,6 @@ export default {
watch: {
visitInfo: {
handler() {
console.log(1, this.visitInfo)
this.dataHandle()
}
}
......
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