Skip to content

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

Merge branch 'chronic-master' of… 

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
parents 74b78bd0 fa6d6da6
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 33 deletions
src/doctor/followUp/List.vue
View file @ 102a3668
...@@ -244,7 +244,9 @@ export default { ...@@ -244,7 +244,9 @@ export default {
color: #607FF0; color: #607FF0;
border: 0px; border: 0px;
line-height: 26px; line-height: 26px;
padding: 4px 8px 4px 8px; height: 26px;
//padding: 4px 8px 4px 8px;
padding: 0px 8px;
} }
.list-data { .list-data {
......
src/doctor/followUp/generalFU/form/BaseInfo.vue
View file @ 102a3668
...@@ -116,11 +116,16 @@ ...@@ -116,11 +116,16 @@
v-model='form.presentCodeName' v-model='form.presentCodeName'
is-link is-link
readonly readonly
style='min-height: 26px!important;'
placeholder='请选择所在地区' placeholder='请选择所在地区'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:rules='rules.presentCodeName' :rules='rules.presentCodeName'
@click='showPresent = true' @click='showPresent = true'
/> >
<template #input>
<span class='text-end'>{{ form.presentCodeName }}</span>
</template>
</van-field>
<van-popup v-model:show='showPresent' :close-on-click-overlay='false' position='bottom'> <van-popup v-model:show='showPresent' :close-on-click-overlay='false' position='bottom'>
<DocAddress v-model:value='form.presentCode' @close='showPresent = false' <DocAddress v-model:value='form.presentCode' @close='showPresent = false'
:viewData='addressRecord.presentCode' :viewData='addressRecord.presentCode'
...@@ -149,7 +154,11 @@ ...@@ -149,7 +154,11 @@
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:rules='rules.registeredCode' :rules='rules.registeredCode'
@click='showRegistered = true' @click='showRegistered = true'
/> >
<template #input>
<span class='text-end'>{{ form.registeredCodeName }}</span>
</template>
</van-field>
<van-popup v-model:show='showRegistered' :close-on-click-overlay='false' position='bottom'> <van-popup v-model:show='showRegistered' :close-on-click-overlay='false' position='bottom'>
<DocAddress v-model:value='form.registeredCode' @close='showRegistered = false' <DocAddress v-model:value='form.registeredCode' @close='showRegistered = false'
:viewData='addressRecord.registeredCode' :viewData='addressRecord.registeredCode'
...@@ -169,20 +178,19 @@ ...@@ -169,20 +178,19 @@
<van-field name='radio' :rules='rules.visitSituation' class='p-12-0'> <van-field name='radio' :rules='rules.visitSituation' class='p-12-0'>
<template #input> <template #input>
<van-radio-group v-model='form.visitSituation' class='w-full' shape='dot'> <van-radio-group v-model='form.visitSituation' class='w-full' shape='dot'>
<van-cell-group>
<van-cell title='在访' clickable @click="form.visitSituation = 1" <van-cell title='在访' clickable @click='form.visitSituation = 1'
class='input-back form-input'> class='input-back form-input'>
<template #right-icon> <template #right-icon>
<van-radio :name='1' /> <van-radio :name='1' />
</template> </template>
</van-cell> </van-cell>
<van-cell title='失访' clickable @click="form.visitSituation = 2" <van-cell title='失访' clickable @click='form.visitSituation = 2'
class='input-back mt-2 form-input'> class='input-back mt-2 form-input'>
<template #right-icon> <template #right-icon>
<van-radio :name='2' /> <van-radio :name='2' />
</template> </template>
</van-cell> </van-cell>
</van-cell-group>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
...@@ -192,20 +200,20 @@ ...@@ -192,20 +200,20 @@
v-if='form.visitSituation == 2'> v-if='form.visitSituation == 2'>
<template #input> <template #input>
<van-radio-group v-model='form.lossReason' class='w-full' shape='dot'> <van-radio-group v-model='form.lossReason' class='w-full' shape='dot'>
<van-cell-group>
<van-cell title='无法联系' clickable @click="form.lossReason = 1" <van-cell title='无法联系' clickable @click='form.lossReason = 1'
class='input-back form-input'> class='input-back form-input'>
<template #right-icon> <template #right-icon>
<van-radio :name='1' /> <van-radio :name='1' />
</template> </template>
</van-cell> </van-cell>
<van-cell title='患者拒绝随访' clickable @click="form.lossReason = 2" <van-cell title='患者拒绝随访' clickable @click='form.lossReason = 2'
class='input-back mt-2 form-input'> class='input-back mt-2 form-input'>
<template #right-icon> <template #right-icon>
<van-radio :name='2' /> <van-radio :name='2' />
</template> </template>
</van-cell> </van-cell>
<van-cell title='死亡' clickable @click="form.lossReason = 3" <van-cell title='死亡' clickable @click='form.lossReason = 3'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.lossReason == 3 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.lossReason == 3 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -222,7 +230,7 @@ ...@@ -222,7 +230,7 @@
/> />
</div> </div>
<van-cell title='其他' clickable @click="form.lossReason = 9" <van-cell title='其他' clickable @click='form.lossReason = 9'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.lossReason == 9 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.lossReason == 9 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -240,7 +248,7 @@ ...@@ -240,7 +248,7 @@
/> />
</div> </div>
</van-cell-group>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
...@@ -249,8 +257,8 @@ ...@@ -249,8 +257,8 @@
<van-field name='radio' :rules='rules.visitWay' class='p-12-0' v-if='form.visitSituation == 1'> <van-field name='radio' :rules='rules.visitWay' class='p-12-0' v-if='form.visitSituation == 1'>
<template #input> <template #input>
<van-radio-group v-model='form.visitWay' class='w-full' shape='dot'> <van-radio-group v-model='form.visitWay' class='w-full' shape='dot'>
<van-cell-group>
<van-cell title='门诊' clickable @click="form.visitWay = 5" <van-cell title='门诊' clickable @click='form.visitWay = 5'
class='input-back form-input' class='input-back form-input'
:style="{borderRadius: form.visitWay == 5 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 5 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -267,7 +275,7 @@ ...@@ -267,7 +275,7 @@
<div @click='toTel' class='tel-label'>点击拨打</div> <div @click='toTel' class='tel-label'>点击拨打</div>
</div> </div>
</div> </div>
<van-cell title='住院' clickable @click="form.visitWay = 6" <van-cell title='住院' clickable @click='form.visitWay = 6'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 6 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 6 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -283,7 +291,7 @@ ...@@ -283,7 +291,7 @@
<div @click='toTel' class='tel-label'>点击拨打</div> <div @click='toTel' class='tel-label'>点击拨打</div>
</div> </div>
</div> </div>
<van-cell title='入户' clickable @click="form.visitWay = 7" <van-cell title='入户' clickable @click='form.visitWay = 7'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 7 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 7 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -299,7 +307,7 @@ ...@@ -299,7 +307,7 @@
<div @click='toTel' class='tel-label'>点击拨打</div> <div @click='toTel' class='tel-label'>点击拨打</div>
</div> </div>
</div> </div>
<van-cell title='电话' clickable @click="form.visitWay = 8" <van-cell title='电话' clickable @click='form.visitWay = 8'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 8 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 8 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -316,7 +324,7 @@ ...@@ -316,7 +324,7 @@
</div> </div>
</div> </div>
<van-cell title='短信（指导）' clickable @click="form.visitWay = 9" <van-cell title='短信（指导）' clickable @click='form.visitWay = 9'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 9 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 9 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -333,7 +341,7 @@ ...@@ -333,7 +341,7 @@
shape='dot'> shape='dot'>
<div class='flex items-center w-full'> <div class='flex items-center w-full'>
<van-cell title='是' clickable <van-cell title='是' clickable
@click="form.isHealthGuide = 1" @click='form.isHealthGuide = 1'
style='flex: 1' style='flex: 1'
class='input-back form-input' class='input-back form-input'
> >
...@@ -342,7 +350,7 @@ ...@@ -342,7 +350,7 @@
</template> </template>
</van-cell> </van-cell>
<van-cell title='否' clickable <van-cell title='否' clickable
@click="form.isHealthGuide = 2" @click='form.isHealthGuide = 2'
style='flex: 1' style='flex: 1'
class='input-back form-input ml-2' class='input-back form-input ml-2'
> >
...@@ -355,7 +363,7 @@ ...@@ -355,7 +363,7 @@
</div> </div>
</div> </div>
<van-cell title='微信（指导）' clickable @click="form.visitWay = 11" <van-cell title='微信（指导）' clickable @click='form.visitWay = 11'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 11 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 11 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -372,7 +380,7 @@ ...@@ -372,7 +380,7 @@
shape='dot'> shape='dot'>
<div class='flex items-center w-full'> <div class='flex items-center w-full'>
<van-cell title='是' clickable <van-cell title='是' clickable
@click="form.isHealthGuide = 1" @click='form.isHealthGuide = 1'
style='flex: 1' style='flex: 1'
class='input-back form-input' class='input-back form-input'
> >
...@@ -381,7 +389,7 @@ ...@@ -381,7 +389,7 @@
</template> </template>
</van-cell> </van-cell>
<van-cell title='否' clickable <van-cell title='否' clickable
@click="form.isHealthGuide = 2" @click='form.isHealthGuide = 2'
style='flex: 1' style='flex: 1'
class='input-back form-input ml-2' class='input-back form-input ml-2'
> >
...@@ -394,7 +402,7 @@ ...@@ -394,7 +402,7 @@
</div> </div>
</div> </div>
<van-cell title='短信（催检）' clickable @click="form.visitWay = 10" <van-cell title='短信（催检）' clickable @click='form.visitWay = 10'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 10 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 10 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -419,7 +427,7 @@ ...@@ -419,7 +427,7 @@
<van-date-picker @confirm='timeConfirm1' @cancel='showBirth = false' /> <van-date-picker @confirm='timeConfirm1' @cancel='showBirth = false' />
</van-popup> </van-popup>
<van-cell title='微信（催检）' clickable @click="form.visitWay = 12" <van-cell title='微信（催检）' clickable @click='form.visitWay = 12'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:style="{borderRadius: form.visitWay == 12 ? '8px 8px 0px 0px ': '8px'}" :style="{borderRadius: form.visitWay == 12 ? '8px 8px 0px 0px ': '8px'}"
> >
...@@ -443,7 +451,7 @@ ...@@ -443,7 +451,7 @@
<van-popup v-model:show='showTime2' position='bottom'> <van-popup v-model:show='showTime2' position='bottom'>
<van-date-picker @confirm='timeConfirm2' @cancel='showBirth = false' /> <van-date-picker @confirm='timeConfirm2' @cancel='showBirth = false' />
</van-popup> </van-popup>
</van-cell-group>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
...@@ -700,8 +708,8 @@ export default { ...@@ -700,8 +708,8 @@ export default {
urgentInsContent: content, urgentInsContent: content,
residentsRecord: { residentsRecord: {
...others, ...others,
id: this.form.personId, id: this.form.personId
}, }
} }
resolve(par) resolve(par)
}).catch((e) => { }).catch((e) => {
...@@ -746,6 +754,7 @@ export default { ...@@ -746,6 +754,7 @@ export default {
.input-back { .input-back {
background: #FAFAFA; background: #FAFAFA;
} }
.input-white { .input-white {
background: #FFFFFF; background: #FFFFFF;
} }
...@@ -756,7 +765,7 @@ export default { ...@@ -756,7 +765,7 @@ export default {
border-radius: 0px 0px 8px 8px; border-radius: 0px 0px 8px 8px;
} }
.death-r{ .death-r {
background: #F5F5F5; background: #F5F5F5;
border-radius: 0px 0px 8px 8px; border-radius: 0px 0px 8px 8px;
padding: 8px 12px; padding: 8px 12px;
...@@ -792,10 +801,12 @@ export default { ...@@ -792,10 +801,12 @@ export default {
:deep(.van-cell:after) { :deep(.van-cell:after) {
border-bottom: 0px; border-bottom: 0px;
} }
:deep(.van-radio__icon--checked.van-radio__icon--dot .van-radio__icon--dot__icon) { :deep(.van-radio__icon--checked.van-radio__icon--dot .van-radio__icon--dot__icon) {
background: #FFFFFF; background: #FFFFFF;
} }
:deep(.van-radio__icon--checked.van-radio__icon--dot) { :deep(.van-radio__icon--checked.van-radio__icon--dot) {
background: var(--van-radio-checked-icon-color); background: var(--van-button-primary-background)
} }
</style> </style>
\ No newline at end of file
src/doctor/resident/form/BaseInfo.vue
View file @ 102a3668
...@@ -124,7 +124,11 @@ ...@@ -124,7 +124,11 @@
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:rules='rules.presentCodeName' :rules='rules.presentCodeName'
@click='showPresent = true' @click='showPresent = true'
/> >
<template #input>
<span class='text-end'>{{ form.presentCodeName }}</span>
</template>
</van-field>
<van-popup v-model:show='showPresent' :close-on-click-overlay='false' position='bottom'> <van-popup v-model:show='showPresent' :close-on-click-overlay='false' position='bottom'>
<DocAddress v-model:value='form.presentCode' @close='showPresent = false' <DocAddress v-model:value='form.presentCode' @close='showPresent = false'
:viewData='addressRecord.presentCode' :viewData='addressRecord.presentCode'
...@@ -153,7 +157,11 @@ ...@@ -153,7 +157,11 @@
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
:rules='rules.registeredCode' :rules='rules.registeredCode'
@click='showRegistered = true' @click='showRegistered = true'
/> >
<template #input>
<span class='text-end'>{{ form.registeredCodeName }}</span>
</template>
</van-field>
<van-popup v-model:show='showRegistered' :close-on-click-overlay='false' position='bottom'> <van-popup v-model:show='showRegistered' :close-on-click-overlay='false' position='bottom'>
<DocAddress v-model:value='form.registeredCode' @close='showRegistered = false' <DocAddress v-model:value='form.registeredCode' @close='showRegistered = false'
:viewData='addressRecord.registeredCode' :viewData='addressRecord.registeredCode'
......
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