Merge branch 'chronic-master' of…

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

 Conflicts:
	src/residentWX/screening/detail/SecondDetail.vue

src/residentWX/screening/detail/FirstDetail.vue

@@ -107,45 +107,46 @@ export default {
             store: useStore(),
             activeCollapse: [],
             collapseList: [
-                { title: '居民信息', name: '1', columns: [], info: {} },
-                { title: '筛查信息', name: '2', columns: [], info: {} },
-                { title: '筛查机构', name: '3', columns: [], info: {} }
+                { title: '居民信息', name: '1', columns: [
+                    { title: '姓名', key: 'residentName' },
+                    { title: '证件号码', key: 'idCard'},
+                    { title: '性别', key: 'genderName' },
+                    { title: '出生日期', key: 'dataBirth' },
+                    { title: '年龄', key: 'currentAge' },
+                    { title: '民族', key: 'nationalName' },
+                    { title: '本人电话', key: 'telephone' },
+                    { title: '现住址', key: 'presentCodeName' },
+                    { title: '详细地址', key: 'nowAddress' },
+                    { title: '户籍地址', key: 'registeredCodeName' },
+                    { title: '详细地址', key: 'permanentAddress' }
+                ], info: {} },
+                { title: '筛查信息', name: '2', columns: [
+                    { title: '年龄', key: 'currentAge', unit: '岁' },
+                    { title: '既往史', key: 'medicalHistoryName'  },
+                    { title: '身高', key: 'height', unit: 'cm' },
+                    { title: '体重', key: 'weight', unit: 'kg' },
+                    { title: 'BMI', key: 'bmi', unit: 'kg/m²' },
+                    { title: '腰围', key: 'waistline', unit: 'cm' },
+                    { title: '是否吸烟', key: 'isSmokingName'  },
+                    { title: '家族史', key: 'familyHistoryName'  },
+                    { title: '血压值', key: 'pressure' },
+                    { title: '空腹血糖', key: 'fastingGlucose', unit: 'mmol/L' },
+                    { title: '低密度脂蛋白胆固醇', key: 'ldlCholesterin', unit: 'mmol/L' },
+                    { title: '血清总胆固醇', key: 'serumCholesterin', unit: 'mmol/L' },
+                    { title: '高密度脂蛋白胆固醇', key: 'hdlCholesterin', unit: 'mmol/L' },
+                    { title: '运动', key: 'exerciseIntensityName' },
+                    { title: '慢病高危评估结果', key: 'screenResultName'  }
+                ], info: {} },
+                    { title: '筛查机构', name: '3', columns: [
+                    { title: '筛查机构', key: 'screenUnitName' },
+                    { title: '筛查科室', key: 'screenOfficeName' },
+                    { title: '筛查医生', key: 'screenDoctorName' },
+                    { title: '筛查日期', key: 'screenDate' }
+                ], info: {} }
             ],
             // 全部展开、收起
             collapseAll: false,
-            info: {},
-            columnsBase: [
-                { title: '姓名', key: 'residentName' },
-                { title: '证件号码', key: 'idCard'},
-                { title: '性别', key: 'genderName' },
-                { title: '出生日期', key: 'dataBirth' },
-                { title: '年龄', key: 'currentAge' },
-                { title: '民族', key: 'nationalName' },
-                { title: '本人电话', key: 'telephone' },
-                { title: '现住址', key: 'presentCodeName' },
-                { title: '详细地址', key: 'nowAddress' },
-                { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
-            ],
-            columnsScreen: [
-                { title: '年龄', key: 'currentAge', unit: '岁' },
-                { title: '既往史', key: 'medicalHistoryName'  },
-                { title: '身高', key: 'height', unit: 'cm' },
-                { title: '体重', key: 'weight', unit: 'kg' },
-                { title: 'BMI', key: 'bmi', unit: 'kg/m²' },
-                { title: '腰围', key: 'waistline', unit: 'cm' },
-                { title: '是否吸烟', key: 'isSmokingName'  },
-                { title: '家族史', key: 'familyHistoryName'  },
-                { title: '血压值', key: 'pressure' },
-                { title: '空腹血糖', key: 'fastingGlucose', unit: 'mmol/L' },
-                { title: '低密度脂蛋白胆固醇', key: 'ldlCholesterin', unit: 'mmol/L' },
-                { title: '血清总胆固醇', key: 'serumCholesterin', unit: 'mmol/L' },
-                { title: '高密度脂蛋白胆固醇', key: 'hdlCholesterin', unit: 'mmol/L' },
-                { title: '运动', key: 'exerciseIntensityName' },
-                { title: '慢病高危评估结果', key: 'screenResultName'  },
-                { title: '筛查日期', key: 'screenDate' },
-                { title: '筛查机构', key: 'screenUnitName' }
-            ]
+            info: {}
         }
     },
     computed: {
@@ -165,12 +166,11 @@ export default {
     },
     methods: {
         init() {
-            this.collapseList[0].columns = this.columnsBase
             this.collapseList[0].info = this.userInfo
-            this.collapseList[1].columns = this.columnsScreen
             firstScreenDetail({ id: this.id }).then(res => {
                 this.info = res.data || {}
                 this.collapseList[1].info = this.info
+                this.collapseList[2].info = this.info
             })
         },
         onBack() {