Skip to content

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

Merge branch 'chronic-dev' into chronic-master

parents c8a931e6 da4f6ce2
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 12 deletions
src/doctor/Doctor.vue
View file @ d106588c
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
if (!token) { if (!token) {
token = sessionStorage.getItem('token') token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
token = 'e0356b6a-7cfd-4b83-8cc8-9951205ac990' token = 'd0aa6147-b760-42b5-8871-91db55687b99'
} }
} }
if (token) { if (token) {
......
src/doctor/screening/second/FormCont.vue
View file @ d106588c
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.mediumStrength' <van-radio-group v-model='form.mediumStrength'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group'> class='w-full doc-radio-group'>
<van-radio v-for="item in store.getDict('CP00120')" <van-radio v-for="item in store.getDict('CP00120')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -517,7 +517,7 @@ ...@@ -517,7 +517,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.drinkFrequency' <van-radio-group v-model='form.drinkFrequency'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group-now' class='w-full doc-radio-group-now'
@change='drinkFrequencyChange' @change='drinkFrequencyChange'
> >
...@@ -535,10 +535,23 @@ ...@@ -535,10 +535,23 @@
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0;background: #F5F5F5' style='padding: 0;background: #F5F5F5'
name='drinkKind'
:rules='rules.drinkKind' :rules='rules.drinkKind'
> >
<template #input> <template #input>
<div class='flex justify-between gap-x-2.5 w-full' style='background: #F5F5F5'> <div class='flex justify-between gap-x-2.5 w-full' style='background: #F5F5F5'>
<div style='display: none'>
<van-checkbox-group v-model='form.drinkKind'
direction='horizontal'
shape='dot'
class='w-full doc-radio-group-now'
>
<van-checkbox v-for="item in store.getDict('CP00133')"
:key='item.value' :name='item.value'
label-position='left'>{{ item.name }}
</van-checkbox>
</van-checkbox-group>
</div>
<div v-for="(item, index) in store.getDict('CP00133')" :key='item.value' class='bg-ff'> <div v-for="(item, index) in store.getDict('CP00133')" :key='item.value' class='bg-ff'>
<div <div
@click='toggleDrink(item)' @click='toggleDrink(item)'
...@@ -551,7 +564,7 @@ ...@@ -551,7 +564,7 @@
</div> </div>
</template> </template>
</van-field> </van-field>
<div class='mt-2' v-if='form?.drinkKind?.includes(99)'> <div class='mt-2' v-if='form.drinkKind?.includes(99)'>
<van-field <van-field
v-model='form.drinkKindOther' v-model='form.drinkKindOther'
clear-icon clear-icon
...@@ -626,7 +639,7 @@ ...@@ -626,7 +639,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.giveDrink' <van-radio-group v-model='form.giveDrink'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group-now' class='w-full doc-radio-group-now'
style='background: #F5F5F5' style='background: #F5F5F5'
> >
...@@ -669,7 +682,7 @@ ...@@ -669,7 +682,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.isSmoking' <van-radio-group v-model='form.isSmoking'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group-now' class='w-full doc-radio-group-now'
> >
<van-radio v-for="item in store.getDict('CP00162')" <van-radio v-for="item in store.getDict('CP00162')"
...@@ -734,7 +747,7 @@ ...@@ -734,7 +747,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.secondSmoking' <van-radio-group v-model='form.secondSmoking'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group-now' class='w-full doc-radio-group-now'
style='background: #F5F5F5' style='background: #F5F5F5'
> >
...@@ -757,7 +770,7 @@ ...@@ -757,7 +770,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.blackSpinySkin' <van-radio-group v-model='form.blackSpinySkin'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group'> class='w-full doc-radio-group'>
<van-radio v-for="item in store.getDict('CP00134')" <van-radio v-for="item in store.getDict('CP00134')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -777,7 +790,7 @@ ...@@ -777,7 +790,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.mentalTension' <van-radio-group v-model='form.mentalTension'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group'> class='w-full doc-radio-group'>
<van-radio v-for="item in store.getDict('CP00135')" <van-radio v-for="item in store.getDict('CP00135')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -797,7 +810,7 @@ ...@@ -797,7 +810,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.xanthoma' <van-radio-group v-model='form.xanthoma'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group'> class='w-full doc-radio-group'>
<van-radio v-for="item in store.getDict('CP00135')" <van-radio v-for="item in store.getDict('CP00135')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -817,7 +830,7 @@ ...@@ -817,7 +830,7 @@
<template #input> <template #input>
<van-radio-group v-model='form.tendoIncrassation' <van-radio-group v-model='form.tendoIncrassation'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group'> class='w-full doc-radio-group'>
<van-radio v-for="item in store.getDict('CP00120')" <van-radio v-for="item in store.getDict('CP00120')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -837,7 +850,7 @@ ...@@ -837,7 +850,7 @@
<template #input> <template #input>
<van-radio-group v-model='riskScoreInfo' <van-radio-group v-model='riskScoreInfo'
direction='horizontal' direction='horizontal'
shape="dot" shape='dot'
class='w-full doc-radio-group' @change='changeRiskScoreInfo'> class='w-full doc-radio-group' @change='changeRiskScoreInfo'>
<van-radio v-for="item in store.getDict('CP00136')" <van-radio v-for="item in store.getDict('CP00136')"
:key='item.value' :name='item.value' :key='item.value' :name='item.value'
...@@ -1609,6 +1622,7 @@ export default { ...@@ -1609,6 +1622,7 @@ export default {
}, 0) }, 0)
this.imageData = this.info.informedConsentUrl this.imageData = this.info.informedConsentUrl
console.log(this.form)
}, },
//表单触发事件 //表单触发事件
formChangeHandle() { formChangeHandle() {
...@@ -2469,6 +2483,7 @@ export default { ...@@ -2469,6 +2483,7 @@ export default {
this.form.drinkKind.push(val.value) this.form.drinkKind.push(val.value)
} }
this.drinkKindChange(this.form.drinkKind) this.drinkKindChange(this.form.drinkKind)
this.$refs.form.validate('drinkKind').catch(() =>{})
}, },
//专病高危评估结果 //专病高危评估结果
toggleResult(val) { toggleResult(val) {
......
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