修改儿童签约出生日期回显问题

src/views/signingWD/index.vue

@@ -27,7 +27,8 @@
             <div class="td label">身份证号</div>
             <div class="td text-right">
               <input type="text" class="form-control" placeholder="请输入有效的女性身份证号" @blur="BaseValidateIdCard" v-model="BaseForm.idCard" :disabled="signStatus=='update'"/>
-              <span v-show="!BaseValidate.idCardState" class="small-hint">请输入有效的女性身份证号</span>
+              <!-- <span v-show="!BaseValidate.idCardState" class="small-hint">请输入有效的女性身份证号</span> -->
+              <span v-show="!BaseValidate.idCardState" class="small-hint">{{error.idCard}}</span>
             </div>
           </div>
           <div class="tr">
@@ -41,18 +42,18 @@
             <div class="td label">手机号</div>
             <div class="td text-right">
               <input type="text" class="form-control" maxlength="11" placeholder="请输入有效手机号" @blur="BaseValidatePhone" v-model="BaseForm.phone" :disabled="signStatus=='update'"/>
-              <span v-show="!BaseValidate.phoneState" class="small-hint">请输入有效手机号</span>
+              <span v-show="!BaseValidate.phoneState" class="small-hint">{{error.phone}}</span>
             </div>
           </div>
-          <div class="tr">
+          <div class="tr" v-if="pageType == '0'">
             <div class="td label">末次月经时间</div>
             <div class="td text-right">
               <input type="text" class="form-control" v-model="BaseForm.lastMensesTime" v-if="signStatus=='update'" :disabled="signStatus=='update'"/>
               <div class="td-table" @click="openPickerLastMensesTime" v-else>
                 <div class="td-table-cell text">
-                  <span v-if="BaseForm.lastMensesTime === ''" style="color:#FF9B44;">领取儿童健康券</span>
-                  <span v-else class="light">{{BaseForm.lastMensesTime}}</span>
-                  <!-- {{BaseForm.lastMensesTime !== '' ? BaseForm.lastMensesTime : '请选择末次月经时间'}} -->
+                  <!-- <span v-if="BaseForm.lastMensesTime === ''" style="color:#FF9B44;">领取儿童健康券</span>
+                  <span v-else class="light">{{BaseForm.lastMensesTime}}</span> -->
+                  {{BaseForm.lastMensesTime !== '' ? BaseForm.lastMensesTime : '请选择末次月经时间'}}
                 </div>
                 <div class="td-table-cell icon">
                   <i class="glyphicon glyphicon-menu-right"></i>
@@ -204,14 +205,14 @@
                 <div class="td-table-cell text">
                   <p class="m-b-normal">
                     <span v-if="item.age === ''">请选择子女出生日期</span>
-                    <span v-else class="light">{{item.age}}</span>
+                    <span v-else class="light">{{item.birth}}</span>
                   </p>
                 </div>
                 <div class="td-table-cell icon">
                   <i class="glyphicon glyphicon-menu-right"></i>
                 </div>
               </div>
-              <input class="form-control" v-model="item.age" v-if="!item.editor" placeholder="请选择子女出生日期" disabled/>
+              <input class="form-control" v-model="item.birth" v-if="!item.editor" placeholder="请选择子女出生日期" disabled/>
               <span v-show="!childrensValidate[index].ageState" class="small-hint">请选择子女出生日期</span>
             </div>
           </div>
@@ -593,7 +594,11 @@ export default {
       ChoosePlusVisible: true,
       Choose2PlusVisible: true,
       modalVisible: false, // 底层透明遮挡显示状态
-      addressSearchValue: ''
+      addressSearchValue: '',
+      error: {
+        idCard: '',
+        phone: ''
+      }
     }
   },
   created () {
@@ -834,6 +839,18 @@ export default {
       // 身份证字段校验
       const _idCardFlag = this.BaseForm.idCard
       if (!_idCardFlag) {
+        this.error.idCard = '请输入女性身份证号'
+        this.BaseValidate.idCardState = false
+        this.$toast({
+          message: '请输入女性身份证号!',
+          position: 'center',
+          duration: 3000
+        })
+        return false
+      }
+      const _baseIdCardFlag = this.BaseValidateIdCard()
+      if (_baseIdCardFlag == '不通过') {
+        this.error.idCard = '请输入有效的女性身份证号'
         this.BaseValidate.idCardState = false
         this.$toast({
           message: '请输入有效的女性身份证号!',
@@ -856,9 +873,21 @@ export default {
       // 手机号字段校验
       const _phoneFlag = this.BaseForm.phone
       if (!_phoneFlag) {
+        this.error.phone = '请输入手机号'
+        this.BaseValidate.phoneState = false
+        this.$toast({
+          message: '请输入手机号!',
+          position: 'center',
+          duration: 3000
+        })
+        return false
+      }
+      const _basePhoneflag = this.BaseValidatePhone()
+      if (!_basePhoneflag) {
+        this.error.phone = '请输入有效的手机号'
         this.BaseValidate.phoneState = false
         this.$toast({
-          message: '请输入有效手机号!',
+          message: '请输入有效的手机号!',
           position: 'center',
           duration: 3000
         })
@@ -886,6 +915,15 @@ export default {
         })
         return false
       }
+      const _aaseAddressFlag = this.BaseValidate.addressState
+      if (!_aaseAddressFlag) {
+        this.$toast({
+          message: '请选择完整现居住地址!',
+          position: 'center',
+          duration: 3000
+        })
+        return false
+      }
       // 详细地址字段校验
       const _streetFlag = this.BaseForm.street
       if (!_streetFlag) {
@@ -924,21 +962,28 @@ export default {
     },
     BaseValidateIdCard () { // 身份证验证
       if (cardid(this.BaseForm.idCard)[0]) {
+        this.error.idCard = '请输入有效的女性身份证号'
         this.BaseValidate.idCardState = false
         console.log('不通过')
+        let error = '不通过'
+        return error
       } else {
         if (getSexByIdCard(this.BaseForm.idCard) === '2') {
           this.BaseValidate.idCardState = true
         } else {
           this.BaseValidate.idCardState = false
         }
+        this.error.idCard = ''
         console.log('通过')
+        let success = '通过'
+        return success
         this.getManualPriKey()
       }
       if (this.pageType === 0) {
         this.BaseFormIntoTab1()
       }
       this.saveSignInfoToCookie() // 储存用户签约录入信息
+      // return true
     },
     // 根据身份证号查询身份信息
     getManualPriKey() {
@@ -976,6 +1021,7 @@ export default {
         this.BaseValidate.phoneState = false
       } else if (isvalidatemobile(this.BaseForm.phone)[0]) {
         this.BaseValidate.phoneState = false
+        return false
       } else {
         this.BaseValidate.phoneState = true
       }
@@ -983,6 +1029,7 @@ export default {
         this.BaseFormIntoTab1()
       }
       this.saveSignInfoToCookie() // 储存用户签约录入信息
+      return true
     },
     BaseValidateAddress () { // 现住址验证
       if (this.BaseForm.address === '') {
@@ -1477,6 +1524,7 @@ export default {
       this.addressForm.villages = ''
       this.addressForm.VillagesCode = ''
       this.stepCurrent = 5
+      this.BaseForm.subAddress = ''
       this.saveSignInfoToCookie() // 储存用户签约录入信息
     },
     getVillages (parentCode) { // 根据街道code获取居委会信息