自然人基础信息增加开户银行省份字段

wangyu
pages/main/taxperson/editinfo/editinfo.js
pages/main/taxperson/editinfo/editinfo.wxml
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @75f0643
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @75f0643
 var format = require('../../../../utils/util.js');
+var province = require('../../../../utils/province.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 const reg_18_Number = /^[0-9]{18}$/;
@@ -16,10 +17,11 @@ Page({
    * 页面的初始数据
    */
   data: {
+    province: [],
     isshow01: false,
     isshow02: false,
     isshow03: false,
-    hasOtherCard:false,
+    hasOtherCard: false,
     taxInfo: {},
     proffessionlist: {},
     banklist: {},
@@ -32,7 +34,7 @@ Page({
     birthday: '',
     idInfoData: '',
     id_error: false,
-    has_certify:false,
+    has_certify: false,
     curAddress_haschanged: false,
     birthAddress_haschanged: false,
     contactAddress_haschanged: false,
@@ -40,8 +42,8 @@ Page({
     long_birth_date: 0,
     long_start_date: 0,
     long_end_date: 0,
-    personal_equity_total:0,
-    company_equity_total:0,
+    personal_equity_total: 0,
+    company_equity_total: 0,
     huji_address_detail: '',
     personstatusData: {
       isrequre: true,
@@ -104,7 +106,7 @@ Page({
       label: '纳税人类型',
       bindtype: 'taxpayerType',
       placeholder: '请选择纳税人类型',
-      selected:"居民",
+      selected: "居民",
       values: ["居民", "非居民"],
       onChange: 'onPickerSelect'
     },
@@ -114,18 +116,26 @@ Page({
       bindtype: 'forigner',
       placeholder: '请选择',
       disabled: true,
-      selected:"否",
+      selected: "否",
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
     bankInfo: {
       label: '开户银行',
       bindtype: 'bank',
-      maxWidth:490,
+      maxWidth: 490,
       placeholder: '请选择开户银行',
       selected: '',
       onChange: 'onPickerSelect'
     },
+    bankProvinceInfo: {
+      label: '开户银行省份',
+      bindtype: 'bank_province',
+      maxWidth: 490,
+      placeholder: '请选择开户银行省份',
+      selected: '',
+      onChange: 'onPickerSelect'
+    },
     genderData: {
       label: '性别',
       isrequre: true,
@@ -216,7 +226,7 @@ Page({
     // 时间picker
     birthDate: {
       label: '出生日期',
-      isrequre:true,
+      isrequre: true,
       bindtype: 'birthday',
       placeholder: '出生日期',
       selected: '',
@@ -306,7 +316,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    
+
     console.log('options.id', options.id)
     if (options.id && options.id.length > 0) {
       this.setData({
@@ -317,9 +327,28 @@ Page({
     this.getproffessiondata()
     this.getbanklist()
     this.getCountry()
+    this.loadProvince()
   },
-//****************获取国籍数据************/
-  getCountry: function () {
+
+//****************获取开户行省份************/
+  loadProvince: function () {
+    province.init(this)
+    var provincelist = this.data.province
+    var province_data = []
+    var bankprovince_info = this.data.bankProvinceInfo
+    for (var i = 0; i < provincelist.length; i++) {
+      province_data.push(provincelist[i].name)
+    }
+
+    bankprovince_info.values = province_data
+    this.setData({
+      bankProvinceInfo: bankprovince_info
+    })
+    console.log("bankProvinceInfo", this.data.bankProvinceInfo)
+  },
+
+  //****************获取国籍数据************/
+  getCountry: function() {
     var that = this
     wx.showLoading({
       title: '',
@@ -332,7 +361,7 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         var countrys = res.data.concat()
         that.data.birthCountryData.values = res.data
         if (countrys.indexOf('中国') > -1) {
@@ -364,7 +393,7 @@ Page({
   },
-//****************获取自然人数据************/
+  //****************获取自然人数据************/
   getpersonalTax: function(id) {
     var that = this
     wx.showLoading({
@@ -383,7 +412,7 @@ Page({
         that.setData({
           taxInfo: res.data,
           // isself: '魏先森' != res.data.name ? false : true
-          isself: res.data.family_ties=="本人" ? true : false
+          isself: res.data.family_ties == "本人" ? true : false
         })
         that.handleDatas(res.data)
       },
@@ -398,16 +427,16 @@ Page({
   },
   //对各参数初始赋值
-  handleDatas: function (tax_info) {
+  handleDatas: function(tax_info) {
     //todo
     console.log('tax_info', tax_info)
     var curdate = format.curDateTime()
-    this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
+    this.dealCardType(tax_info.id_card_type) //为防止干扰其他字段，需要先执行
     this.data.name = tax_info.name
     this.data.other_name = tax_info.other_name
-    if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
-      if (tax_info.id_card_type=='居民身份证'){
+    if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) { //已通过拍摄身份证认证过，不能修改
+      if (tax_info.id_card_type == '居民身份证') {
         this.data.genderData.disabled = true
         this.data.birthDate.disabled = true
       }
@@ -424,7 +453,7 @@ Page({
     this.data.other_card_number = tax_info.other_id_card_no
     this.data.overseas = tax_info.is_overseas_personnel
-    if (tax_info.native){
+    if (tax_info.native) {
       this.data.countryData.selected = tax_info.native
     }
     this.data.birthCountryData.selected = tax_info.birth_native
@@ -436,7 +465,7 @@ Page({
     this.data.mobile = tax_info.mobile
     this.data.investInfo.selected = tax_info.is_investor
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
-    
+
     this.data.genderData.selected = tax_info.gender
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
       this.data.birthDate.selected = ''
@@ -444,17 +473,17 @@ Page({
       // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
       this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) 
     }
-//非必填
+    //非必填
     if (tax_info.join_date > 1000) {
       // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
-      this.data.startDate.selected = format.formatTime_date(tax_info.join_date) 
+      this.data.startDate.selected = format.formatTime_date(tax_info.join_date)
     }
     if (tax_info.separate_date > 1000) {
-      this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 
+      this.data.endDate.selected = format.formatTime_date(tax_info.separate_date)
     }
     const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
     const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
-    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate:''
+    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate : ''
     this.data.firstEntryDate.datelong = tax_info.first_entry_date
     this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("01-01-01") == -1) ? predictLeaveDate : ''
     this.data.predictLeaveDate.datelong = tax_info.predict_leave_date
@@ -468,6 +497,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.bankProvinceInfo.selected = tax_info.bank_province
     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, "")
@@ -485,8 +515,9 @@ Page({
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
       bankInfo: this.data.bankInfo,
+      bankProvinceInfo: this.data.bankProvinceInfo,
       personal_equity_total: tax_info.personal_equity_total ? tax_info.personal_equity_total : 0,
-      company_equity_total: tax_info.company_equity_total ? tax_info.company_equity_total: 0,
+      company_equity_total: tax_info.company_equity_total ? tax_info.company_equity_total : 0,
       professionData: this.data.professionData,
       degreeData: this.data.degreeData,
@@ -501,7 +532,7 @@ Page({
       long_birth_date: tax_info.birth_date,
       birthDate: this.data.birthDate,
-      long_start_date: tax_info.join_date ? tax_info.join_date:0,
+      long_start_date: tax_info.join_date ? tax_info.join_date : 0,
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
@@ -531,7 +562,7 @@ Page({
         "Authorization": Authorization
       },
       success: function(res) {
-        if (res.data.items.length<1){
+        if (res.data.items.length < 1) {
           return
         }
         proffession_info.values = that.handleProfession(res.data.items)
@@ -617,7 +648,7 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
+        bank_info.values = res.data.banks //that.handleBankinfo(res.data.items)
         that.setData({
           // banklist: res.data.items,
@@ -692,7 +723,7 @@ Page({
           //   return
           // }
           that.setData({
-            has_certify:true,
+            has_certify: true,
             idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
@@ -716,7 +747,7 @@ Page({
   },
   span: function(e) {
-    console.log(e,'9808909')
+    console.log(e, '9808909')
     if ("1" == e.currentTarget.id) {
       this.setData({
         isshow01: !this.data.isshow01
@@ -733,7 +764,7 @@ Page({
   },
-  dealCardType: function (new_type){
+  dealCardType: function(new_type) {
     // console.log('cardtype_code', new_type_code)
     console.log('cardtype', new_type)
     var is_idcard = this.data.isIdCard
@@ -767,12 +798,12 @@ Page({
       this.data.countryData.selected = ''
       this.data.countryData.disabled = false
       this.data.nameText = '英文名'
-      if (new_type.indexOf('通行证') != -1){
-        this.data.otherCardtypeData.values = ['港澳居民居住证'];// [{ 'code': '4', 'name': '港澳居民居住证'}];
+      if (new_type.indexOf('通行证') != -1) {
+        this.data.otherCardtypeData.values = ['港澳居民居住证']; // [{ 'code': '4', 'name': '港澳居民居住证'}];
         this.data.otherCardtypeData.isrequre = false
-      }else{
-        this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
-        this.data.otherCardtypeData.selected = '港澳居民来往内地通行证'; 
+      } else {
+        this.data.otherCardtypeData.values = ['港澳居民来往内地通行证']; // [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
+        this.data.otherCardtypeData.selected = '港澳居民来往内地通行证';
         this.data.otherCardtypeData.isrequre = true
       }
     } else if (new_type.indexOf("台湾") != -1) {
@@ -780,11 +811,11 @@ Page({
       this.data.countryData.disabled = true
       this.data.nameText = '英文名'
       if (new_type.indexOf('通行证') != -1) {
-        this.data.otherCardtypeData.values = ['台湾居民居住证'];//[{ 'code': '6', 'name': '台湾居民居住证' }];
+        this.data.otherCardtypeData.values = ['台湾居民居住证']; //[{ 'code': '6', 'name': '台湾居民居住证' }];
         this.data.otherCardtypeData.isrequre = false
       } else {
         this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
-        this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证'; 
+        this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证';
         this.data.otherCardtypeData.isrequre = true
       }
@@ -794,12 +825,12 @@ Page({
       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类）' }];
-        this.data.otherCardtypeData.values = ['外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）','外国人工作许可证（C类）'];
+        //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
+        this.data.otherCardtypeData.values = ['外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
         this.data.otherCardtypeData.isrequre = false
       } else {
         this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
-        this.data.otherCardtypeData.selected = '外国护照'; 
+        this.data.otherCardtypeData.selected = '外国护照';
         this.data.otherCardtypeData.isrequre = true
       }
     }
@@ -815,8 +846,8 @@ Page({
       overseas: this.data.overseas,
       taxpayerTypeData: this.data.taxpayerTypeData
     })
-    
-    
+
+
   },
@@ -837,10 +868,12 @@ Page({
         var selected = cardtypeData.selected
         if (new_type != selected) {
           this.dealCardType(new_type)
-          var setData = { card_number: ''}
+          var setData = {
+            card_number: ''
+          }
           if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
             console.log('外国人', new_type, selected)
-          }else {
+          } else {
             setData.other_card_number = ''
           }
           this.setData(setData)
@@ -880,19 +913,19 @@ Page({
           })
         }
         break;
-      // case 'tax_reason':
-      //   var taxReasonData = this.data.taxReasonData
-      //   var reason = taxReasonData.values[e.detail.value]
-      //   if (reason != taxReasonData.selected) {
-      //     taxReasonData.selected = reason
-      //     this.setData({
-      //       taxReasonData: taxReasonData
-      //     })
-      //   }
-      //   break;
+        // case 'tax_reason':
+        //   var taxReasonData = this.data.taxReasonData
+        //   var reason = taxReasonData.values[e.detail.value]
+        //   if (reason != taxReasonData.selected) {
+        //     taxReasonData.selected = reason
+        //     this.setData({
+        //       taxReasonData: taxReasonData
+        //     })
+        //   }
+        //   break;
       case 'taxpayerType':
         var taxpayerTypeData = this.data.taxpayerTypeData
-          taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
+        taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
         this.setData({
           taxpayerTypeData: taxpayerTypeData
         })
@@ -911,6 +944,13 @@ Page({
           bankInfo: bank_data
         })
         break;
+      case 'bank_province':
+        var bankprovince_data = this.data.bankProvinceInfo
+        bankprovince_data.selected = bankprovince_data.values[e.detail.value]
+        this.setData({
+          bankProvinceInfo: bankprovince_data
+        })
+        break;
       case 'gender':
         var gender_data = this.data.genderData
         gender_data.selected = gender_data.values[e.detail.value]
@@ -989,7 +1029,7 @@ Page({
         this.data.firstEntryDate.selected = e.detail.value
         this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
         this.data.predictLeaveDate.start = e.detail.value
-        if (this.data.firstEntryDate.datelong>this.data.predictLeaveDate.datelong){
+        if (this.data.firstEntryDate.datelong > this.data.predictLeaveDate.datelong) {
           this.data.predictLeaveDate.selected = ''
         }
         this.setData({
@@ -1106,7 +1146,7 @@ Page({
       other_name: e.detail.value
     })
   },
-  idcardblur: function (e) {
+  idcardblur: function(e) {
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
@@ -1141,8 +1181,8 @@ Page({
       if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
         this.showtoast('证照号码有误');
         return;
-      } 
-      if (this.data.isIdCard){
+      }
+      if (this.data.isIdCard) {
         this.dealIdInfo(idCardNo)
         return;
       }
@@ -1151,7 +1191,7 @@ Page({
         return
       }
     }
-    if (e.detail.value.length == 9){
+    if (e.detail.value.length == 9) {
       if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         return
@@ -1165,7 +1205,7 @@ Page({
     }
   },
   //根据身份证号码，获取相关信息
-  dealIdInfo: function (idCardNum) {
+  dealIdInfo: function(idCardNum) {
     var info = format.analyzeIDCard(idCardNum)
     console.log('info', info.age, info.sex)
     if (info.age) {
@@ -1184,14 +1224,14 @@ Page({
       })
     }
   },
-  personalmoney:function(e){
+  personalmoney: function(e) {
     console.log('personalmoney', e)
     this.setData({
       personal_equity_total: e.detail.value
     })
   },
-  companymoney:function(e){
+  companymoney: function(e) {
     console.log('companymoney', e)
     this.setData({
       company_equity_total: e.detail.value
@@ -1202,8 +1242,8 @@ Page({
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     // var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;          
-    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/;  //中文
-    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/;         //英文
+    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/; //中文
+    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/; //英文
     // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
@@ -1212,7 +1252,7 @@ Page({
     if (this.data.cardtypeData.selected.length < 1) {
       this.showtoast('请选择证照类型');
       return
-    } 
+    }
     if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       return
@@ -1235,7 +1275,7 @@ Page({
     } else if (this.data.name.length > 0 && !regname_c.test(this.data.name)) {
       // this.showtoast('请输入正确姓名');
       // return
-    } 
+    }
     if (this.data.genderData.selected.length < 1) {
       this.showtoast('请选择性别');
       return
@@ -1243,7 +1283,7 @@ Page({
     if (this.data.birthDate.selected.length < 1) {
       this.showtoast('请选择出生日期');
       return
-    } 
+    }
     if (this.data.countryData.selected.length < 1) {
       this.showtoast('请选择国籍');
       return
@@ -1251,11 +1291,11 @@ Page({
     if (this.data.taxpayerTypeData.selected.length < 1) {
       this.showtoast('请选择纳税人类型');
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.firstEntryDate.selected) {
       this.showtoast('请选择首次入境时间');
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.predictLeaveDate.selected) {
       this.showtoast('请选择预计离境时间');
       return
@@ -1270,24 +1310,24 @@ Page({
     if (this.data.hasOtherCard && !otherTypeSel && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请选择其他证照类型');
       return
-    } 
+    }
     if (this.data.hasOtherCard && !otherHasInput && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请输入其他证照号码');
       return
     }
-    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput &&  !reg_18_Number.test(formdata.other_card_number)) {
+    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput && !reg_18_Number.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       return
-    }else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
+    } else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
       this.showtoast('请选择出生国家');
       return
-    } 
+    }
     if (this.data.other_name.length > 0) {
-      if (this.data.cardtypeData.selected != '居民身份证' && this.data.cardtypeData.selected != '中国护照'){
+      if (this.data.cardtypeData.selected != '居民身份证' && this.data.cardtypeData.selected != '中国护照') {
         var regname = (this.data.nameText == '中文名') ? regname_c : regname_e
         this.data.other_name = this.data.other_name.replace(/(^\s*)|(\s*$)/g, "");
         if (!regname.test(this.data.other_name)) {
@@ -1295,7 +1335,7 @@ Page({
           return
         }
       }
-    } 
+    }
     if (this.data.mobile.length < 1) {
       this.showtoast('请输入手机号码');
       return
@@ -1343,12 +1383,36 @@ Page({
     //   this.showtoast('邮箱格式有误');
     //   return
     // }
-    if (this.data.bankInfo.selected.length > 0 && formdata.bank_account.length < 1) {
-      this.showtoast('请输入银行卡号')
-      return
+    if (this.data.bankInfo.selected && this.data.bankInfo.selected.length > 0) {
+      if (this.data.bankProvinceInfo && this.data.bankProvinceInfo.selected.length < 1) {
+        this.showtoast('请选择开户银行省份')
+        return
+      }
+      if (!formdata.bank_account || formdata.bank_account.length < 1) {
+        this.showtoast('请输入银行账户')
+        return
+      } else if (!format.banknoCheck(formdata.bank_account)) {
+        this.showtoast('银行卡号格式有误')
+        return
+      }
+    }
+
+    if (this.data.bankProvinceInfo && this.data.bankProvinceInfo.selected.length > 0) {
+      if (this.data.bankInfo && this.data.bankInfo.selected.length < 1) {
+        this.showtoast('请选择开户银行')
+        return
+      }
+      if (!formdata.bank_account || formdata.bank_account.length < 1) {
+        this.showtoast('请输入银行账户')
+        return
+      } else if (!format.banknoCheck(formdata.bank_account)) {
+        this.showtoast('银行卡号格式有误')
+        return
+      }
     }
+
     if (formdata.bank_account && formdata.bank_account.length > 0) {
-      if (!format.banknoCheck(formdata.bank_account)){
+      if (!format.banknoCheck(formdata.bank_account)) {
         this.showtoast('银行卡号格式有误')
         return
       }
@@ -1356,6 +1420,10 @@ Page({
         this.showtoast('请选择开户银行')
         return
       }
+      if (!this.data.bankProvinceInfo.selected) {
+        this.showtoast('请选择开户银行省份')
+        return
+      }
     }
     this.goCommit(formdata);
     // else if (this.data.personstatusData.selected.length < 1) {
@@ -1384,7 +1452,7 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } else 
-    
+
     //  else if (this.data.company_equity_total && this.data.company_equity_total.length > 0 && !regMoney.test(this.data.company_equity_total)) {
     //   this.showtoast('请输入正确金额');
     //   return
@@ -1420,14 +1488,14 @@ Page({
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
         "other_name": that.data.hasOtherCard ? that.data.other_name : '',
-        "family_ties": '本人',//that.data.relativeData.selected,
+        "family_ties": '本人', //that.data.relativeData.selected,
         "native": that.data.countryData.selected,
-        "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' :'resident',
+        "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' : 'resident',
         "is_overseas_personnel": that.data.overseas,
         '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.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
+        "other_id_card_type": that.data.hasOtherCard ? that.data.otherCardtypeData.selected : '', //selected_code,
         "other_id_card_no": that.data.hasOtherCard ? (formdata.other_card_number ? formdata.other_card_number : '') : '',
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
@@ -1444,6 +1512,7 @@ Page({
         "profession": request_profession,
         "education": that.data.degreeData.selected,
         "bank": that.data.bankInfo.selected,
+        "bank_province": that.data.bankProvinceInfo.selected,
         "bank_account": formdata.bank_account,
         // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         // "taxpayer_status": that.data.personstatusData.selected,
@@ -1453,10 +1522,10 @@ Page({
         "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
-        
+
         "contact_address": that.data.hasOtherCard ? request_contact_address : {},
-        "contact_address_detail": that.data.hasOtherCard ? formdata.contact_address_detail: '',
-        
+        "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,
         // "is_employee": that.data.employeeInfo.selected,
@@ -1475,9 +1544,9 @@ Page({
         console.log(res)
         if (res.statusCode < 300) {
           wx.navigateBack({
-            delta:1
+            delta: 1
           })
-        } else if (res.data.code == 400 && res.data.errors.email){
+        } else if (res.data.code == 400 && res.data.errors.email) {
           that.showtoast('邮箱格式有误')
         } else {
           that.showtoast(res.data.message ? res.data.message : '请求出错')
@@ -1560,7 +1629,7 @@ Page({
     wx.showToast({
       title: str,
       duration: 2000,
-      icon:'none'
+      icon: 'none'
       // image: '/images/error.png'
     })
   },
@@ -1573,7 +1642,7 @@ Page({
     var gender = this.data.genderData.selected;
     var long_birth_date = Date.parse(new Date(this.data.birthDate.selected)) / 1000;
     console.log("birth_day", long_birth_date + "---" + this.data.long_birth_date)
-    if ((this.data.has_certify&&name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && long_birth_date == this.data.long_birth_date)) {
+    if ((this.data.has_certify && name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && long_birth_date == this.data.long_birth_date)) {
       return 'active'
     } else {
       return ''
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @75f0643
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @75f0643
@@ -186,6 +186,8 @@
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...bankInfo}}" />
           <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...bankProvinceInfo}}" />
+          <view class="divide_line_30"></view>
           <view class='item_body'>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>银行账号</text>
             <input class='input_wrap' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='19' type='number'></input>