居民身份证。改成汉字

@@ -1374,13 +1374,13 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
-          newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
+          newdata.spouse_id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
           newdata.spouse_birthday = this.data.loverbirthDate.datelong
         }
         newdata.has_spouse = this.data.hasLover?'y':'n'
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.percent = this.data.childrenpercentData.selected.replace("%","")
-        newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
+        newdata.children_id_card_type = '居民身份证' //this.data.childrencardtypeData.selected
         newdata.children_birthday = this.data.commonbirthDate.datelong
         newdata.education_period_end = this.data.studyPeriodDate.datelong
         newdata.education_end = this.data.studyEndDate.datelong
@@ -1514,7 +1514,7 @@ Page({
         }
         newdata.birthday = this.data.olderbirthDate.datelong
         newdata.relationship = this.data.older_relativeData.selected
-        newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
+        newdata.id_card_type = '居民身份证' //this.data.oldercardtypeData.selected
         newdata.nation = "中国"
         break;
       case 'medical_fund':
@@ -1553,7 +1553,7 @@ Page({
 
         newdata.total_amount = parseFloat(formdata.total_amount)
         newdata.amount_by_person = parseFloat(formdata.amount_by_person)
-        newdata.id_card_type = '1'//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 = "中国"
@@ -1662,7 +1662,7 @@ Page({
               this.showToast('身份证格式有误')
               return
             } 
-            newdata.owner_id_card_type = '1'//this.data.cardtypeData.selected
+            newdata.owner_id_card_type = '居民身份证'//this.data.cardtypeData.selected
           }
           // if (this.data.rentLocateInfo.address_value[0].length < 1) {
           //   this.showToast('请选择房屋地址')
@@ -1720,7 +1720,7 @@ Page({
             return
           }
           newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
-          newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
+          newdata.id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
           newdata.birthday = this.data.loverbirthDate.datelong
           newdata.nation = "中国"
         }

@@ -2,10 +2,7 @@
 var app = getApp();
 var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
-// const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
-const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
-const cardTypes8 = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
-
+const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 
 Page({
   cur_id:null,
@@ -44,9 +41,9 @@ Page({
       label: '证照类型',
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
-      values: cardTypeDicts,
+      values: cardTypeArray8,
       // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
-      range_key: 'name',
+      // range_key: 'name',
       onChange: 'onPickerSelect'
     },
     forignerInfo: {
@@ -183,7 +180,7 @@ Page({
       age: tax_info.age,
       mobile: tax_info.mobile,
       genderData: this.data.genderData,
-      isIdCard: '1' == tax_info.id_card_type ? true : false,
+      isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: tax_info.id_card_no,
       countryData: this.data.countryData
     })
@@ -221,7 +218,7 @@ Page({
           }
           var cardtype_Data = that.data.cardtypeData
           cardtype_Data.selected = '居民身份证'
-          cardtypeData.selected_code = '1'
+          // cardtypeData.selected_code = '1'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
 
@@ -257,74 +254,40 @@ Page({
     })
   },
 
-  dealCardType: function (new_type_code) {
+  dealCardType: function (new_type) {
     var is_idcard = this.data.isIdCard
-    const new_type = cardTypeDicts[parseInt(new_type_code) - 1]['name']
-    this.data.cardtypeData.selected_code = new_type_code
     this.data.cardtypeData.selected = new_type
 
     if ('居民身份证' == new_type) {
       is_idcard = true
       this.data.genderData.disabled = true
-      // this.data.birthDate.disabled = true
     } else {
       is_idcard = false
       this.data.genderData.disabled = false
-      // this.data.birthDate.disabled = false
     }
-    // this.data.hasOtherCard = true
     this.data.overseas = '否'
-    // this.data.taxpayerTypeData.disabled = false
-    // this.data.taxpayerTypeData.selected = ''
     if ('居民身份证' == new_type || '中国护照' == new_type) {
       this.data.countryData.selected = '中国'
       this.data.countryData.disabled = true
-      // this.data.hasOtherCard = false
-      // this.data.taxpayerTypeData.selected = '居民'
-      // this.data.taxpayerTypeData.disabled = true
     } else if (new_type.indexOf("港澳") != -1) {
       this.data.countryData.values = ['中国香港', '中国澳门']
       this.data.countryData.selected = ''
       this.data.countryData.disabled = false
-      // this.data.nameText = '英文名'
-      // if (new_type.indexOf('通行证') != -1) {
-      //   this.data.otherCardtypeData.values = [{ 'code': '4', 'name': '港澳居民居住证' }];
-      // } else {
-      //   this.data.otherCardtypeData.values = [{ 'code': '3', 'name': '港澳居民来往内地通行证' }];
-      // }
     } else if (new_type.indexOf("台湾") != -1) {
       this.data.countryData.selected = '中国台湾'
       this.data.countryData.disabled = true
-      // this.data.nameText = '英文名'
-      // if (new_type.indexOf('通行证') != -1) {
-      //   this.data.otherCardtypeData.values = [{ 'code': '6', 'name': '台湾居民居住证' }];
-      // } else {
-      //   this.data.otherCardtypeData.values = [{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
-      // }
-
     } else {
       this.data.overseas = '是'
       this.data.countryData.selected = ''
       this.data.countryData.values = this.countrys ? this.countrys : []
       this.data.countryData.disabled = false
-      // this.data.nameText = '中文名'
-      // if (new_type.indexOf("外国护照") != -1) {
-      //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
-      // } else {
-      //   this.data.otherCardtypeData.values = [{ 'code': '7', 'name': '外国护照' }];
-      // }
     }
     this.setData({
       isIdCard: is_idcard,
-      // hasOtherCard: this.data.hasOtherCard,
       genderData: this.data.genderData,
-      // birthDate: this.data.birthDate,
       countryData: this.data.countryData,
       cardtypeData: this.data.cardtypeData,
-      // otherCardtypeData: this.data.otherCardtypeData,
-      // nameText: this.data.nameText,
       overseas: this.data.overseas,
-      // taxpayerTypeData: this.data.taxpayerTypeData
     })
 
 
@@ -344,14 +307,14 @@ Page({
         break;
       case 'cardtype':
         var cardtypeData = this.data.cardtypeData
-        var new_type = cardtypeData.values[e.detail.value]['name']
-        var new_type_code = cardtypeData.values[e.detail.value]['code']
-        // if (new_type != cardtypeData.selected) {
-          this.dealCardType(new_type_code)
+        var new_type = cardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = cardtypeData.values[e.detail.value]['code']
+        if (new_type != cardtypeData.selected) {
+          this.dealCardType(new_type)
           this.setData({
             card_number: ""
           })
-        // }
+        }
         break;
       case 'gender':
         var gender_data = this.data.genderData
@@ -489,7 +452,7 @@ Page({
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "family_ties": that.data.relativeData.selected,
-        "id_card_type": that.data.cardtypeData.selected_code,
+        "id_card_type": that.data.cardtypeData.selected,//_code,
         "id_card_no": that.data.card_number,
         "name": name,
         "gender": that.data.genderData.selected,

@@ -3,8 +3,9 @@ var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 // var countryInfo = require('../../../../utils/country.js');
 // const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
-const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）'}];
-const cardTypes8 = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
+const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+// const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）'}];
+// const cardTypes8 = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
 
 Page({
 
@@ -54,8 +55,8 @@ Page({
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
       selected: '',
-      values: cardTypes8,
-      range_key:'name',
+      values: cardTypeArray8,
+      // range_key:'name',
       // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
       //   '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       // ],
@@ -68,7 +69,7 @@ Page({
       placeholder: '请选择证照类型',
       selected: '',
       values: [],
-      range_key: 'name',
+      // range_key: 'name',
       onChange: 'onPickerSelect'
     },
     countryData: {
@@ -398,17 +399,17 @@ Page({
     }
 
     this.data.personstatusData.selected = tax_info.taxpayer_status
-    this.data.cardtypeData.selected = cardTypeDicts[parseInt(tax_info.id_card_type) - 1]['name']
-    this.data.cardtypeData.selected_code = tax_info.id_card_type
+    this.data.cardtypeData.selected = tax_info.id_card_type //cardTypeDicts[parseInt(tax_info.id_card_type) - 1]['name']
+    // this.data.cardtypeData.selected_code = tax_info.id_card_type
     this.data.card_number = tax_info.id_card_no
 
-    // this.data.otherCardtypeData.selected = cardTypeDicts[parseInt(tax_info.other_id_card_type) - 1]['name']
+    this.data.otherCardtypeData.selected = tax_info.other_id_card_type //cardTypeDicts[parseInt(tax_info.other_id_card_type) - 1]['name']
     // this.data.otherCardtypeData.selected_code = tax_info.other_id_card_type
 
     this.data.other_card_number = tax_info.other_id_card_no
     this.data.overseas = tax_info.is_overseas_personnel
     this.data.countryData.selected = tax_info.native
-    this.data.birthCountryData.selected = tax_info.brith_native
+    this.data.birthCountryData.selected = tax_info.birth_native
     this.data.taxpayerTypeData.selected = tax_info.taxpayer_type =='resident'?'居民':'非居民'
 
     this.data.mobile = tax_info.mobile
@@ -436,7 +437,7 @@ Page({
     this.data.firstEntryDate.selected = (firstEntryDate.indexOf("NaN") == -1) ? firstEntryDate:''
     this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("NaN") == -1) ? predictLeaveDate : ''
 
-    this.data.professionData.selected = tax_info.profession.three_level_name
+    // this.data.professionData.selected = tax_info.profession.three_level_name
 
     this.data.birthDate.end = curdate
     this.data.startDate.end = curdate
@@ -446,7 +447,7 @@ Page({
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     this.data.bankInfo.selected = tax_info.bank
-    // this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
+    this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
     this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
     this.data.employeeInfo.selected = tax_info.is_employee
@@ -485,7 +486,7 @@ Page({
       endDate: this.data.endDate,
       firstEntryDate: this.data.firstEntryDate,
       predictLeaveDate: this.data.predictLeaveDate,
-      isIdCard: '1' == tax_info.id_card_type ? true : false,
+      isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: this.data.card_number,
       other_card_number: this.data.other_card_number,
       countryData: this.data.countryData,
@@ -648,7 +649,7 @@ Page({
 
           var cardtypeData = that.data.cardtypeData
           cardtypeData.selected = '居民身份证'
-          cardtypeData.selected_code = '1'
+          // cardtypeData.selected_code = '1'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
 
@@ -707,11 +708,12 @@ Page({
 
   },
 
-  dealCardType: function (new_type_code){
-    console.log('cardtype_code', new_type_code)
+  dealCardType: function (new_type){
+    // console.log('cardtype_code', new_type_code)
+    console.log('cardtype', new_type)
     var is_idcard = this.data.isIdCard
-    const new_type = cardTypeDicts[parseInt(new_type_code)-1]['name']
-    this.data.cardtypeData.selected_code = new_type_code
+    // const new_type = cardTypeDicts[parseInt(new_type_code)-1]['name']
+    // this.data.cardtypeData.selected_code = new_type_code
     this.data.cardtypeData.selected = new_type
 
     if ('居民身份证' == new_type) {
@@ -741,7 +743,7 @@ Page({
       // if (new_type.indexOf('通行证') != -1){
         // this.data.otherCardtypeData.values = [{ 'code': '4', 'name': '港澳居民居住证'}];
       // }else{
-        this.data.otherCardtypeData.values = [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
+      this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
       // }
     } else if (new_type.indexOf("台湾") != -1) {
       this.data.countryData.selected = '中国台湾'
@@ -750,7 +752,7 @@ Page({
       // if (new_type.indexOf('通行证') != -1) {
         // this.data.otherCardtypeData.values = [{ 'code': '6', 'name': '台湾居民居住证' }];
       // } else {
-        this.data.otherCardtypeData.values = [{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
+      this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
       // }
 
     } else {
@@ -762,7 +764,7 @@ Page({
       // if (new_type.indexOf("外国护照") != -1) {
       //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
       // } else {
-        this.data.otherCardtypeData.values = [{ 'code': '7', 'name': '外国护照' }];
+      this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
       // }
     }
     this.setData({
@@ -794,11 +796,11 @@ Page({
         break;
       case 'cardtype':
         var cardtypeData = this.data.cardtypeData
-        var new_type = cardtypeData.values[e.detail.value]['name']
-        var new_type_code = cardtypeData.values[e.detail.value]['code']
+        var new_type = cardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = cardtypeData.values[e.detail.value]['code']
         var selected = cardtypeData.selected
         if (new_type != selected) {
-          this.dealCardType(new_type_code)
+          this.dealCardType(new_type)
           var setData = { card_number: ''}
           if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
             console.log('外国人', new_type, selected)
@@ -812,12 +814,12 @@ Page({
         break;
       case 'other_cardtype':
         var otherCardtypeData = this.data.otherCardtypeData
-        var new_type = otherCardtypeData.values[e.detail.value]['name']
-        var new_type_code = otherCardtypeData.values[e.detail.value]['code']
+        var new_type = otherCardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = otherCardtypeData.values[e.detail.value]['code']
 
         if (new_type != otherCardtypeData.selected) {
           otherCardtypeData.selected = new_type
-          otherCardtypeData.selected_code = new_type_code
+          // otherCardtypeData.selected_code = new_type_code
           this.setData({
             other_card_number: "",
             otherCardtypeData: this.data.otherCardtypeData
@@ -1310,9 +1312,10 @@ Page({
         "native": that.data.countryData.selected,
         "taxpayer_type": that.data.taxpayerTypeData.selected == '是' ? 'resident' :'non-resident',
         "is_overseas_personnel": that.data.overseas,
-        "id_card_type": ''+that.data.cardtypeData.selected_code,
+        'birth_native': 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_code,
+        "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
         "other_id_card_no": formdata.other_card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,