个人信息新增

src/components/index/SignUp/referInfo.vue

@@ -147,7 +147,7 @@
             style="height: 73px"
             :rules="
               configJson.idCard == 1
-                ? referInfoRules.id_card
+                ? referInfoRules.idCard
                 : [{ required: false }]
             "
           >
@@ -561,12 +561,6 @@
         <el-col :span="12" v-show="configJson.pastMedicalHistory == 1">
           <el-form-item
             label="既往病史或过敏史"
-            prop="past_medical_history"
-            :rules="
-              configJson.pastMedicalHistory == 1
-                ? referInfoRules.past_medical_history
-                : [{ required: false }]
-            "
           >
             <el-input
               ref="code"
@@ -581,12 +575,6 @@
         <el-col :span="12" v-show="configJson.noteOther == 1">
           <el-form-item
             label="备注或其它"
-            prop="note_other"
-            :rules="
-              configJson.noteOther == 1
-                ? referInfoRules.note_other
-                : [{ required: false }]
-            "
           >
             <el-input
               ref="code"
@@ -1028,7 +1016,15 @@
           education: [
             {required: true, message: "学历不能为空！", trigger: "change"},
           ],
+          idCard: [
+            {
+              required: true,
+              message: "身份证号不能为空！",
+              trigger: "blur",
+            },
+            {validator: validator.validateid_card, trigger: "blur"},
 
+          ],
           // address: [
           //   { required: true, message: "详细地址不能为空！", trigger: "blur" },
           // ],
@@ -1046,6 +1042,14 @@
               trigger: "change",
             },
           ],
+          phone: [
+            {
+              required: true,
+              message: "手机号不能为空！",
+              trigger: "blur",
+            },
+            {validator: validator.validatePhone, trigger: "blur"},
+          ],
           chooseSubject: [
             {
               required: true,
@@ -1120,7 +1124,7 @@
         selectSchoolList: [], //就读中学-中学列表
         jgProvinceCode: "", //省份id
         jiguan_city: "", //城市id(和省份id拼接)
-        electSubjectArrs: ["未选科", "已选科"],
+        electSubjectArrs: ["未选科", "已选科", "文科", '理科'],
         SubjectArrs: ["物理", "历史", "化学", "地理", "生物", "政治",],
         EducationArrs: ["初中", "高中", "大学", "硕士", "博士"],
         yearArrs: [], //生日涉及的近10年的年份
@@ -1277,7 +1281,10 @@
           this.changeCity(this.referForm.school_city, true);
         }
 
-        if (val.elect_subject_situation != null &&
+        if (val.elect_subject_situation == '文科' || val.elect_subject_situation == '理科') {
+          this.referForm.subjectState = val.elect_subject_situation;
+          this.showSubject = 0;
+        } else if (val.elect_subject_situation != null &&
           val.elect_subject_situation !== '' &&
           val.elect_subject_situation !== '-') {
           this.referForm.subjectState = '已选科';
@@ -1290,7 +1297,7 @@
           this.elect_subject_situation = '-';
           this.referForm.chooseSubject = [];
         }
-        console.log(this.referForm)
+        // console.log(this.referForm)
         if (this.invitation_code != null) {
           this.referForm.code = this.invitation_code;
           this.isCode = true;
@@ -1310,36 +1317,36 @@
           let info = res.data.info;
           info['code'] = null
           let referForm = {
-              name: null,
-              gender: null,
-              age: null,
-              id_card: null,
-              education: null,
-              birthday: null,
-              jiguan_code: null,
-              address: null,
-              country: null,
-              nation: null,
-              start_school_date: null,
-              political_status: null,
-              phone: null,
-              grade: null,
-              unit_and_identity: null,
-              email: null,
-              recommend: null,
-              subjectState: null,
-              chooseSubject: [],
-              past_medical_history: null,
-              note_other: null,
-              emergency: null,
-              emergency_phone: null,
-              school_province: null,
-              school_city: null,
-              school: null,
-              school_contacts: null,
-              school_phone: null,
-              code: null
-            }
+            name: null,
+            gender: null,
+            age: null,
+            id_card: null,
+            education: null,
+            birthday: null,
+            jiguan_code: null,
+            address: null,
+            country: null,
+            nation: null,
+            start_school_date: null,
+            political_status: null,
+            phone: null,
+            grade: null,
+            unit_and_identity: null,
+            email: null,
+            recommend: null,
+            subjectState: null,
+            chooseSubject: [],
+            past_medical_history: null,
+            note_other: null,
+            emergency: null,
+            emergency_phone: null,
+            school_province: null,
+            school_city: null,
+            school: null,
+            school_contacts: null,
+            school_phone: null,
+            code: null
+          }
           for (let k in info) {
             referForm[k] = info[k];
           }
@@ -1392,15 +1399,19 @@
       changeSubjectState(val) {
         // this.referForm.subjectState = val
         if (val == '已选科') {
-          this.referForm.subjectState = '已选科';
+          this.referForm.subjectState = val
           this.showSubject = 1;
           this.elect_subject_situation = '';
           // console.log(this.elect_subject_situation)
-        } else {
+        } else if (val == '未选科') {
           this.showSubject = 0
-          this.referForm.subjectState = '未选科'
+          this.referForm.subjectState = val
           this.elect_subject_situation = '-'
           // console.log(this.referForm.subjectState)
+        } else {
+          //文科理科
+          this.elect_subject_situation = val
+          this.showSubject = 0
         }
       },
       changeSubjectList(val) {