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

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/addinfo/addinfo.js
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/editinfo/editinfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @7bb55a1
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @7bb55a1
@@ -232,11 +232,11 @@ Page({
     },
     cardtypeData: {
       label: '证照类型',
-      isrequre: true,
+      // isrequre: true,
       bindtype: 'ownercardtype',
       selected: '',
       // disabled: true,
-      isblack: 'true',
+      // isblack: 'true',
       placeholder: '证照类型',
       values: cardTypeArray,
       //["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
@@ -903,6 +903,12 @@ Page({
             this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input')
           }
         }
+        var loverbirthDate = this.data.loverbirthDate
+        loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
+        loverbirthDate.datelong = data.spouse_birthday
+        setData.loverbirthDate = loverbirthDate
+        this.data.loverCountryData.selected = data.nation
+        setData.loverCountryData = this.data.loverCountryData
         this.setData(setData)
         break;
       case 'continuing_education':
@@ -1810,23 +1816,23 @@ Page({
             this.showToast('请选择出租方类型')
             return
           } else if (!formdata.owner_name || formdata.owner_name.length < 1) {
-            this.showToast('请填写出租方名称')
-            return
+            // this.showToast('请填写出租方名称')
+            // return
           } 
           if (this.data.leasetypeData.selected =='组织'){
             if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
-              this.showToast('请填写统一社会信用代码')
-              return
+              // this.showToast('请填写统一社会信用代码')
+              // return
             }
             newdata.owner_id_card_no = ''
           } else{
             if (this.data.cardtypeData.selected.length < 1) {
-              this.showToast('请选择证照类型')
-              return
+              // this.showToast('请选择证照类型')
+              // return
             }
             if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
-              this.showToast('请填写证照号码')
-              return
+              // this.showToast('请填写证照号码')
+              // return
             } else if (this.data.isIdCard_owner && !format.isIDCardNum(formdata.owner_id_card_no)) {
               this.showToast('身份证格式有误')
               return
@@ -2288,7 +2294,7 @@ Page({
         switch (witch) {
           case 'childrencardtype':
             that.data.countryData.values = countrys
-            setData.countryData = that.data.childrencardtypeData
+            setData.countryData = that.data.countryData
             break;
           case 'lovercardtype':
             that.data.loverCountryData.values = countrys
@@ -2513,7 +2519,8 @@ Page({
             this.showToast('请先完善子女生日信息')
             return
           } else{
-            var year = this.data.commonbirthDate.selected.substring(0, 4) - 3
+            var year = this.data.commonbirthDate.selected.substring(0, 4) 
+            year = parseInt(year) + 3
             var month = this.data.commonbirthDate.selected.substring(4, 7)
             this.handleStartDate(year+month, true)  //处理受教育时间起的逻辑
           }
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @7bb55a1
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @7bb55a1
@@ -291,22 +291,22 @@
       <template is="picker_cell_normal" data="{{...leasetypeData}}" />
       <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text class='red_star_right_10'>*</text>
-        <text class='text_777_30 float_left'>出租方名称</text>
+        <!-- <text class='red_star_right_10'>*</text> -->
+        <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='owner_name' value='{{owner_name}}'></input>
       </view>
       <view class='divide_line_30' hidden="{{leasetypeData.selected == '个人'}}"></view>
       <view style='height:90rpx' hidden="{{leasetypeData.selected == '个人'}}">
-        <text class='red_star_right_10'>*</text>
-        <text class='text_777_30 float_left'>统一社会信用代码</text>
+        <!-- <text class='red_star_right_10'>*</text> -->
+        <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='owner_credit_no' value='{{owner_credit_no}}'></input>
       </view>
       <view class='divide_line_30'  hidden="{{leasetypeData.selected == '组织'}}"></view>
       <template is="picker_cell_normal" data="{{...cardtypeData}}"/>
       <view class='divide_line_30'  hidden="{{leasetypeData.selected == '组织'}}"></view>
       <view style='height:90rpx'  hidden="{{leasetypeData.selected == '组织'}}">
-        <text class='red_star_right_10'>*</text>
-        <text class='text_777_30 float_left'>证照号码</text>
+        <!-- <text class='red_star_right_10'>*</text> -->
+        <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>
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @7bb55a1
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @7bb55a1
@@ -55,17 +55,17 @@ Page({
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
-    genderData: {
-      label: '性别',
-      bindtype: 'gender',
-      isrequre: true,
-      // disabled: true,
-      selected: '',
-      placeholder: '请选择性别',
-      // placeholder: '性别',
-      values: ["男", "女"],
-      onChange: 'onPickerSelect'
-    },
+    // genderData: {
+    //   label: '性别',
+    //   bindtype: 'gender',
+    //   isrequre: true,
+    //   // disabled: true,
+    //   selected: '',
+    //   placeholder: '请选择性别',
+    //   // placeholder: '性别',
+    //   values: ["男", "女"],
+    //   onChange: 'onPickerSelect'
+    // },
     countryData: {
       label: '国籍',
       bindtype: 'country',
@@ -183,11 +183,11 @@ Page({
     var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
     this.data.relativeData.selected = tax_info.family_ties
-    this.data.genderData.selected = tax_info.gender
+    // this.data.genderData.selected = tax_info.gender
     this.data.countryData.selected = tax_info.native
     if (isDisable){//否的话受证照类型控制
       this.data.birthDate.disabled = true
-      this.data.genderData.disabled = true
+      // this.data.genderData.disabled = true
     }
     this.data.forignerInfo.selected = tax_info.is_overseas_personnel
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
@@ -204,7 +204,7 @@ Page({
       long_birth_date: tax_info.birth_date,
       birthDate: this.data.birthDate,
       mobile: tax_info.mobile,
-      genderData: this.data.genderData,
+      // genderData: this.data.genderData,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: tax_info.id_card_no,
       countryData: this.data.countryData,
@@ -245,7 +245,7 @@ Page({
           var cardtype_Data = that.data.cardtypeData
           cardtype_Data.selected = '居民身份证'
           // cardtypeData.selected_code = '1'
-          var gender_Data = that.data.genderData
+          // var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
           that.data.birthDate.selected = birth_day
@@ -263,7 +263,7 @@ Page({
             name: id_info.name,
             birthday: birth_day,
             cardtypeData: cardtype_Data,
-            genderData: gender_Data,
+            // genderData: gender_Data,
             long_birth_date: Date.parse(new Date(birth_day)) / 1000,
             birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
@@ -286,11 +286,11 @@ Page({
     if ('居民身份证' == new_type) {
       is_idcard = true
-      this.data.genderData.disabled = true
+      // this.data.genderData.disabled = true
       this.data.birthDate.disabled = true
     } else {
       is_idcard = false
-      this.data.genderData.disabled = false
+      // this.data.genderData.disabled = false
       this.data.birthDate.disabled = false
     }
     this.data.forignerInfo.selected = '是'
@@ -313,7 +313,7 @@ Page({
     this.setData({
       isIdCard: is_idcard,
       birthDate: this.data.birthDate,
-      genderData: this.data.genderData,
+      // genderData: this.data.genderData,
       countryData: this.data.countryData,
       cardtypeData: this.data.cardtypeData,
       forignerInfo: this.data.forignerInfo
@@ -353,13 +353,13 @@ Page({
           })
         }
         break;
-      case 'gender':
-        var gender_data = this.data.genderData
-        gender_data.selected = gender_data.values[e.detail.value]
-        this.setData({
-          genderData: gender_data
-        })
-        break;
+      // case 'gender':
+      //   var gender_data = this.data.genderData
+      //   gender_data.selected = gender_data.values[e.detail.value]
+      //   this.setData({
+      //     genderData: gender_data
+      //   })
+      //   break;
       case 'country':
         var countryData = this.data.countryData
         var new_country = countryData.values[e.detail.value]
@@ -430,26 +430,26 @@ Page({
       // this.showtoast('请输入正确姓名');
       // return
     }
-    if (this.data.genderData.selected.length < 1) {
-      this.showtoast('请选择性别');
-      return
-    }else {
-      if (this.data.genderData.selected == '男') {
-        if (rel == '女') {
-          this.showtoast('关系和性别冲突');
-          return
-        }
-      } else {
-        if (rel == '子') {
-          this.showtoast('关系和性别冲突');
-          return
-        }
-      }
-      if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
-        this.showtoast('关系和性别冲突');
-        return
-      }
-    }
+    // if (this.data.genderData.selected.length < 1) {
+    //   this.showtoast('请选择性别');
+    //   return
+    // }else {
+    //   if (this.data.genderData.selected == '男') {
+    //     if (rel == '女') {
+    //       this.showtoast('关系和性别冲突');
+    //       return
+    //     }
+    //   } else {
+    //     if (rel == '子') {
+    //       this.showtoast('关系和性别冲突');
+    //       return
+    //     }
+    //   }
+    //   if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
+    //     this.showtoast('关系和性别冲突');
+    //     return
+    //   }
+    // }
     // if (!formdata.age) {
     //   this.showtoast('请填写年龄');
     //   return
@@ -501,7 +501,7 @@ Page({
         "id_card_type": that.data.cardtypeData.selected,//_code,
         "id_card_no": that.data.card_number,
         "name": name,
-        "gender": that.data.genderData.selected,
+        // "gender": that.data.genderData.selected,
         "mobile": formdata.mobile,
         // "age": formdata.age ? formdata.age : '',
         "birth_date": that.data.long_birth_date,
@@ -536,9 +536,9 @@ Page({
     var name = this.data.name.length > 0 ? this.data.name : formdata.name;
     var cardtype = this.data.cardtypeData.selected;
     var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
-    var gender = this.data.genderData.selected;
+    // var gender = this.data.genderData.selected;
     var birth_day = this.data.birthDate.selected;
-    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
+    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && birth_day == this.data.birthday) {//&& gender == iddata.gender 
       return 'active'
     } else {
       return ''
@@ -565,13 +565,13 @@ Page({
         birthDate: this.data.birthDate
       })
     }
-    if (info.sex) {
-      var gender_data = this.data.genderData
-      gender_data.selected = info.sex
-      this.setData({
-        genderData: gender_data
-      })
-    }
+    // if (info.sex) {
+    //   var gender_data = this.data.genderData
+    //   gender_data.selected = info.sex
+    //   this.setData({
+    //     genderData: gender_data
+    //   })
+    // }
   },
   idChange: function (e) {
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @7bb55a1
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @7bb55a1
@@ -39,8 +39,8 @@
         </view>
         <view class="divide_line_30"></view>
-        <template is="picker_cell_normal" data="{{...genderData}}" />
-        <view class="divide_line_30"></view>
+        <!-- <template is="picker_cell_normal" data="{{...genderData}}" />
+        <view class="divide_line_30"></view> -->
         <template is="picker_cell_normal" data="{{...birthDate}}" />
         <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @7bb55a1
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @7bb55a1
@@ -85,7 +85,7 @@ Page({
       isrequre: true,
       label: '出生国家（地区）',
       bindtype: 'brith_country',
-      placeholder: '请选择国籍',
+      placeholder: '请选择出生国家（地区）',
       onChange: 'onPickerSelect',
     },
     taxpayerTypeData: {
@@ -1336,20 +1336,20 @@ Page({
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
-        "other_name": that.data.other_name,
+        "other_name": that.data.hasOtherCard ? that.data.other_name : '',
         "family_ties": '本人',//that.data.relativeData.selected,
         "native": that.data.countryData.selected,
         "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
         "is_overseas_personnel": that.data.overseas,
-        'birth_native': that.data.birthCountryData.selected,
+        'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
-        "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
-        "other_id_card_no": formdata.other_card_number,
+        "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
+        "other_id_card_no": that.data.hasOtherCard ? formdata.other_card_number : '',
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
-        "first_entry_date": that.data.firstEntryDate.datelong,
-        "predict_leave_date": that.data.predictLeaveDate.datelong,
+        "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,
+        "predict_leave_date": that.data.hasOtherCard ? that.data.predictLeaveDate.datelong : null,
         "mobile": that.data.mobile,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail,