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

@@ -565,7 +565,16 @@ const defaultForm = (info = {}) => {
         lossReasonOther: undefined,
         visitWay: 5,
         isHealthGuide: 1,
-        screenTime: new dayjs().add(1, 'day').format('YYYY-MM-DD')
+        screenTime: new dayjs().add(1, 'day').format('YYYY-MM-DD'),
+
+        chronicCrowd: undefined,
+        chronicTagsArray: undefined,
+        firstScreenDate: undefined,
+        firstScreenResult: undefined,
+        highTagsArray: undefined,
+        highTags: undefined,
+        latelyDiagnoseDate: undefined,
+        latelyScreenDate:undefined,
     }
     Reflect.ownKeys(form).forEach(key => {
         if (info[key] != undefined) {

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

@@ -58,7 +58,9 @@ export default {
             visitSituation: 1,
             step: 1,
             //第一步提交的表单
-            firstForm: {}
+            firstForm: {},
+            //居民信息
+            residentInfo: {}
         }
     },
     created() {