信息不全提示、 租房房主身份证逻辑

外国人 编辑时初始化国籍

@@ -66,7 +66,7 @@ Page({
     lovercardtypeData: {
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
-      // selected: '居民身份证',
+      selected: '',
       disabled: true,
       placeholder: '请选择证照类型',
       values: cardTypeArray,
@@ -119,7 +119,7 @@ Page({
       label: '子女证照类型',
       isrequre: true,
       bindtype: 'childrencardtype',
-      selected: '居民身份证',
+      selected: '',
       // disabled: true,
       isblack: 'true',
       placeholder: '请选择证照类型',
@@ -225,7 +225,7 @@ Page({
       isrequre: true,
       // disabled: true,
       bindtype: 'oldercardtype',
-      selected: '居民身份证',
+      selected: '',
       isblack: 'true',
       placeholder: '请选择被赡养人证照类型',
       values: cardTypeArray,
@@ -234,8 +234,8 @@ Page({
     cardtypeData: {
       label: '证照类型',
       isrequre: true,
-      bindtype: 'cardtype',
-      selected: '居民身份证',
+      bindtype: 'ownercardtype',
+      selected: '',
       // disabled: true,
       isblack: 'true',
       placeholder: '证照类型',
@@ -555,7 +555,7 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
-
+    this.getCountry()
     this.getTaxHostInfo()
     var pages = getCurrentPages()
     var frontPage = pages[pages.length - 2]
@@ -577,7 +577,6 @@ Page({
       //   deduction_amount = Deduce_amounts_year[nameKey] ? Deduce_amounts_year[nameKey] : 0
     }
     if ("children_education" == options.status) {
-      this.getCountry()
       if (options.isedit != 'true'){
         this.getTaxList()
       }
@@ -770,9 +769,15 @@ Page({
   // },
 
   //****************获取国籍数据************/
-  getCountry: function () {
+  getCountry: function (cb) {
     var that = this
     wx.showLoading()
+    if (that.countrys && that.countrys.length > 0) {
+      typeof cb == "function" && cb(that.countrys)
+      console.log('----直接取值')
+      wx.hideLoading()
+      return
+    }
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/nation-list',
@@ -799,10 +804,9 @@ Page({
         that.data.schoolCountryData.values = res.data
         that.countrys = countrys
         that.setData({
-          ///////////////////////////需对照addinfo完善
-          // countryData: that.data.countryData,
           schoolCountryData: that.data.schoolCountryData
         })
+        typeof cb == "function" && cb(countrys)
       },
       complete() {
         wx.hideLoading()
@@ -824,8 +828,8 @@ Page({
           setData.taxperson_relativeData = this.data.taxperson_relativeData
         }
         var commonbirthDate = this.data.commonbirthDate
-        commonbirthDate.selected = format.formatTime_date(data.birth_date)
-        commonbirthDate.datelong = data.birth_date
+        commonbirthDate.selected = format.formatTime_date(data.children_birthday)
+        commonbirthDate.datelong = data.children_birthday
         setData.commonbirthDate = commonbirthDate
         var childrenpercentData = this.data.childrenpercentData
         childrenpercentData.selected = data.percent + '%'
@@ -954,9 +958,11 @@ Page({
         this.dealCardType(data.id_card_type, 'oldercardtype')//为防止干扰其他字段，需要先执行
         var setData = {}
         var olderbirthDate = this.data.olderbirthDate
-        olderbirthDate.selected = format.formatTime_date(data.birth_date)
-        olderbirthDate.datelong = data.birth_date
+        olderbirthDate.selected = format.formatTime_date(data.birthday)
+        olderbirthDate.datelong = data.birthday
         setData.olderbirthDate = olderbirthDate
+        this.data.olderCountryData.selected = data.nation
+        setData.olderCountryData = this.data.olderCountryData
         if (data.supported_name && data.supported_name.length) {
           setData.supported_name = data.supported_name
         }
@@ -1008,7 +1014,7 @@ Page({
         if (data.spouse_name && data.spouse_name.length) {
           setData.spouse_name = data.spouse_name
         }
-        this.dealCardType(data.spouse_id_card_type, 'lovercardtype')
+        this.dealCardType(data.id_card_type, 'lovercardtype')
         if (data.id_card_no && data.id_card_no.length) {
           setData.spouse_id_card_no = data.id_card_no
           if ('居民身份证' == data.id_card_type) {
@@ -1016,6 +1022,7 @@ Page({
           }
         }
         if (this.data.house_type == 'house_fund_rent'){
+          this.dealCardType(data.owner_id_card_type, 'ownercardtype')//为防止干扰其他字段，需要先执行
           var workingcityInfo = this.data.workingcityInfo
           workingcityInfo.requestdata = data.work_city
           workingcityInfo.selected = data.work_city.province + data.work_city.city
@@ -1415,6 +1422,10 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         subUrl = 'persontax/v1/children-educations'
+        if (this.data.childrencardtypeData.selected.length < 1) {
+          this.showToast('请选择证照类型')
+          return
+        }
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
           this.showToast('请填写子女证照号码')
           return
@@ -1435,11 +1446,14 @@ Page({
           this.showToast('请填写子女姓名')
           return
         }
-        // if (this.data.commonbirthDate.selected.length < 1) {
-        //   this.showToast('请选择子女出生日期')
-        //   return
-        // }
-
+        if (this.data.commonbirthDate.selected.length < 1) {
+          this.showToast('请选择子女出生日期')
+          return
+        }
+        if (this.data.countryData.selected.length < 1) {
+          this.showToast('请选择国籍')
+          return
+        }
         if (this.data.taxperson_relativeData.selected.length < 1) {
           this.showToast('请选择与纳税人关系')
           return
@@ -1487,7 +1501,10 @@ Page({
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
             this.showToast('请填写配偶姓名')
             return
-          } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
+          } if (this.data.lovercardtypeData.selected.length < 1) {
+            this.showToast('请选择配偶证照类型')
+            return
+          } if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             return
           } else if (this.data.isIdCard_lover && !format.isIDCardNum(formdata.spouse_id_card_no)) {
@@ -1497,8 +1514,13 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
+          if (this.data.loverCountryData.selected.length < 1) {
+            this.showToast('请选择配偶国籍')
+            return
+          }
           newdata.spouse_id_card_type = this.data.lovercardtypeData.selected
           newdata.spouse_birthday = this.data.loverbirthDate.datelong
+          newdata.nation = this.data.loverCountryData.selected
         }
         newdata.has_spouse = this.data.hasLover?'y':'n'
         newdata.relationship = this.data.taxperson_relativeData.selected
@@ -1511,7 +1533,6 @@ Page({
         newdata.education_period = this.data.childedudegreeData.selected
         newdata.school_country = this.data.schoolCountryData.selected
         newdata.children_nation = this.data.countryData.selected//"中国"
-        newdata.nation = "中国"
         break;
       case 'continuing_education':
         subUrl = 'persontax/v1/continuing-educations'
@@ -1602,16 +1623,16 @@ Page({
           this.showToast('请选择被赡养人证照类型')
           return
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
-          this.showToast('请填写被赡养人证照号')
+          this.showToast('请填写证照号')
           return
         } else if (this.data.isIdCard_older && !format.isIDCardNum(formdata.id_card_no)) {
           this.showToast('被赡养人身份证格式有误')
           return
         }
-        // if (this.data.olderbirthDate.selected.length < 1) {
-        //   this.showToast('请选择被赡养人出生日期')
-        //   return
-        // }
+        if (this.data.olderbirthDate.selected.length < 1) {
+          this.showToast('请选择出生日期')
+          return
+        }
         if (format.getAge(this.data.olderbirthDate.selected) < 60) {
           this.showToast('被赡养人年龄不足60岁,不可申报')
           return
@@ -1620,6 +1641,10 @@ Page({
           this.showToast('被赡养人年龄应大于本人');
           return
         }
+        if (this.data.olderCountryData.selected.length < 1) {
+          this.showToast('请选择国籍')
+          return
+        }
         if (this.data.older_relativeData.selected.length < 1) {
           this.showToast('请选择与纳税人关系')
           return
@@ -1637,8 +1662,8 @@ Page({
         }
         newdata.birthday = this.data.olderbirthDate.datelong
         newdata.relationship = this.data.older_relativeData.selected
-        newdata.id_card_type = '居民身份证' //this.data.oldercardtypeData.selected
-        newdata.nation = "中国"
+        newdata.id_card_type = this.data.oldercardtypeData.selected
+        newdata.nation = this.data.olderCountryData.selected
         break;
       case 'medical_fund':
         subUrl = 'persontax/v1/medical-funds'
@@ -1676,7 +1701,7 @@ Page({
 
         newdata.total_amount = parseFloat(formdata.total_amount)
         newdata.amount_by_person = parseFloat(formdata.amount_by_person)
-        newdata.id_card_type = '居民身份证'//this.data.cardtypeData.selected
+        newdata.id_card_type = this.data.cardtypeData.selected
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.patient_birthday = this.data.commonbirthDate.datelong
         newdata.patient_nation = "中国"
@@ -1778,14 +1803,18 @@ Page({
             }
             newdata.owner_id_card_no = ''
           } else{
+            if (this.data.cardtypeData.selected.length < 1) {
+              this.showToast('请选择证照类型')
+              return
+            }
             if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
               this.showToast('请填写证照号码')
               return
-            } else if (!format.isIDCardNum(formdata.owner_id_card_no)) {
+            } else if (this.data.isIdCard_owner && !format.isIDCardNum(formdata.owner_id_card_no)) {
               this.showToast('身份证格式有误')
               return
             } 
-            newdata.owner_id_card_type = '居民身份证'//this.data.cardtypeData.selected
+            newdata.owner_id_card_type = this.data.cardtypeData.selected
           }
           // if (this.data.rentLocateInfo.address_value[0].length < 1) {
           //   this.showToast('请选择房屋地址')
@@ -1832,6 +1861,10 @@ Page({
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
             this.showToast('请填写配偶姓名')
             return
+          } 
+          if (this.data.lovercardtypeData.selected.length < 1) {
+            this.showToast('请选择配偶证照类型')
+            return
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             return
@@ -1842,10 +1875,14 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
+          if (this.data.loverCountryData.selected.length < 1) {
+            this.showToast('请选择配偶国籍')
+            return
+          }
           newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
           newdata.id_card_type = this.data.lovercardtypeData.selected
           newdata.birthday = this.data.loverbirthDate.datelong
-          newdata.nation = "中国"
+          newdata.nation = this.data.loverCountryData.selected
         }
         newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
         break;
@@ -1943,6 +1980,11 @@ Page({
           return;
         }
         break;
+      case 'owner_id_card_no_input':
+        if (!this.data.isIdCard_owner) {
+          return;
+        }
+        break;
     }
     var idCardNo = e.detail.value
     if (e.detail.value.length == 18) {
@@ -1974,11 +2016,16 @@ Page({
           return;
         }
         break;
+      case 'owner_id_card_no_input':
+        if (!this.data.isIdCard_owner) {
+          return;
+        }
+        break;
     }
     var idCardNo = e.detail.value
     if (!idCardNo.length) {
       wx.showToast({
-        title: '请输入身份证号',
+        title: '请输入证照号码',
         icon: 'none'
       })
       return;
@@ -2124,6 +2171,7 @@ Page({
   },
 
   dealCardType: function (new_type,witch) {
+    console.log('new_type', new_type)
     var is_idcard, cardtypeData, countryData, birthDate
     switch (witch) {
       case 'childrencardtype':
@@ -2141,6 +2189,15 @@ Page({
         cardtypeData = this.data.oldercardtypeData
         birthDate = this.data.olderbirthDate
         break;
+      case 'ownercardtype':
+        cardtypeData = this.data.cardtypeData
+        cardtypeData.selected = new_type
+        this.setData({
+          cardtypeData: cardtypeData,
+          isIdCard_owner: ('居民身份证' == new_type),
+        })
+        return;
+        break;
     }
     
     cardtypeData.selected = new_type
@@ -2165,7 +2222,7 @@ Page({
       countryData.selected = ''
       countryData.values = this.countrys ? this.countrys : []
       countryData.disabled = false
-    }
+    } 
     switch (witch) {
       case 'childrencardtype':
         this.setData({
@@ -2192,6 +2249,28 @@ Page({
         }) 
         break;
     }
+    if (countryData.values && countryData.values.length < 1) {
+      console.log('-----countrys  还未加载完成 ')
+      var that = this, setData = {}
+      this.getCountry(function (countrys){
+        console.log('-----countrys  加载完成 ', witch)
+        switch (witch) {
+          case 'childrencardtype':
+            that.data.countryData.values = countrys
+            setData.countryData = that.data.childrencardtypeData
+            break;
+          case 'lovercardtype':
+            that.data.loverCountryData.values = countrys
+            setData.loverCountryData = that.data.loverCountryData
+            break;
+          case 'oldercardtype':
+            that.data.olderCountryData.values = countrys
+            setData.olderCountryData = that.data.olderCountryData
+            break;
+        }
+        that.setData(setData)
+      })
+    }
    
   },
   onPickerSelect: function(e) {
@@ -2527,12 +2606,15 @@ Page({
           return
         }
         break;
-      case 'cardtype':
-        var cardtype_Data = this.data.cardtypeData
-        cardtype_Data.selected = cardtype_Data.values[e.detail.value]
-        this.setData({
-          cardtypeData: cardtype_Data
-        })
+      case 'ownercardtype':
+        var cardtypeData = this.data.cardtypeData
+        var new_type = cardtypeData.values[e.detail.value]
+        if (new_type != cardtypeData.selected) {
+          this.dealCardType(new_type, 'ownercardtype')
+          this.setData({
+            owner_id_card_no: ""
+          })
+        }
         break;
       case 'identify_type':
         var identifytype_Data = this.data.identifytypeData

@@ -13,7 +13,7 @@
           <text class='text_777_30 float_left' style='line-height: 90rpx'>子女证照号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"  hidden='{{!isIdCard_child}}'></image>
-            <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' value='{{children_id_card_no}}' bindinput="idChange" bindblur="idDone" id='children_id_card_no_input'></input>
+            <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' value='{{children_id_card_no}}' bindinput="idChange" bindblur="idDone" id='children_id_card_no_input'></input>
           </view>
           <!-- <view wx:else>
               <input class='input_wrap' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
@@ -138,7 +138,7 @@
     <text class='text_777_30 float_left'>被赡养人证照号码</text>
     <view>
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no" hidden='{{!isIdCard_older}}'></image>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入或拍摄身份证' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" bindblur="idDone" id="older_id_card_no_input"></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" bindblur="idDone" id="older_id_card_no_input"></input>
     </view>
   </view>
   <view class='divide_line_30'></view>
@@ -176,7 +176,7 @@
     <text class='text_777_30 float_left'>病人证照号码</text>
     <view>
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="medical_id_card_no"></image>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;color:#000;' placeholder='请输入或拍摄身份证' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;color:#000;' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
     </view>
   </view>
   <view class='divide_line_30'></view>
@@ -308,8 +308,8 @@
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>证照号码</text>
         <view>
-          <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"></image>
-          <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入或拍摄身份证' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
+          <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"  hidden='{{!isIdCard_owner}}'></image>
+          <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" bindblur="idDone"  id='owner_id_card_no_input'></input>
         </view>
       </view>
     </view>
@@ -368,7 +368,7 @@
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view>
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{hasGetLover || !isIdCard_lover}}' id="spouse_id_card_no"></image>
-        <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange"  bindblur="idDone" id='spouse_id_card_no_input' disabled='{{hasGetLover}}'></input>
+        <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange"  bindblur="idDone" id='spouse_id_card_no_input' disabled='{{hasGetLover}}'></input>
       </view>
     </view>
     <view class='divide_line_30'></view>