1.去除过敏史空格

2.添加其他职业

src/components/index.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: wsq
- * @LastEditTime: 2022-03-30 12:23:58
+ * @LastEditTime: 2022-04-21 11:02:35
  * @Description: 
 -->
 <template>
@@ -138,18 +138,27 @@ export default {
             "patientName", //患者姓名
             "nationality", //国籍
             "passportId", //护照号
+            "HasSymptom", //是否有症状
+            "otherSymptom", //其他症状
+            "otherOccupation", //其他职业
             "age", //年龄
+            "gender", //性别
             "height", //身高
             "weight", //体重
+            "maritalStatus", //婚姻状况
             "birthday", //出生日期
+            "isConceive", //怀孕状况
             "gestationalWeeks", //怀孕周期
             "occupation", //职业
             "contactInformation", //联系方式
             "FamilyMembersPhone", //家属联系方式
             "Registeredresidence", //籍贯 （包括省市）
-            "address",
-            "idCard",
+            "province", //籍贯 （省）
+            "city", //籍贯 （市）
+            "address", //地址
+            "idCard", //身份证号
             "typeOfMedicalInsurance", //医保类型
+            "insurance", //商业保险
           ])
           .then(() => {
             this.$store.dispatch("user/setpage", 5);
@@ -172,15 +181,20 @@ export default {
         //   vaccineDate: "", //最后一次接种日期
         this.$refs.vantform
           .validate([
-            "LeaveShangHai", //多少天未出上海
+            "HasOnlineClass", //是否上网课
+            "purpose", // 来沪目的
+            "thirtyDays", //近三十天内无离开上海
+            "LeaveShangHai", //回上海天数
             "unusualDate", //核酸检测异常时间
             "normalDate", //未发生异常时间
             "inHospitalDate", //120转运时间
-            "beforeIsolationPoint",
-            "symptom", //患者症状
+            "otherSymptom", //其他症状
+            "vaccineType",
+            "beforeIsolationPoint", //之前隔离点
+            "HasSymptom", //有无症状
+            "hasCOVIDVaccine", //是否接种过疫苗
             "covidVaccine", //接种针数
-            "vaccineType", //疫苗公司
-            "othervaccines", //其他疫苗文本
+            "othervaccines", //其他疫苗
             "vaccineDate", //最后一次接种日期
           ])
           .then(() => {
@@ -205,14 +219,18 @@ export default {
         this.$refs.vantform
           .validate([
             "hasHistoryAllergies", //过敏史
-            // "historyAllergies", //过敏原
+            "historyAllergies", //过敏原
+            "foodAllergy", //食物过敏
+            "drugAllergy", //药物过敏
+            "otherAllergy", //其他过敏
             "hasHistorySurgery", //手术史
             "historySurgery", //具体内容
             "HasPreviousHistory", //有无既往史
             "previousHistory", //既往史
+            "otherPastHistory", //其他既往史
             "tuberculosisDate", //既往史发生时间
+            "yesOrNoCt",
             "ChestCT", //有无CT
-            "otherPastHistory", //其他既往史
             "ChestCTDate", //CT拍照时间
           ])
           .then(() => {

src/components/page4.vue

 <!--
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
- * @LastEditors: ninglupeng
- * @LastEditTime: 2022-04-02 10:04:49
+ * @LastEditors: wsq
+ * @LastEditTime: 2022-04-21 10:54:43
  * @Description: 
 -->
 <template>
@@ -264,6 +264,30 @@
       />
     </van-popup>
 
+
+
+
+ <van-field
+      colon
+      v-show="occupation == '其他'"
+      clearable
+      autosize
+      type="textarea"
+      v-model="otherOccupation"
+      name="otherOccupation"
+      label="其他职业"
+      placeholder="其他职业"
+      :rules="[
+        {
+          required: occupation == '其他' ? true : false,
+          message: '请填写其他职业',
+        },
+      ]"
+      @blur="setLocalStorge('otherOccupation')"
+    ></van-field>
+
+
+
     <van-field
       colon
       clearable
@@ -285,23 +309,6 @@
       :rules="[{ required: true, message: '请填写家属联系方式' }]"
     ></van-field>
 
-    <van-field
-      colon
-      clearable
-      name="workOrNotCovid"
-      label="日常工作是否需要接触新冠病"
-    >
-      <template #input>
-        <van-radio-group
-          @change="setLocalStorge('workOrNotCovid')"
-          v-model="workOrNotCovid"
-          direction="horizontal"
-        >
-          <van-radio name="是">是</van-radio>
-          <van-radio name="否">否</van-radio>
-        </van-radio-group>
-      </template>
-    </van-field>
 
     <van-field
       colon
@@ -401,6 +408,96 @@
         </van-radio-group>
       </template>
     </van-field>
+ <van-field
+  style="margin-left: -35px;"
+      colon
+      clearable
+      name="HasSymptom"
+      label-width="130px"
+      label="是否有症状"
+    >
+      <template #input>
+        <van-radio-group
+          @change="
+            () => {
+              if (HasSymptom == '否') {
+                symptom = [];
+                otherSymptom = '';
+
+                setValue('symptom','');
+                setValue('otherSymptom', '');
+              }
+              setLocalStorge('HasSymptom');
+            }
+          "
+          v-model="HasSymptom"
+          direction="horizontal"
+        >
+          <van-radio name="是">是</van-radio>
+          <van-radio name="否">否</van-radio>
+        </van-radio-group>
+      </template>
+    </van-field>
+
+    <van-field
+     style="margin-left: -35px;"
+      v-if="HasSymptom == '是'"
+      colon
+      :rules="[
+        {
+          required: HasSymptom == '是' ? true : false,
+          message: '请选择症状',
+        },
+      ]"
+      clearable
+      name="symptom"
+      label="症状"
+      label-width="130px"
+    >
+      <template #input>
+        <van-checkbox-group
+          @change="
+            () => {
+              setLocalStorge('symptom');
+            }
+          "
+          v-model="symptom"
+          direction="horizontal"
+          class="symptom"
+        >
+       
+          <template v-for="(item, index) in symptomList">
+            <van-checkbox :key="index" :name="item.element" shape="square">
+              {{ item.element }}</van-checkbox
+            >
+          </template>
+         
+        </van-checkbox-group>
+      </template>
+    </van-field>
+
+    <van-field
+    style="margin-left: 10px;"
+      colon
+      v-if="symptom.includes('其他') && HasSymptom == '是' "
+      clearable
+      autosize
+      type="textarea"
+      v-model="otherSymptom"
+      name="otherSymptom"
+      label="其他症状"
+      placeholder="其他症状"
+      :rules="[
+        {
+          required: symptom.includes('其他') && HasSymptom == '是' ? true : false,
+          message: '请填写其他症状',
+        },
+      ]"
+      @blur="setLocalStorge('otherSymptom')"
+    ></van-field>
+
+
+    
   </div>
 </template>
 
@@ -427,9 +524,10 @@ export default {
       isConceive: "未孕", //怀孕状况
       gestationalWeeks: "", //怀孕周期
       occupation: "", //职业
+      otherOccupation:"",//其他职业
       contactInformation: "", //联系方式
       FamilyMembersPhone: "", //家属联系方式
-      workOrNotCovid: "否",
+      // workOrNotCovid: "否",
       Registeredresidence: "", //籍贯 （包括省市）
       province: "", //籍贯 （省）
       city: "", //籍贯 （市）
@@ -438,6 +536,11 @@ export default {
       typeOfMedicalInsurance: "上海医保", //医保类型
       insurance: "无", //商业保险
 
+        HasSymptom: "否", //有无症状
+      symptom: [], //患者症状
+      otherSymptom: "", //其他症状
+       symptomList: [],//症状列表
+
       areaList, //地址数据选项列表
       showArea: false, //控制地址弹窗
 
@@ -459,10 +562,16 @@ export default {
   },
   methods: {
     setLastValue() {
+       if (this.getLocalStorge("symptom")) {
+        this.symptom = this.getLocalStorge("symptom").split(",");
+      }
       let arr = [
         "patientName", //患者姓名
         "nationality", //国籍
         "passportId", //护照号
+        "HasSymptom",//是否有症状
+         "otherSymptom",//其他症状
+         "otherOccupation",//其他职业
         "age", //年龄
         "gender", //性别
         "height", //身高
@@ -481,6 +590,7 @@ export default {
         "idCard", //身份证号
         "typeOfMedicalInsurance", //医保类型
         "insurance", //商业保险
+       
       ];
 
       arr.map((item) => {
@@ -537,6 +647,9 @@ export default {
         let arr2 = data.filter((item) => {
           return item.category == "职业";
         });
+          this.symptomList = data.filter((item) => {
+          return item.category == "症状";
+        });
 
         this.nationalityList = arr.map((item) => {
           return item.element;
@@ -682,5 +795,12 @@ export default {
 
 <style lang="scss" scoped>
 .page4 {
+   .symptom {
+    .van-checkbox--horizontal {
+      margin-right: 0.32rem;
+      min-width: 35%;
+      margin-bottom: 5%;
+    }
+  }
 }
 </style>

src/components/page5.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: wsq
- * @LastEditTime: 2022-04-19 14:31:00
+ * @LastEditTime: 2022-04-21 10:55:08
  * @Description: 
 -->
 <template>
@@ -45,18 +45,41 @@
       />
     </van-popup>
   
-    <!--  -->
+    <van-field
+      colon
+      clearable
+      name="workOrNotCovid"
+      label="日常工作是否需要接触新冠病"
+    style="margin-left: 40px;"
+    >
+      <template #input>
+        <van-radio-group
+          @change="setLocalStorge('workOrNotCovid')"
+          v-model="workOrNotCovid"
+          direction="horizontal"
+        >
+          <van-radio name="是">是</van-radio>
+          <van-radio name="否">否</van-radio>
+        </van-radio-group>
+      </template>
+    </van-field>
+
+  
+        
 
      <van-field
       colon
       clearable
       name="thirtyDays"
-      label-width="130px"
       label="近两月是否离开过上海"
+      label-width="130px"
+       :rules="[{ required: true, message: '请选择近两月是否离开过上海' }]"
     >
       <template #input>
         <van-radio-group
-          @change="setLocalStorge('thirtyDays')"
+          @change="
+          setLocalStorge('thirtyDays')
+         "
           v-model="thirtyDays"
           direction="horizontal"
         >
@@ -66,6 +89,7 @@
       </template>
     </van-field>
 
+
     <van-field
       v-if="thirtyDays == '是'"
       colon
@@ -85,7 +109,7 @@
         { validator, message: '天数不能大于三十天' },
       ]"
     >
-      <template #extra> 天</template></van-field
+      <template #extra v-if="thirtyDays == '是'"> 天</template></van-field
     >
 
     <van-field
@@ -179,76 +203,12 @@
       :rules="[{ required: true, message: '请填写之前隔离点' }]"
     ></van-field>
 
-    <van-field
-      colon
-      clearable
-      name="HasSymptom"
-      label-width="130px"
-      label="是否有症状"
-    >
-      <template #input>
-        <van-radio-group
-          @change="
-            () => {
-              if (HasSymptom == '否') {
-                symptom = [];
-                setValue('symptom', '');
-              }
-              setLocalStorge('HasSymptom');
-            }
-          "
-          v-model="HasSymptom"
-          direction="horizontal"
-        >
-          <van-radio name="是">是</van-radio>
-          <van-radio name="否">否</van-radio>
-        </van-radio-group>
-      </template>
-    </van-field>
-
-    <van-field
-      v-show="HasSymptom == '是'"
-      colon
-      :rules="[
-        {
-          required: HasSymptom == '是' ? true : false,
-          message: '请选择症状',
-        },
-      ]"
-      clearable
-      name="symptom"
-      label="症状"
-      label-width="130px"
-    >
-      <template #input>
-        <van-checkbox-group
-          @change="
-            () => {
-              setLocalStorge('symptom');
-            }
-          "
-          v-model="symptom"
-          direction="horizontal"
-          class="symptom"
-        >
-          <!-- <van-cell-group> -->
-          <template v-for="(item, index) in symptomList">
-            <van-checkbox :key="index" :name="item.element" shape="square">
-              {{ item.element }}</van-checkbox
-            >
-          </template>
-          <!-- </van-cell-group> -->
-        </van-checkbox-group>
-      </template>
-    </van-field>
-
-    <!-- {{ symptom }} -->
-    <!--  -->
 
     <van-field
+    v-if="hasCOVIDVaccine=='是' || hasCOVIDVaccine=='否'"
       colon
       clearable
-      name="HasCOVIDVaccine"
+      name="hasCOVIDVaccine"
       label-width="130px"
       label="是否接种过疫苗"
     >
@@ -256,9 +216,9 @@
         <van-radio-group
           @change="
             () => {
-              setLocalStorge('HasCOVIDVaccine');
+              setLocalStorge('hasCOVIDVaccine');
 
-              if (HasCOVIDVaccine == '否') {
+              if (hasCOVIDVaccine == '否') {
                 covidVaccine = '';
                 vaccineType = [];
                 othervaccines = '';
@@ -268,7 +228,7 @@
               }
             }
           "
-          v-model="HasCOVIDVaccine"
+          v-model="hasCOVIDVaccine"
           direction="horizontal"
         >
           <van-radio name="是">是</van-radio>
@@ -278,7 +238,7 @@
     </van-field>
 
     <van-field
-      v-if="HasCOVIDVaccine == '是'"
+      v-if="hasCOVIDVaccine == '是'"
       colon
       clearable
       v-model="covidVaccine"
@@ -290,23 +250,21 @@
       @blur="setLocalStorge('covidVaccine')"
       :rules="[{ required: true, message: '请填写接种针数' }]"
     >
-      <template #extra>针</template></van-field
+      <template #extra  v-if="hasCOVIDVaccine == '是'">针</template></van-field
     >
 
     <van-field
-      v-if="HasCOVIDVaccine == '是'"
+      v-if="hasCOVIDVaccine == '是'"
       colon
       clearable
       name="vaccineType"
       label="疫苗公司"
       :rules="[
         {
-          required: HasCOVIDVaccine == '是' ? true : false,
+          required: hasCOVIDVaccine == '是' ? true : false,
           message: '请选择疫苗公司',
         },
       ]"
-     
-     
     >
       <template #input>
         <van-checkbox-group
@@ -318,9 +276,7 @@
               setLocalStorge('vaccineType');
             }
           "
-         
         >
-   
           <template v-for="(item, index) in vaccineTypeList">
             <van-checkbox :key="index" :name="item.element" shape="square">{{
               item.element
@@ -330,13 +286,9 @@
       </template>
     </van-field>
 
-
-
-
-
     <van-field
       colon
-      v-if="vaccineType == '其他'"
+      v-if="vaccineType.includes('其他')"
       clearable
       autosize
       type="textarea"
@@ -346,7 +298,7 @@
       placeholder="其他疫苗"
       :rules="[
         {
-          required: vaccineType == '其他' ? true : false,
+          required: vaccineType.includes('其他') ? true : false,
           message: '请填写其他疫苗',
         },
       ]"
@@ -354,7 +306,7 @@
     ></van-field>
 
     <van-field
-      v-if="HasCOVIDVaccine == '是'"
+      v-if="hasCOVIDVaccine == '是'"
       colon
       clearable
       readonly
@@ -396,6 +348,7 @@ export default {
   name: "page5",
   data() {
     return {
+      workOrNotCovid: "否",//是否需要接触新冠
       HasOnlineClass: "否", //是否上网课
       purpose: "学习", // 来沪目的
       thirtyDays: "是", //近三十天内无离开上海
@@ -405,16 +358,18 @@ export default {
       beforeIsolationPoint: "", //之前隔离点
       inHospitalDate: "", //120转运时间
 
-      HasSymptom: "否", //有无症状
-      symptom: [], //患者症状
-      HasCOVIDVaccine: "是",
+      // HasSymptom: "否", //有无症状
+      // symptom: [], //患者症状
+      // otherSymptom: "", //其他症状
+       //symptomList: [],
+      hasCOVIDVaccine: "是",
       covidVaccine: "", //接种针数
       vaccineType: [], //疫苗公司
       othervaccines: "", //其他疫苗
       vaccineDate: "", //最后一次接种日期
 
       vaccineTypeList: [],
-      symptomList: [],
+     
 
       showNormalDate: false, //未发生异常时间弹窗
       showUnusualDate: false, //核酸时间弹窗
@@ -456,12 +411,12 @@ export default {
         "unusualDate", //核酸检测异常时间
         "normalDate", //未发生异常时间
         "inHospitalDate", //120转运时间
-
+        "otherSymptom", //其他症状
+        "vaccineType",
         "beforeIsolationPoint", //之前隔离点
         "HasSymptom", //有无症状
-        "HasCOVIDVaccine",
+        "hasCOVIDVaccine",//是否接种过疫苗
         "covidVaccine", //接种针数
-        // "vaccineType", //疫苗公司
         "othervaccines", //其他疫苗
         "vaccineDate", //最后一次接种日期
       ];
@@ -471,10 +426,11 @@ export default {
           this[`${arr[i]}`] = this.getLocalStorge(arr[i]);
         }
       }
+     
       if (this.getLocalStorge("vaccineType")) {
-        this.symptom = this.getLocalStorge("vaccineType").split(",");
-      }
+        this.vaccineType = this.getLocalStorge("vaccineType").split(",");
         
+      }
     },
 
     getLocalStorge(key) {
@@ -493,7 +449,7 @@ export default {
       //   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"); //最后一次接种日期
+      // this.vaccineDate = formatDate(new Date(), "yyyy-MM-dd"); //最后一次接种日期
     },
 
     onpurpose(value, index) {
@@ -566,18 +522,12 @@ export default {
 
 <style lang="scss" scoped>
 .page5 {
-  .symptom {
-    .van-checkbox--horizontal {
-      margin-right: 0.32rem;
-      min-width: 35%;
-      margin-bottom: 5%;
-    }
-  }
-   .vaccineType{
-    .van-checkbox{
+  .vaccineType {
+    .van-checkbox {
       width: 43%;
       margin-bottom: 5%;
     }
   }
+ 
 }
 </style>

src/components/page6.vue

 <!--
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
- * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-24 14:38:02
+ * @LastEditors: wsq
+ * @LastEditTime: 2022-04-21 10:55:31
  * @Description: 
 -->
 <template>
@@ -56,7 +56,7 @@
     ></van-field> -->
 
     <van-field
-      v-if="hasHistoryAllergies == '有'"
+      v-show="hasHistoryAllergies == '有'"
       colon
       clearable
       label-width="125px"
@@ -67,18 +67,18 @@
       @blur="setLocalStorge('foodAllergy')"
     ></van-field>
     <van-field
-      v-if="hasHistoryAllergies == '有'"
+      v-show="hasHistoryAllergies == '有'"
       colon
       clearable
       label-width="125px"
       v-model="drugAllergy"
-      name="drugAllergy "
+      name="drugAllergy"
       label="药物过敏原"
-      placeholder="食物过敏原"
+      placeholder="药物过敏原"
       @blur="setLocalStorge('drugAllergy')"
     ></van-field>
     <van-field
-      v-if="hasHistoryAllergies == '有'"
+      v-show="hasHistoryAllergies == '有'"
       colon
       clearable
       label-width="125px"
@@ -118,7 +118,7 @@
     </van-field>
 
     <van-field
-      v-if="hasHistorySurgery == '有'"
+      v-show="hasHistorySurgery == '有'"
       colon
       clearable
       label-width="125px"
@@ -150,8 +150,10 @@
               if (HasPreviousHistory == '无') {
                 previousHistory = [];
                 otherPastHistory = '';
-                setValue('previousHistory');
+                tuberculosisDate='';
+                setValue('previousHistory','');
                 setValue('otherPastHistory', '');
+                 setValue('tuberculosisDate', '');
               }
             }
           "
@@ -170,10 +172,10 @@
       name="previousHistory"
       label-width="125px"
       label="既往史"
-      v-show="HasPreviousHistory != '无'"
+      v-show="HasPreviousHistory == '有'"
       :rules="[
         {
-          required: HasPreviousHistory != '无' ? true : false,
+          required: HasPreviousHistory == '有' ? true : false,
           message: '请选择既往史',
         },
       ]"
@@ -196,7 +198,7 @@
 
     <van-field
       colon
-      v-if="previousHistory.includes('其他')"
+      v-show="previousHistory.includes('其他')"
       clearable
       autosize
       type="textarea"
@@ -219,11 +221,11 @@
       readonly
       clickable
       label-width="125px"
-      v-if="HasPreviousHistory != '无' && previousHistory.includes('肺结核')"
+      v-show="HasPreviousHistory == '有' && previousHistory.includes('肺结核')"
       :rules="[
         {
           required:
-            HasPreviousHistory != '无' && previousHistory.includes('肺结核')
+           HasPreviousHistory == '有' && previousHistory.includes('肺结核')
               ? true
               : false,
           message: '请选择既往史发生时间',
@@ -261,7 +263,9 @@
               setLocalStorge('yesOrNoCt');
               if (yesOrNoCt == '无') {
                 ChestCT = '无';
+                ChestCTDate='';
                 setValue('ChestCT', '');
+                 setValue('ChestCTDate', '');
               }
             }
           "
@@ -401,8 +405,16 @@ export default {
           //   }
         }
       });
-
+      this.tuberculosisDate = this.getLocalStorge('tuberculosisDate')
+      this.otherPastHistory = this.getLocalStorge('otherPastHistory')
+      this.foodAllergy = this.getLocalStorge('foodAllergy')
+        this.drugAllergy = this.getLocalStorge('drugAllergy')
+        this.otherAllergy = this.getLocalStorge('otherAllergy')
+ if (this.getLocalStorge("previousHistory")) {
         this.previousHistory = this.getLocalStorge("previousHistory").split(",");
+      }
+
+    
     },
 
     getLocalStorge(key) {
@@ -418,7 +430,7 @@ export default {
     },
 
     setChestCTDate() {
-      this.ChestCTDate = formatDate(new Date(), "yyyy-MM-dd");
+      // this.ChestCTDate = formatDate(new Date(), "yyyy-MM-dd");
     },
     getResource() {
       this.setLoading(true);
@@ -430,13 +442,13 @@ export default {
       });
     },
     onConfirm(date) {
-      this.tuberculosisDate = formatDate(date, "yyyy-MM");
+      this.tuberculosisDate = formatDate(date, "yyyy-MM-dd");
       this.setLocalStorge("tuberculosisDate");
       this.showPicker = false;
     },
 
     onChestCT(date) {
-      this.ChestCTDate = formatDate(date, "yyyy-MM-dd ");
+      this.ChestCTDate = formatDate(date, "yyyy-MM-dd");
       this.setLocalStorge("ChestCTDate");
       this.showCalendar = false;
     },