Merge branch 'chronic-master' of…

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

src/doctor/followUp/generalFU/form/BaseInfo.vue

@@ -323,13 +323,15 @@
                                 <div @click='toTel' class='tel-label'>点击拨打</div>
                             </div>
                         </div>
-
-                        <van-cell title='短信（指导）' clickable @click='form.visitWay = 9'
+<!--                        @click='form.visitWay = 9'-->
+                        <van-cell title='短信（指导）' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 9 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
+                                <van-radio-group  disabled>
                                 <van-radio :name='9' />
+                                </van-radio-group>
                             </template>
                         </van-cell>
                         <div class='tel-back' v-if='form.visitWay == 9'>
@@ -362,13 +364,15 @@
                                 </van-radio-group>
                             </div>
                         </div>
-
-                        <van-cell title='微信（指导）' clickable @click='form.visitWay = 11'
+<!--                        @click='form.visitWay = 11'-->
+                        <van-cell title='微信（指导）' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 11 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
+                                <van-radio-group  disabled>
                                 <van-radio :name='11' />
+                                </van-radio-group>
                             </template>
                         </van-cell>
                         <div class='tel-back' v-if='form.visitWay == 11'>
@@ -401,13 +405,15 @@
                                 </van-radio-group>
                             </div>
                         </div>
-
-                        <van-cell title='短信（催检）' clickable @click='form.visitWay = 10'
+<!--                        @click='form.visitWay = 10'-->
+                        <van-cell title='短信（催检）' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 10 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
+                                <van-radio-group  disabled>
                                 <van-radio :name='10' />
+                                </van-radio-group>
                             </template>
                         </van-cell>
                         <div class='tel-back' v-if='form.visitWay == 10'>
@@ -426,13 +432,15 @@
                         <van-popup v-model:show='showTime1' position='bottom'>
                             <van-date-picker @confirm='timeConfirm1' @cancel='showBirth = false' />
                         </van-popup>
-
-                        <van-cell title='微信（催检）' clickable @click='form.visitWay = 12'
+<!--                        @click='form.visitWay = 12'-->
+                        <van-cell title='微信（催检）' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 12 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
+                                <van-radio-group  disabled>
                                 <van-radio :name='12' />
+                                </van-radio-group>
                             </template>
                         </van-cell>
                         <div class='tel-back' v-if='form.visitWay == 12'>

src/doctor/resident/form/BaseInfo.vue

@@ -250,6 +250,7 @@ const defaultForm = (info = {}) => {
         workUnit: undefined,
         // 与居民关系
         relation: undefined,
+        relationName: undefined,
         relationOther: undefined
         // 人群
     }