Merge branch 'dev_py' into dev2.0

 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
 var format = require('../../../../utils/util.js');
-var countryInfo = require('../../../../utils/country.js');
+// var countryInfo = require('../../../../utils/country.js');
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
@@ -384,7 +384,7 @@ Page({
       selected: '',
       isrequre: true,
       isblack: 'true',
-      values: ["企业", "个人"],
+      values: ["组织", "个人"],
       placeholder: '请选择出租方类型',
       onChange: 'onPickerSelect'
     },
@@ -557,10 +557,14 @@ Page({
       //   deduction_amount = Deduce_amounts_year[nameKey] ? Deduce_amounts_year[nameKey] : 0
     }
     if ("children_education" == options.status) {
-      this.loadCountry()
+      this.getCountry()
       if (options.isedit != 'true'){
         this.getTaxList()
       }
+      this.data.taxperson_relativeData.values = ['子','女']
+      this.setData({
+        taxperson_relativeData: this.data.taxperson_relativeData
+      })
     } else if ("continuing_education" == options.status) {
       this.getCertificates()
       var studystart_date = this.data.studystartdate
@@ -722,16 +726,56 @@ Page({
       }
     })
   },
-  loadCountry: function() {
-    countryInfo.init(this)
-    var countrylist = this.data.country
-    var country_data = this.data.schoolCountryData
-    for (var i = 0; i < countrylist.length; i++) {
-      country_data.values.push(countrylist[i].name)
-    }
-    console.log("countrydata", country_data)
-    this.setData({
-      schoolCountryData: country_data
+  // loadCountry: function() {
+  //   countryInfo.init(this)
+  //   var countrylist = this.data.country
+  //   var country_data = this.data.schoolCountryData
+  //   for (var i = 0; i < countrylist.length; i++) {
+  //     country_data.values.push(countrylist[i].name)
+  //   }
+  //   console.log("countrydata", country_data)
+  //   this.setData({
+  //     schoolCountryData: country_data
+  //   })
+  // },
+
+  //****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading()
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        var countrys = res.data.concat()
+        if (countrys.indexOf('中国') > -1) {
+          countrys.splice(countrys.indexOf('中国'), 1);
+        }
+        if (countrys.indexOf('中国台湾') > -1) {
+          countrys.splice(countrys.indexOf('中国台湾'), 1);
+        }
+        if (countrys.indexOf('香港') > -1) {
+          countrys.splice(countrys.indexOf('香港'), 1);
+        }
+        if (countrys.indexOf('澳门') > -1) {
+          countrys.splice(countrys.indexOf('澳门'), 1);
+        }
+        // that.data.countryData.values = countrys
+        that.data.schoolCountryData.values = res.data
+        that.countrys = countrys
+        that.setData({
+          // countryData: that.data.countryData,
+          schoolCountryData: that.data.schoolCountryData
+        })
+      },
+      complete() {
+        wx.hideLoading()
+      }
     })
   },
   handlEditData: function (data) {
@@ -741,6 +785,10 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
+        if (data.relationship && data.relationship.length) {
+          this.data.taxperson_relativeData.selected = data.relationship
+          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
@@ -753,9 +801,11 @@ Page({
         studystartdate.datelong = data.education_start
         setData.studystartdate = studystartdate
         var studyEndDate = this.data.studyEndDate
-        studyEndDate.selected = format.formatTime_month(data.education_end)
-        studyEndDate.datelong = data.education_end
-        setData.studyEndDate = studyEndDate
+        if (data.education_end > 0) {
+          studyEndDate.selected = format.formatTime_month(data.education_end)
+          studyEndDate.datelong = data.education_end
+          setData.studyEndDate = studyEndDate
+        }
         var studyPeriodDate = this.data.studyPeriodDate
         if (data.education_period_end > 0){
           studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
@@ -937,7 +987,7 @@ Page({
           })
           var leasetype_Data = this.data.leasetypeData
           leasetype_Data.selected = data.owner_type
-          this.data.cardtypeData.hidden = data.owner_type == "企业"
+          this.data.cardtypeData.hidden = data.owner_type == "组织"
           setData.leasetypeData = leasetype_Data,
           setData.cardtypeData = this.data.cardtypeData
           setData.owner_name = data.owner_name
@@ -1057,6 +1107,11 @@ Page({
         if (data.name && data.name.length) {
           setData.children_name = data.name
         }
+        if (data.family_ties && data.family_ties.length) {
+          var taxperson_relativeData = this.data.taxperson_relativeData
+          taxperson_relativeData.selected = data.family_ties
+          setData.taxperson_relativeData = taxperson_relativeData
+        }
         this.setData(setData)
         break;
       case 'support_duty':
@@ -1327,6 +1382,11 @@ Page({
         //   this.showToast('请选择子女出生日期')
         //   return
         // }
+
+        if (this.data.taxperson_relativeData.selected.length < 1) {
+          this.showToast('请选择与纳税人关系')
+          return
+        }
         if (this.data.childrenpercentData.selected.length < 1) {
           this.showToast('请选择分配比例')
           return
@@ -1654,7 +1714,7 @@ Page({
             this.showToast('请填写出租方名称')
             return
           } 
-          if (this.data.leasetypeData.selected=='企业'){
+          if (this.data.leasetypeData.selected =='组织'){
             if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
               this.showToast('请填写统一社会信用代码')
               return
@@ -2276,7 +2336,7 @@ Page({
       case 'lease_type':
         var leasetype_Data = this.data.leasetypeData
         leasetype_Data.selected = leasetype_Data.values[e.detail.value]
-        this.data.cardtypeData.hidden = leasetype_Data.selected == "企业"
+        this.data.cardtypeData.hidden = leasetype_Data.selected == "组织"
         this.setData({
           leasetypeData: leasetype_Data,
           cardtypeData: this.data.cardtypeData

@@ -33,6 +33,8 @@
           <text class='text_777_30 float_left'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
         </view>
+        <view class='divide_line_30'></view>
+        <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
       </view>
 
       <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>

@@ -38,6 +38,7 @@ Page({
     },
     cardtypeData: {
       isrequre: true,
+      disabled: true,
       label: '证照类型',
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
@@ -242,7 +243,7 @@ Page({
             // birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
-          // that.dealIdInfo(id_info.id_card_number)
+          that.dealIdInfo(id_info.id_card_number)
         }
       },
     })

@@ -27,7 +27,7 @@
              <input class='input_wrap' placeholder='请输入或拍摄身份证'  placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard' ></input>
           </view>
           <view wx:else>
-            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='30' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
+            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='30' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
         <view class="divide_line_30"></view>