Skip to content

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

代码合并

parents 4ae21520 c5921380
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 59 deletions
public/index.html
View file @ fcc40b68
......@@ -7,7 +7,7 @@
<link rel='icon' href='<%= BASE_URL %>favicon.ico'>
<title><%= htmlWebpackPlugin.options.title %></title>
<!-- 3.3.4/vconsole.min.js -->
<!-- <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script> -->
<script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>
</head>
<body>
<noscript>
......@@ -79,7 +79,7 @@
<!-- built files will be auto injected -->
</body>
<script>
// var vConsole =new VConsole();
var vConsole =new VConsole();
// console.log('Hello world');
</script>
</html>
src/api/doctor/doctorFetch.js
View file @ fcc40b68
......@@ -34,6 +34,7 @@ export function fetchBase({
backHome()
return
}
let bodys = {...body, source: 2}
return new Promise((resolve, reject) => {
if (loading) {
loadingList++
......@@ -43,7 +44,7 @@ export function fetchBase({
method: method,
url: `${url}`,
params: params,
data: body,
data: bodys,
headers: {
'Authorization': `${token}`,
'Content-Type': contentType
......
src/doctor/deathRecord/form/Index.vue
View file @ fcc40b68
......@@ -104,7 +104,7 @@ export default {
...deathRecordForm
}
saveResidentsDeath(params).then(res => {
this.$message.success('新增成功')
this.store.onRefreshMark()
this.$router.back()
})
......
src/doctor/patientDetail/PatientDetail.vue
View file @ fcc40b68
<template>
<div class="h-full flex flex-col patient-detail">
<DocNavBar title="居民详情" class="shrink-0">
<div class='h-full flex flex-col patient-detail'>
<DocNavBar title='居民详情' class='shrink-0'>
<template #right>
<span class="text-primary" @click="() => addVisible = true">新增</span>
<span class='text-primary' @click='() => addVisible = true' v-if='deathStatus !=9'>新增</span>
<span class='text-primary' @click='toCancelDeath' v-if='deathStatus == 9'>撤销死亡</span>
</template>
</DocNavBar>
<div class="grow flex flex-col" style="background: #f5f5f5;min-height: 0px;">
<div class='grow flex flex-col' style='background: #f5f5f5;min-height: 0px;'>
<div :class="['px-4 pt-4 doc-list-card resident-info shrink-0',
{'resident-info-collapsed': collapsed}]">
<div class="mb-4">
<span class="name mr-2">{{ residentInfo.residentName || '-' }}</span>
<span class="tag mr-2">{{ residentInfo.currentAge || '-' }}岁</span>
<span class="tag mr-2">{{ residentInfo.genderName || '-' }}</span>
<doc-icon type="doc-edit" class="text-primary" @click="toArchivesEdit"/>
<div class='mb-4'>
<span class='name mr-2'>{{ residentInfo.residentName || '-' }}</span>
<span class='tag mr-2'>{{ residentInfo.currentAge || '-' }}岁</span>
<span class='tag mr-2'>{{ residentInfo.genderName || '-' }}</span>
<span :class="[deathStatus == 9 ? 'tag-red' : 'tag' ,'mr-2']"
@click='toDeath'>{{ deathStatus == 9 ? '死亡' : '存活' }}</span>
<doc-icon type='doc-edit' class='text-primary' @click='toArchivesEdit' v-if='deathStatus !=9' />
<!-- <van-icon class="text-red" name="share" v-if='deathStatus ==9' @click='toCancelDeath'/>-->
</div>
<div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;">
<div class='flex flex-col' style='row-gap: .04rem;line-height: 1.5;'>
<div>
<span class="label">身份证号</span>
<span class='label'>身份证号</span>
<span>{{ $idCardHide(residentInfo.idCard) || '-' }}</span>
</div>
<div class="flex">
<span class="label shrink-0">人群标签</span>
<span class="grow text-wrap">{{ residentInfo.groupsArraysName || '-' }}</span>
<div class='flex'>
<span class='label shrink-0'>人群标签</span>
<span class='grow text-wrap'>{{ residentInfo.groupsArraysName || '-' }}</span>
</div>
<div>
<span class="label">联系电话</span>
<span class='label'>联系电话</span>
<span>{{ $phoneHide(residentInfo.telephone) || '-' }}</span>
</div>
<!-- <div>
......@@ -38,52 +42,52 @@
</span>
</div> -->
<div>
<span class="label">建档状态</span>
<span v-if="residentInfo.id">
<span v-if="!!residentInfo.residentsBaseDTO">已建档</span>
<span v-else style="color: #8C8C8C">未建档</span>
<span class='label'>建档状态</span>
<span v-if='residentInfo.id'>
<span v-if='!!residentInfo.residentsBaseDTO'>已建档</span>
<span v-else style='color: #8C8C8C'>未建档</span>
</span>
</div>
<div>
<span class="label">签约状态</span>
<span v-if="residentInfo.id">
<span v-if="!!residentInfo.signedInfoDTO">已签约</span>
<span v-else style="color: #8C8C8C">未签约</span>
<span class='label'>签约状态</span>
<span v-if='residentInfo.id'>
<span v-if='!!residentInfo.signedInfoDTO'>已签约</span>
<span v-else style='color: #8C8C8C'>未签约</span>
</span>
</div>
</div>
<div :class="['text-center py-1 fold-btn', { 'fold-btn-collapsed': collapsed }]"
@click="() => collapsed = !collapsed">
<doc-icon type="doc-left-1" />
@click='() => collapsed = !collapsed'>
<doc-icon type='doc-left-1' />
</div>
</div>
<van-tabs shrink v-model:active="activeTab" class="shrink-0 patient-detail-tabs">
<van-tab v-for="item in tabList" :key="item.id"
:title="item.name"></van-tab>
<van-tabs shrink v-model:active='activeTab' class='shrink-0 patient-detail-tabs'>
<van-tab v-for='item in tabList' :key='item.id'
:title='item.name'></van-tab>
</van-tabs>
<div class="grow py-3 px-2" style="min-height: 0px;" v-if="residentInfo.id">
<ScreeningList v-if="activeTabItem.id === 'SCREENING'"/>
<GeneralList v-else-if="activeTabItem.id === 'CURRENCY'"/>
<ReferralList v-else-if="activeTabItem.id === 'REFERRAL'"/>
<ConsultationList v-else-if="activeTabItem.id === 'CONSULTATION'"/>
<DiseaseList v-else :key="activeTabItem.value" :diseaseName="activeTabItem.name"
:diseaseType="activeTabItem.value"/>
<div class='grow py-3 px-2' style='min-height: 0px;' v-if='residentInfo.id'>
<ScreeningList v-if="activeTabItem.id === 'SCREENING'" />
<GeneralList v-else-if="activeTabItem.id === 'CURRENCY'" />
<ReferralList v-else-if="activeTabItem.id === 'REFERRAL'" />
<ConsultationList v-else-if="activeTabItem.id === 'CONSULTATION'" />
<DiseaseList v-else :key='activeTabItem.value' :diseaseName='activeTabItem.name'
:diseaseType='activeTabItem.value' />
</div>
<van-popup
v-model:show="addVisible"
position="bottom"
v-model:show='addVisible'
position='bottom'
>
<div class="popup-bottom-panel">
<div class="p-4 text-16 flex items-center justify-between"
style="border-bottom: 1px solid #00000019;">
<span class="left" @click="addVisible = false">取消</span>
<span class="font-semibold">请选择</span>
<span class="right" style="width: .32rem;"></span>
<div class='popup-bottom-panel'>
<div class='p-4 text-16 flex items-center justify-between'
style='border-bottom: 1px solid #00000019;'>
<span class='left' @click='addVisible = false'>取消</span>
<span class='font-semibold'>请选择</span>
<span class='right' style='width: .32rem;'></span>
</div>
<div class="p-4">
<CheckBtn :options="addOptions" activeStyleNone :clearable="false"
@change="onAddChange" column-1 />
<div class="pb-5"></div>
<div class='p-4'>
<CheckBtn :options='addOptions' activeStyleNone :clearable='false'
@change='onAddChange' column-1 />
<div class='pb-5'></div>
</div>
</div>
</van-popup>
......@@ -94,7 +98,7 @@
<script>
import { useStore } from '@/doctor/store'
import { queryResidentInfo } from '@/api/doctor/resident.js'
import { showNotify } from 'vant'
import { showConfirmDialog, showNotify } from 'vant'
import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
......@@ -103,6 +107,8 @@ import GeneralList from './components/generalFU/List.vue'
import ReferralList from './components/referral/List.vue'
import ConsultationList from './components/consultation/List.vue'
import DiseaseList from './components/disease/Index.vue'
import { deleteFirstScreening } from '@/api/doctor/screening'
import { saveResidentsDeath } from '@/api/doctor/death'
export default {
......@@ -134,7 +140,7 @@ export default {
{ name: '新增慢病诊断', value: 3, path: '/doctor/diagnose/form' },
{ name: '新增通用随访', value: 4, path: '/doctor/followUp/generalFU/add' },
{ name: '新增死亡记录', value: 5, path: '/doctor/deathRecord/add' },
{ name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' },
// { name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' },
{ name: '新增专病随访', value: 7, path: '/doctor/followUp/separateFU/add' }
]
}
......@@ -161,7 +167,7 @@ export default {
const result = [
{ name: '筛查管理', id: 'SCREENING' },
...this.diagnoseList,
{ name: '通用随访', id: 'CURRENCY' },
{ name: '通用随访', id: 'CURRENCY' }
// { name: '转诊记录', id: 'REFERRAL' },
// { name: '会诊记录', id: 'CONSULTATION' }
]
......@@ -221,6 +227,34 @@ export default {
path: '/doctor/archives-form',
query: { residentInfoId: this.residentInfoId }
})
},
//死亡详情
toDeath() {
if (this.deathStatus != 9) return
this.$router.push({
path: '/doctor/deathRecord/detail',
query: { residentInfoId: this.residentInfoId }
})
},
//撤销死亡
toCancelDeath() {
showConfirmDialog({
message: '确定要撤销死亡吗？'
}).then(() => {
const query = {
residentInfoId: this.residentInfoId,
// operateType=1 新增死亡 3-撤销删除
operateType: 3,
}
saveResidentsDeath(query).then(res => {
if (res.code == 'SUCCESS') {
showNotify({ type: 'success', message: '撤销成功' });
this.store.onRefreshMark()
}
})
}).catch((err) => {
console.warn('death', err)
})
}
},
watch: {
......@@ -236,7 +270,7 @@ export default {
}
</script>
<style lang="less" scoped>
<style lang='less' scoped>
.resident-info {
position: relative;
overflow: hidden;
......@@ -245,9 +279,11 @@ export default {
// transition: height .2s;
padding-bottom: 28px;
}
.resident-info-collapsed {
height: 100px;
}
.fold-btn {
color: #BFBFBF;
background: #fff;
......@@ -256,23 +292,46 @@ export default {
left: 16px;
right: 16px;
border-bottom: 1px solid #00000019;
.svg-icon {
transform: rotate(90deg);
}
}
.fold-btn-collapsed {
.svg-icon {
transform: rotate(-90deg);
}
}
.tag-red {
background: #FFF3F0;
color: #FF4D4F;
padding: 4px 8px;
border-radius: 8px;
font-size: 12px;
line-height: 1;
}
.tag-blue {
background: #F0F3FF;
color: var(--van-primary-color);
padding: 4px 8px;
border-radius: 8px;
font-size: 12px;
line-height: 1;
}
:deep(.patient-detail-tabs) {
.van-tab {
color: #262626;
}
.van-tab--active {
color: var(--van-tab-active-text-color);
font-weight: 500;
}
.van-tabs__line {
width: 28px;
height: 2px;
......
vue.config.js
View file @ fcc40b68
......@@ -30,12 +30,12 @@ module.exports = defineConfig({
}
},
'/chronic-admin': {
target: 'https://beta-tumour.zmnyjk.com',
// target: 'http://192.168.1.125:8900',
// target: 'https://beta-tumour.zmnyjk.com',
target: 'http://192.168.1.126:8900',
changOrigin: true,
pathRewrite: {
// '^/chronic-admin': '/'
'^/chronic-admin': '/chronic-admin'
'^/chronic-admin': '/'
// '^/chronic-admin': '/chronic-admin'
}
},
'/chronic-resident': {
......
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