增加了字段

src/components/ind.js

@@ -2,12 +2,21 @@
  * @Author: ninglupeng
  * @Date: 2022-03-20 15:10:37
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 15:14:06
+ * @LastEditTime: 2022-03-23 14:21:01
  * @Description:
  */
-// thirtyDays:最近三十天
-// othervaccines //其他疫苗
-//otherPastHistory  //其他既往史
-//yesOrNoCt //有无CT
+
+// buildingNumber   //楼号
+// nationality  国籍
+// passportId  护照号
+// workOrNotCovid // 工作是否需要接触新冠病毒
+// typeOfMedicalInsurance  //医保类型
+
+
+
+
+orNotByEntry //是否由国外入境      （是/否）
+
+beforeIsolationPoint //之前隔离点
 
 

src/components/index.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-22 16:38:41
+ * @LastEditTime: 2022-03-23 14:29:44
  * @Description: 
 -->
 <template>
@@ -101,6 +101,7 @@ export default {
         this.$refs.vantform
           .validate([
             // "inpatientNumber",
+            "buildingNumber",
             "agreementFloor",
             "bedNumber",
             "agreementSign",
@@ -135,6 +136,8 @@ export default {
         this.$refs.vantform
           .validate([
             "patientName", //患者姓名
+            "nationality", //国籍
+            "passportId", //护照号
             "age", //年龄
             "height", //身高
             "weight", //体重
@@ -145,6 +148,7 @@ export default {
             "Registeredresidence", //籍贯 （包括省市）
             "address",
             "idCard",
+            "typeOfMedicalInsurance", //医保类型
           ])
           .then(() => {
             this.$store.dispatch("user/setpage", 5);
@@ -171,6 +175,7 @@ export default {
             "unusualDate", //核酸检测异常时间
             "normalDate", //未发生异常时间
             "inHospitalDate", //120转运时间
+            "beforeIsolationPoint",
             "symptom", //患者症状
             "covidVaccine", //接种针数
             "vaccineType", //疫苗公司

src/components/page3.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-22 16:38:15
+ * @LastEditTime: 2022-03-23 13:20:12
  * @Description: 
 -->
 <template>
@@ -37,16 +37,30 @@
       </template>
     </van-field>
 
-    <!-- <van-field
+    <van-field
       colon
       clearable
-      v-model="inpatientNumber"
-      name="inpatientNumber"
-      label="住院号"
-      placeholder="住院号"
-      :rules="[{ required: true, message: '请填写住院号' }]"
-      @blur="setLocalStorge('inpatientNumber')"
-    ></van-field> -->
+      name="buildingNumber"
+      label="楼号"
+      readonly
+      :value="buildingNumber"
+      @click="showbuildingNumber = true"
+      :rules="[{ required: true, message: '请填写楼号' }]"
+    >
+    </van-field>
+    <van-popup v-model="showbuildingNumber" position="bottom">
+      <van-picker
+        title="楼号"
+        show-toolbar
+        :columns="buildingNumberList"
+        @confirm="onbuildingNumber"
+        @cancel="
+          () => {
+            showbuildingNumber = false;
+          }
+        "
+      />
+    </van-popup>
 
     <van-field
       colon
@@ -143,10 +157,11 @@ export default {
     jlPopup,
   },
   name: "page3",
+  inject: ["setLoading"],
   data() {
     return {
       AgreementMode: "向贵院出具授权委托书指定代理人",
-    //   inpatientNumber: "", //入院号
+      buildingNumber: "", //楼号
       agreementFloor: "", //楼层
       bedNumber: "", //床号
       agreementSign: "", // 患者签字
@@ -156,9 +171,13 @@ export default {
       minAgreementDate: new Date(2020, 0, 1),
       maxDate: new Date(),
       showSignHandleVue: false,
+      showbuildingNumber: false,
+      buildingNumberList: [], // 楼号list
     };
   },
   mounted() {
+    this.getResource();
+
     this.setAgreementDate();
     this.setLastValue();
   },
@@ -166,6 +185,7 @@ export default {
     setLastValue() {
       let arr = [
         "AgreementMode",
+        "buildingNumber", //楼号
         // "inpatientNumber", //入院号
         "agreementFloor", //楼层
         "bedNumber", //床号
@@ -193,6 +213,27 @@ export default {
       this.agreementDate = formatDate(new Date(), "yyyy-MM-dd");
     },
 
+    onbuildingNumber(value, index) {
+      this.buildingNumber = value;
+      this.setLocalStorge("buildingNumber");
+      this.showbuildingNumber = false;
+    },
+
+    getResource() {
+      this.setLoading(true);
+      this.$http.get(`/Research/Resource`, {}).then((data) => {
+        let arr = data.filter((item) => {
+          return item.category == "楼号";
+        });
+
+        this.buildingNumberList = arr.map((item) => {
+          return item.element;
+        });
+
+        this.setLoading(false);
+      });
+    },
+
     onCancel(val) {
       console.log(`${val}`);
       if (val) {

src/components/page4.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-22 16:21:54
+ * @LastEditTime: 2022-03-23 15:09:49
  * @Description: 
 -->
 <template>
@@ -18,9 +18,69 @@
       @blur="setLocalStorge('patientName')"
     ></van-field>
 
+    <van-field colon clearable name="orNotByEntry" label="近期是否由国外入境">
+      <template #input>
+        <van-radio-group
+          @change="setLocalStorge('orNotByEntry')"
+          v-model="orNotByEntry"
+          direction="horizontal"
+        >
+          <van-radio name="是">是</van-radio>
+          <van-radio name="否">否</van-radio>
+        </van-radio-group>
+      </template>
+    </van-field>
+
+    <van-field
+      colon
+      clearable
+      name="nationality"
+      label="国籍"
+      readonly
+      :value="nationality"
+      @click="shownationality = true"
+      :rules="[{ required: true, message: '请填写国籍' }]"
+    >
+    </van-field>
+    <van-popup v-model="shownationality" position="bottom">
+      <van-picker
+        title="国籍"
+        show-toolbar
+        :columns="nationalityList"
+        @confirm="
+          (value, index) => {
+            nationality = value;
+            setLocalStorge('nationality');
+            shownationality = false;
+          }
+        "
+        @cancel="
+          () => {
+            shownationality = false;
+          }
+        "
+      />
+    </van-popup>
     <van-field
       colon
+      v-if="nationality != '中国'"
       clearable
+      v-model="passportId"
+      name="passportId"
+      label="护照号"
+      placeholder="护照号"
+      :rules="[
+        {
+          required: nationality != '中国' ? true : false,
+          message: '请填写护照号',
+        },
+      ]"
+    ></van-field>
+
+    <van-field
+      colon
+      clearable
+      v-if="nationality == '中国'"
       v-model="idCard"
       name="idCard"
       label="身份证号"
@@ -171,16 +231,37 @@
     >
       <template #extra>周 </template>
     </van-field>
+
     <van-field
       colon
       clearable
-      v-model="occupation"
       name="occupation"
       label="职业"
-      placeholder="职业"
-      @blur="setLocalStorge('occupation')"
+      readonly
+      :value="occupation"
+      @click="showoccupation = true"
       :rules="[{ required: true, message: '请填写职业' }]"
-    ></van-field>
+    >
+    </van-field>
+    <van-popup v-model="showoccupation" position="bottom">
+      <van-picker
+        title="职业"
+        show-toolbar
+        :columns="occupationList"
+        @confirm="
+          (value, index) => {
+            occupation = value;
+            setLocalStorge('occupation');
+            showoccupation = false;
+          }
+        "
+        @cancel="
+          () => {
+            showoccupation = false;
+          }
+        "
+      />
+    </van-popup>
 
     <van-field
       colon
@@ -193,7 +274,23 @@
       :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
@@ -249,6 +346,37 @@
       :rules="[{ required: true, message: '请填写现居住地' }]"
     ></van-field>
 
+    <van-field
+      colon
+      clearable
+      name="typeOfMedicalInsurance"
+      label="医保类型"
+      readonly
+      :value="typeOfMedicalInsurance"
+      @click="showtypeOfMedicalInsurance = true"
+      :rules="[{ required: true, message: '请填写医保类型' }]"
+    >
+    </van-field>
+    <van-popup v-model="showtypeOfMedicalInsurance" position="bottom">
+      <van-picker
+        title="医保类型"
+        show-toolbar
+        :columns="typeOfMedicalInsuranceList"
+        @confirm="
+          (value, index) => {
+            typeOfMedicalInsurance = value;
+            setLocalStorge('typeOfMedicalInsurance');
+            showtypeOfMedicalInsurance = false;
+          }
+        "
+        @cancel="
+          () => {
+            showtypeOfMedicalInsurance = false;
+          }
+        "
+      />
+    </van-popup>
+
     <!-- 有无商业保险 -->
     <van-field colon clearable name="insurance" label="商业保险">
       <template #input>
@@ -272,9 +400,13 @@ import { formatDate } from "../utils/common.js";
 
 export default {
   name: "page4",
+  inject: ["setLoading"],
   data() {
     return {
       patientName: "", //患者姓名
+      orNotByEntry: "否", //近期是否由国外入境
+      nationality: "中国", //国籍
+      passportId: "", //护照号
       age: "", //年龄
       height: "", //身高
       weight: "",
@@ -285,11 +417,13 @@ export default {
       gestationalWeeks: "", //怀孕周期
       occupation: "", //职业
       contactInformation: "", //联系方式
+      workOrNotCovid: "否",
       Registeredresidence: "", //籍贯 （包括省市）
       province: "", //籍贯 （省）
       city: "", //籍贯 （市）
       address: "", //地址
       idCard: "", //身份证号
+      typeOfMedicalInsurance: "上海医保", //医保类型
       insurance: "无", //商业保险
 
       areaList, //地址数据选项列表
@@ -298,16 +432,25 @@ export default {
       showbirthday: false, //出生时间弹窗
 
       minbirthday: new Date(1920, 0, 1),
+      occupationList: [],
+      showoccupation: false,
+      nationalityList: [], //国籍列表
+      typeOfMedicalInsuranceList: [],
+      shownationality: false,
+      showtypeOfMedicalInsurance: false,
       maxDate: new Date(),
     };
   },
   mounted() {
+    this.getResource();
     this.setLastValue();
   },
   methods: {
     setLastValue() {
       let arr = [
         "patientName", //患者姓名
+        "nationality", //国籍
+        "passportId", //护照号
         "age", //年龄
         "gender", //性别
         "height", //身高
@@ -323,6 +466,7 @@ export default {
         "city", //籍贯 （市）
         "address", //地址
         "idCard", //身份证号
+        "typeOfMedicalInsurance", //医保类型
         "insurance", //商业保险
       ];
 
@@ -366,6 +510,37 @@ export default {
       return card15.test(val) || card18.test(val);
     },
 
+    getResource() {
+      this.setLoading(true);
+      this.$http.get(`/Research/Resource`, {}).then((data) => {
+        let arr = data.filter((item) => {
+          return item.category == "国籍";
+        });
+
+        let arr1 = data.filter((item) => {
+          return item.category == "医保类型";
+        });
+
+        let arr2 = data.filter((item) => {
+          return item.category == "职业";
+        });
+
+        this.nationalityList = arr.map((item) => {
+          return item.element;
+        });
+
+        this.typeOfMedicalInsuranceList = arr1.map((item) => {
+          return item.element;
+        });
+
+        this.occupationList = arr2.map((item) => {
+          return item.element;
+        });
+
+        this.setLoading(false);
+      });
+    },
+
     getdate() {
       let obj = this.getInfo(this.idCard);
 

src/components/page5.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-21 18:29:33
+ * @LastEditTime: 2022-03-23 14:40:21
  * @Description: 
 -->
 <template>
@@ -168,6 +168,20 @@
     <van-field
       colon
       clearable
+      autosize
+      label-width="130px"
+      type="textarea"
+      v-model="beforeIsolationPoint"
+      name="beforeIsolationPoint"
+      label="之前隔离点(无隔离点填救护车出发地址)"
+      placeholder="请填写之前隔离点"
+      @blur="setLocalStorge('beforeIsolationPoint')"
+      :rules="[{ required: true, message: '请填写之前隔离点' }]"
+    ></van-field>
+
+    <van-field
+      colon
+      clearable
       name="HasSymptom"
       label-width="130px"
       label="是否有症状"
@@ -368,6 +382,7 @@ export default {
       LeaveShangHai: "", //回上海天数
       unusualDate: "", //核酸检测异常时间
       normalDate: "", //未发生异常时间
+      beforeIsolationPoint: "", //之前隔离点
       inHospitalDate: "", //120转运时间
 
       HasSymptom: "否", //有无症状
@@ -421,6 +436,8 @@ export default {
         "unusualDate", //核酸检测异常时间
         "normalDate", //未发生异常时间
         "inHospitalDate", //120转运时间
+
+        "beforeIsolationPoint", //之前隔离点
         "HasSymptom", //有无症状
         "HasCOVIDVaccine",
         "covidVaccine", //接种针数

src/components/page6.vue

@@ -252,7 +252,7 @@
       clearable
       name="yesOrNoCt"
       label-width="125px"
-      label="有无CT检查"
+      label="有无胸部CT检查"
     >
       <template #input>
         <van-radio-group
@@ -280,7 +280,7 @@
       clearable
       name="ChestCT"
       label-width="125px"
-      label="有无新冠肺炎CT"
+      label="有无新冠肺炎"
     >
       <template #input>
         <van-radio-group