Merge branch 'develop' of https://gitlab.suvalue.com/ninglupeng/ShanghaiGongwei into feature/方舱

# Conflicts:
#	src/components/page3.vue

src/components/page3.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: wsq
- * @LastEditTime: 2022-04-13 10:09:44
+ * @LastEditTime: 2022-04-13 10:42:21
  * @Description: 
 -->
 <template>

src/components/page4.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-27 19:43:01
+ * @LastEditTime: 2022-04-02 10:04:49
  * @Description: 
 -->
 <template>
@@ -92,6 +92,29 @@
       ]"
     ></van-field>
 
+    <van-field colon clearable name="gender" label="性别">
+      <template #input>
+        <van-radio-group
+          @change="
+            () => {
+              setLocalStorge('gender');
+              if (gender == '男') {
+                isConceive = '未孕';
+                gestationalWeeks = '';
+                setValue('isConceive', '未孕');
+                setValue('gestationalWeeks', '');
+              }
+            }
+          "
+          v-model="gender"
+          direction="horizontal"
+        >
+          <van-radio name="男">男</van-radio>
+          <van-radio name="女">女</van-radio>
+        </van-radio-group>
+      </template>
+    </van-field>
+
     <van-field
       colon
       clearable
@@ -127,28 +150,6 @@
       @blur="setLocalStorge('age')"
       :rules="[{ required: true, message: '请填写年龄' }]"
     ></van-field>
-    <van-field colon clearable name="gender" label="性别">
-      <template #input>
-        <van-radio-group
-          @change="
-            () => {
-              setLocalStorge('gender');
-              if (gender == '男') {
-                isConceive = '未孕';
-                gestationalWeeks = '';
-                setValue('isConceive', '未孕');
-                setValue('gestationalWeeks', '');
-              }
-            }
-          "
-          v-model="gender"
-          direction="horizontal"
-        >
-          <van-radio name="男">男</van-radio>
-          <van-radio name="女">女</van-radio>
-        </van-radio-group>
-      </template>
-    </van-field>
 
     <van-field
       colon

src/components/page5.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-30 09:16:00
+ * @LastEditTime: 2022-04-08 16:46:34
  * @Description: 
 -->
 <template>
@@ -147,10 +147,10 @@
       label-width="130px"
       name="inHospitalDate"
       :value="inHospitalDate"
-      label="120转运时间"
-      placeholder="点击选择120转运时间"
+      label="120转运时间或者入院时间"
+      placeholder="点击选择120转运时间或者入院时间"
       @click="showInHospitalDate = true"
-      :rules="[{ required: true, message: '请选择120转运时间' }]"
+      :rules="[{ required: true, message: '请选择120转运时间或者入院时间' }]"
     />
 
     <van-popup v-model="showInHospitalDate" position="bottom">
@@ -228,14 +228,16 @@
             }
           "
           v-model="symptom"
+          direction="horizontal"
+          class="symptom"
         >
-          <van-cell-group>
-            <van-cell :key="index" v-for="(item, index) in symptomList">
-              <van-checkbox :name="item.element" shape="square">
+          <!-- <van-cell-group> -->
+          <template v-for="(item, index) in symptomList">
+            <van-checkbox :key="index" :name="item.element" shape="square">
               {{ item.element }}</van-checkbox
             >
-            </van-cell>
-          </van-cell-group>
+          </template>
+          <!-- </van-cell-group> -->
         </van-checkbox-group>
       </template>
     </van-field>
@@ -388,7 +390,7 @@ export default {
       HasSymptom: "否", //有无症状
       symptom: [], //患者症状
       HasCOVIDVaccine: "是",
-      covidVaccine: 0, //接种针数
+      covidVaccine: "", //接种针数
       vaccineType: "", //疫苗公司
       othervaccines: "", //其他疫苗
       vaccineDate: "", //最后一次接种日期
@@ -466,9 +468,9 @@ export default {
     },
 
     setDefDate() {
-      this.unusualDate = formatDate(new Date(), "yyyy-MM-dd"); //核酸检测异常时间
-      this.normalDate = formatDate(new Date(), "yyyy-MM-dd"); //未发生异常时间
-      this.inHospitalDate = formatDate(new Date(), "yyyy-MM-dd"); //120转运时间
+      //   this.unusualDate = formatDate(new Date(), "yyyy-MM-dd"); //核酸检测异常时间
+      //   this.normalDate = formatDate(new Date(), "yyyy-MM-dd"); //未发生异常时间
+      //   this.inHospitalDate = formatDate(new Date(), "yyyy-MM-dd"); //120转运时间
       this.vaccineDate = formatDate(new Date(), "yyyy-MM-dd"); //最后一次接种日期
     },
 
@@ -542,5 +544,12 @@ export default {
 
 <style lang="scss" scoped>
 .page5 {
+  .symptom {
+    .van-checkbox--horizontal {
+      margin-right: 0.32rem;
+      min-width: 35%;
+      margin-bottom: 5%;
+    }
+  }
 }
 </style>