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

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '8d237363-0095-4606-b079-f776a2c0bf35'
+                    token = '2f3d10c8-d036-4a64-82e1-08d122359e94'
                 }
             }
             if (token) {

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

@@ -8,7 +8,7 @@
             placeholder="请选择"
             :rules="rules.diseaseTypeName"
             @click="showDiseaseType = true"
-            class="form-input"
+            class="form-input mb-5"
         />
         <van-popup v-model:show="showDiseaseType" position="bottom">
             <div class="p-4" style="height: 100%">
@@ -30,7 +30,8 @@
             </div>
         </van-popup>
 
-        <div class="label-title mt-5" required>请选择</div>
+        <template v-if="form.diseaseType === 1 || form.diseaseType === 2">
+            <div class="label-title" required>请选择</div>
             <van-field :rules="rules.serveType" style="padding: 0" class="mb-5">
                 <template #input>
                     <van-radio-group
@@ -44,6 +45,7 @@
                     </van-radio-group>
                 </template>
             </van-field>
+        </template>
 
         <ArchiveCommon ref="archive" :info="info"></ArchiveCommon>
     </van-form>

src/doctor/followUp/separateFU/form/FormCont.vue

 <template>
     <div>
-        <HypertensionForm v-if="diseaseType === 1" ref="hypertensionForm"></HypertensionForm>
+        <HypertensionForm v-if="diseaseInfo.diseaseType === 1" ref="hypertensionForm"></HypertensionForm>
+        <DiabetesForm v-if="diseaseType === 2"></DiabetesForm>
     </div>
 </template>
 <script>
 import HypertensionForm from './components/HypertensionForm.vue'
+import DiabetesForm from './components/DiabetesForm.vue'
 import { addHypertensionForm } from '@/api/doctor/separateFU'
 export default {
-    components: { HypertensionForm },
+    components: { HypertensionForm, DiabetesForm },
     props: {
         baseInfo: {
             type: Object,
@@ -20,7 +22,7 @@ export default {
     },
     data() {
         return {
-            diseaseType: 1
+            diseaseType: 2
         }
     },
     computed: {
@@ -36,6 +38,7 @@ export default {
                 residentsRecord: this.baseInfo,
                 ...hypertensionForm,
                 residentInfoId: this.residentInfoId,
+                source: 2
             }
             return await addHypertensionForm(form, true)
         }

src/doctor/followUp/separateFU/form/Index.vue

@@ -25,7 +25,7 @@ export default {
     components: { BaseInfo, FormCont },
     data() {
         return {
-            step: 1,
+            step: 2,
             baseInfo: {},
             diseaseInfo: {}
         }