Merge branch '机器人_py' into 机器人dev

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/editinfo/editinfo.js
pages/main/taxperson/editinfo/editinfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @230fd5e
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @230fd5e
@@ -135,8 +135,6 @@ Page({
       placeholder: '出生日期',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
-      end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
     childedudegreeData: {
@@ -252,8 +250,6 @@ Page({
       placeholder: '出生日期',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
-      end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
     beforemarryData: {
@@ -298,7 +294,6 @@ Page({
       mode: "date",
       fields: "month",
       datelong: 0,
-      start: '1970-01-01',
       end: (new Date()).getFullYear() +'-'+ ((new Date()).getMonth()+1),
       // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-09-01',
@@ -315,7 +310,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "month",
-      start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-09-01',
       // onTap: 'studyDataTap'
@@ -330,7 +324,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "month",
-      start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-07-31',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-07-31',
       // onTap: 'studyDataTap',
@@ -347,7 +340,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
       datelong: 0,
     },
     identifytypeData: {
@@ -434,7 +426,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
       datelong: 0,
     },
     firstpaybackDate_2: {
@@ -448,7 +439,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
       datelong: 0,
     },
     leasestartDate: {
@@ -462,7 +452,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
       datelong: 0,
     },
     leaseendDate: {
@@ -476,7 +465,6 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      start: '1970-01-01',
       datelong: 0,
     },
     loandatelongData: {
@@ -496,7 +484,7 @@ Page({
       // selected: '中国',
       // isblack: 'true',
       values: [],
-      // placeholder: '中国',
+      placeholder: '请选择就读国家(地区)',
       onChange: 'onPickerSelect',
     },
     countryData: {
@@ -726,6 +714,7 @@ Page({
           if (data.name && data.name.length) {
             setData.spouse_name = data.name
           }
+          that.dealCardType(data.id_card_type, 'lovercardtype')
           that.data.lovercardtypeData.selected = data.id_card_type
           setData.lovercardtypeData = that.data.lovercardtypeData
           if (data.id_card_no && data.id_card_no.length) {
@@ -734,11 +723,11 @@ Page({
               that.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
             }
           }
-          that.data.loverbirthDate.selected = format.formatTime_date(data.birth_date)
+          that.data.loverbirthDate.selected = data.birth_date_str//format.formatTime_date(data.birth_date)
           that.data.loverbirthDate.datelong = data.birth_date
           setData.loverbirthDate = that.data.loverbirthDate
           that.data.loverCountryData.selected = data.native
-          that.data.loverCountryData.disabled = true
+          // that.data.loverCountryData.disabled = true
           setData.loverCountryData = that.data.loverCountryData
           that.setData(setData)
         }
@@ -1029,6 +1018,12 @@ Page({
           setData.spouse_name = data.spouse_name
         }
         this.dealCardType(data.id_card_type, 'lovercardtype')
+        var loverbirthDate = this.data.loverbirthDate
+        loverbirthDate.selected = format.formatTime_date(data.birthday)//(data.spouse_birthday)
+        loverbirthDate.datelong = data.spouse_birthday
+        setData.loverbirthDate = loverbirthDate
+        this.data.loverCountryData.selected = data.nation
+        setData.loverCountryData = this.data.loverCountryData
         if (data.id_card_no && data.id_card_no.length) {
           setData.spouse_id_card_no = data.id_card_no
           if ('居民身份证' == data.id_card_type) {
@@ -1171,7 +1166,7 @@ Page({
         this.data.countryData.selected = data.native
         setData.countryData = this.data.countryData
         var commonbirthDate = this.data.commonbirthDate
-        commonbirthDate.selected = format.formatTime_date(data.birth_date)
+        commonbirthDate.selected = data.birth_date_str//format.formatTime_date(data.birth_date)
         commonbirthDate.datelong = data.birth_date
         setData.commonbirthDate = commonbirthDate
         if (data.id_card_no && data.id_card_no.length) {
@@ -1194,9 +1189,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.selected = data.birth_date_str//format.formatTime_date(data.birth_date)
         olderbirthDate.datelong = data.birth_date
         setData.olderbirthDate = olderbirthDate
+        this.data.olderCountryData.selected = data.native
+        setData.olderCountryData = this.data.olderCountryData
         if (data.name && data.name.length) {
           setData.supported_name = data.name
         }
@@ -1309,6 +1306,7 @@ Page({
               children_name: id_info.name,
               commonbirthDate: that.data.commonbirthDate
             }
+            that.dealBrithDate(info.birthDay)//根据出生日期 计算 学前受教育时间
             if (format.getAge(birth_day) < 3) {
               that.showToast('子女年龄小于3岁,不可申报')
             }
@@ -2114,6 +2112,15 @@ Page({
         break;
     }
   },
+  //根据出生日期 计算 学前受教育时间
+  dealBrithDate: function (birthDay){
+    if (this.data.childedudegreeData.selected == '学前教育阶段') {
+      var year = birthDay.substring(0, 4)
+      year = parseInt(year) + 3
+      var month = birthDay.substring(4, 7)
+      this.handleStartDate(year + month, true)  //处理受教育时间起的逻辑
+    }
+  },
   //根据身份证号码，获取相关信息
   dealIdInfo: function (idCardNum, idcard_belong) {
     var info = format.analyzeIDCard(idCardNum)
@@ -2125,6 +2132,7 @@ Page({
       data = {
         commonbirthDate: this.data.commonbirthDate
       }
+      this.dealBrithDate(info.birthDay)//根据出生日期 计算 学前受教育时间
       if (info.age<3){
         this.showToast('子女年龄小于3岁,不可申报')
       }
@@ -2464,6 +2472,7 @@ Page({
       case 'commonbirthday':
         var children_birthDate = this.data.commonbirthDate
         children_birthDate.selected = e.detail.value
+        this.dealBrithDate(e.detail.value)//根据出生日期 计算 学前受教育时间
         children_birthDate.datelong = (Date.parse(new Date(e.detail.value)) / 1000)
         this.setData({
           commonbirthDate: children_birthDate
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @230fd5e
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @230fd5e
@@ -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' 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>
@@ -309,7 +309,7 @@
         <text class='text_777_30 float_left head_in'>证照号码</text>
         <view>
           <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>
+          <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18'   name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" bindblur="idDone"  id='owner_id_card_no_input'></input>
         </view>
       </view>
     </view>
@@ -359,7 +359,7 @@
     <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶姓名</text>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}' disabled='{{hasGetLover}}'></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input><!-- disabled='{{hasGetLover}}' -->
     </view>
     <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
@@ -367,8 +367,8 @@
     <view style='height:90rpx'>
       <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>
+        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{!isIdCard_lover}}' id="spouse_id_card_no"></image><!--  hidden='{{hasGetLover || !isIdCard_lover}}' -->
+        <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' value='{{spouse_id_card_no}}' bindinput="idChange"  bindblur="idDone" id='spouse_id_card_no_input'></input><!-- disabled='{{hasGetLover}}' -->
       </view>
     </view>
     <view class='divide_line_30'></view>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @230fd5e
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @230fd5e
@@ -1230,19 +1230,33 @@ Page({
       this.showtoast('手机号码有误');
       return
     }
+    if (formdata.current_address_detail.length > 0 && this.data.currentaddressInfo.selected.length < 1) {
+      this.showtoast('请选择居住地址');
+      return
+    }
     if (this.data.curAddress_haschanged) {//选择了地址 || this.data.taxInfo.current_address.province_code
       if (formdata.current_address_detail.length < 1) {
         this.showtoast('请填写详细居住地址');
         return
       }
     }
+    if (formdata.huji_address_detail.length > 0 && this.data.birthaddressInfo.selected.length < 1) {
+      this.showtoast('请选择户籍地址');
+      return
+    }
     if (this.data.birthAddress_haschanged) {//选择了地址 || this.data.taxInfo.huji_address.province_code
       if (formdata.huji_address_detail.length < 1) {
         this.showtoast('请填写详细户籍地址');
         return
       }
     }
-    if (this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
+    if (this.data.hasOtherCard && formdata.contact_address_detail.length > 0) {
+      if (this.data.contactaddressInfo.selected.length < 1) {
+        this.showtoast('请选择联系地址');
+        return
+      }
+    }
+    if (this.data.hasOtherCard && this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
       if (formdata.contact_address_detail.length < 1) {
         this.showtoast('请填写详细联系地址');
         return
@@ -1256,21 +1270,17 @@ Page({
     //   this.showtoast('邮箱格式有误');
     //   return
     // }
+    if (this.data.bankInfo.selected.length > 0 && formdata.bank_account.length < 1) {
+      this.showtoast('请输入银行卡号')
+      return
+    }
     if (formdata.bank_account && formdata.bank_account.length > 0) {
       if (!format.banknoCheck(formdata.bank_account)){
-        wx.showToast({
-          title: '银行卡号格式有误',
-          duration: 2000,
-          icon: 'none'
-        })
+        this.showtoast('银行卡号格式有误')
         return
       }
       if (!this.data.bankInfo.selected) {
-        wx.showToast({
-          title: '请选择开户银行',
-          duration: 2000,
-          icon: 'none'
-        })
+        this.showtoast('请选择开户银行')
         return
       }
     }
@@ -1370,8 +1380,8 @@ Page({
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
-        "contact_address": request_contact_address,
-        "contact_address_detail": formdata.contact_address_detail,
+        "contact_address": that.data.hasOtherCard ? request_contact_address : {},
+        "contact_address_detail": that.data.hasOtherCard ? formdata.contact_address_detail: '',
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @230fd5e
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @230fd5e
@@ -29,7 +29,7 @@
           <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
           <view>
             <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}"></image>
-            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='30' bindblur='idcardblur' bindinput = 'bindinputcardnum' type="{{isIdCard.length?'idcard':''}}"></input>
+            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='30' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
             <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
             <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
              <view class="divide_line_30"></view>