Merge branch 'dev_py' into dev2.0

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
查看文件 @d149bc4
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @d149bc4
@@ -81,16 +81,16 @@ Page({
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
-    older_relativeData: {
-      label: '与纳税人关系',
-      isrequre: true,
-      bindtype: 'older_relative',
-      selected: '',
-      isblack: 'true',
-      placeholder: '请选择与纳税人关系',
-      values: ["父母", "祖父母、外祖父母"],
-      onChange: 'onPickerSelect'
-    },
+    // older_relativeData: {
+    //   label: '与纳税人关系',
+    //   isrequre: true,
+    //   bindtype: 'older_relative',
+    //   selected: '',
+    //   isblack: 'true',
+    //   placeholder: '请选择与纳税人关系',
+    //   values: ["父母", "祖父母、外祖父母"],
+    //   onChange: 'onPickerSelect'
+    // },
     taxperson_relativeData: {
       label: '与纳税人的关系',
       isrequre: true,
@@ -553,6 +553,7 @@ Page({
       })
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
+      this.getTaxList()
       house_type = "house_fund_rent"
       title = '住房租金'
       if (options.reducetype == '月度') {
@@ -782,11 +783,6 @@ Page({
           olderbirthDate.datelong = data.birth_date
           setData.olderbirthDate = olderbirthDate
         }
-        if (data.family_ties && data.family_ties.length) {
-          var older_relativeData = this.data.older_relativeData
-          older_relativeData.selected = data.family_ties
-          setData.older_relativeData = older_relativeData
-        }
         this.setData(setData)
         break;
       case 'medical_fund':
@@ -1203,10 +1199,10 @@ Page({
           this.showToast('请选择被赡养人出生日期')
           return
         }
-        if (this.data.older_relativeData.selected.length < 1) {
-          this.showToast('请选择与纳税人关系')
-          return
-        }
+        // if (this.data.older_relativeData.selected.length < 1) {
+        //   this.showToast('请选择与纳税人关系')
+        //   return
+        // }
         // if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
         //   this.showToast('请填写合理分摊比例')
         //   return
@@ -1219,7 +1215,7 @@ Page({
           newdata.share_method = this.share_method
         }
         newdata.birthday = this.data.olderbirthDate.datelong
-        newdata.relationship = this.data.older_relativeData.selected
+        // newdata.relationship = this.data.older_relativeData.selected
         newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
         newdata.nation = "中国"
         break;
@@ -1430,7 +1426,7 @@ Page({
     //   this.showToast('请填写扣除金额')
     //   return
     // }
-    if (this.data.cur_index != 'medical_fund') {
+    if (this.data.cur_index != 'medical_fund' && this.data.cur_index != 'continuing_education') {
       newdata.deduction_type = this.data.reducetypeData.selected == '月度' ? "month" : "year"
       newdata.deduction_amount = this.data.deduction_amount //formdata.reduce_money 
     }
@@ -1633,13 +1629,13 @@ Page({
           loverbirthDate: lover_birthDate
         })
         break;
-      case 'older_relative':
-        var older_relativeData = this.data.older_relativeData
-        older_relativeData.selected = older_relativeData.values[e.detail.value]
-        this.setData({
-          older_relativeData: older_relativeData
-        })
-        break;
+      // case 'older_relative':
+        // var older_relativeData = this.data.older_relativeData
+        // older_relativeData.selected = older_relativeData.values[e.detail.value]
+        // this.setData({
+        //   older_relativeData: older_relativeData
+        // })
+        // break;
       case 'taxperson_relative':
         var taxperson_relativedata = this.data.taxperson_relativeData
         taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]
@@ -1772,20 +1768,20 @@ Page({
         edutypee_data.selected = edutypee_data.values[e.detail.value]
         var reducetypeData = this.data.reducetypeData
         var deduction_amount
-        if (e.detail.value == '1') {//非学历教育
-          reducetypeData.selected = '年度'
-          // reducetypeData.disabled = true 
-          deduction_amount = Deduce_amounts_year['continuing_education_non']
-        }else {
-          // reducetypeData.disabled = false 
-          reducetypeData.selected = '月度'
-          deduction_amount = Deduce_amounts_month['continuing_education']
-        }
+        // if (e.detail.value == '1') {//非学历教育
+        //   reducetypeData.selected = '年度'
+        //   // reducetypeData.disabled = true 
+        //   deduction_amount = Deduce_amounts_year['continuing_education_non']
+        // }else {
+        //   // reducetypeData.disabled = false 
+        //   reducetypeData.selected = '月度'
+        //   deduction_amount = Deduce_amounts_month['continuing_education']
+        // }
         this.setData({
           edu_lable: e.detail.value == 0 ? 'school' : 'tech',
           edutypeData: edutypee_data,
-          reducetypeData: reducetypeData,
-          deduction_amount: deduction_amount
+          // reducetypeData: reducetypeData,
+          // deduction_amount: deduction_amount
         })
         break;
       case 'edu_style':
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @d149bc4
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @d149bc4
@@ -145,7 +145,7 @@
   </view>
   <view class='divide_line_30'></view>
-  <template is="picker_cell_normal" data="{{...older_relativeData}}" />
+  <!-- <template is="picker_cell_normal" data="{{...older_relativeData}}" /> -->
   <!-- <view style='height:90rpx;'>
     <text class='red_star_right_10'>*</text>
     <text class='text_777_30 float_left'>分摊比例</text>
@@ -316,7 +316,7 @@
   </view>
 </view>
-<view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund' && cur_index!='support_duty'}}">
+<view style='padding:0 30rpx;' wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}">
   <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...reducetypeData}}" />
   <view class='divide_line_30'></view>
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @d149bc4
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @d149bc4
@@ -30,7 +30,8 @@ Page({
       selected: '',
       disabled: false,
       placeholder: '请选择关系',
-      values: ["子","女" ,"配偶", "父母", "祖父母、外祖父母"],
+      // values: ["子","女" ,"配偶", "父母", "祖父母、外祖父母"],
+      values: ["子", "女", "配偶", "父母"],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
@@ -263,15 +264,14 @@ 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 formdata = e.detail.value;
     console.log("formdata", formdata);
-    console.log('idnum', this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))
     if (this.data.relativeData.selected.length < 1) {
       this.showtoast('请选择关系');
       return
     }
-    else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
+    if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       return
-    } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
+    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
       this.showtoast('证照号码有误');
       return
     }
@@ -287,22 +287,6 @@ Page({
       this.showtoast('手机号码有误');
       return
     } 
-    var new_card_num = ''
-    if (this.data.isIdCard) {
-      if (this.data.card_number.length > 0) {
-        new_card_num = this.data.card_number
-      }
-      if (formdata.id_card_no.length > 0) {
-        new_card_num = formdata.id_card_no
-      }
-    }
-
-    if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
-      new_card_num = formdata.id_card_no
-    }
-    this.setData({
-      card_number: new_card_num,
-    })
     this.goCommit(formdata);
   },
@@ -327,7 +311,7 @@ Page({
         'certification_status': that.getCertifyStatus(formdata),
         "family_ties": that.data.relativeData.selected,
         "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
-        "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
+        "id_card_no": that.data.card_number,
         "name": name,
         "gender": that.data.genderData.selected,
         "mobile": formdata.mobile,
@@ -403,6 +387,9 @@ Page({
   idChange: function (e) {
     console.log('idCardNoChange', e.detail.value)
     var idCardNo = e.detail.value
+    this.setData({
+      card_number: idCardNo
+    })
     if (e.detail.value.length == 18){
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
@@ -415,8 +402,10 @@ Page({
     }
   },
   idDone: function (e) {
-
     var idCardNo = e.detail.value
+    this.setData({
+      card_number: idCardNo
+    })
     if (!idCardNo.length) {
       wx.showToast({
         image: "../../../../images/warn.png",
@@ -431,7 +420,6 @@ Page({
       })
       return;
     }
-
   },
   /**
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @d149bc4
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @d149bc4
@@ -24,7 +24,7 @@
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <input class='input_wrap' placeholder='请输入或拍摄身份证'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard'></input>
+             <input class='input_wrap' placeholder='请输入或拍摄身份证'  placeholder-class='text_777_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_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @d149bc4
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @d149bc4
@@ -333,8 +333,8 @@ Page({
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
       bankInfo: this.data.bankInfo,
-      personal_equity_total:tax_info.personal_equity_total,
-      company_equity_total: tax_info.company_equity_total,
+      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,
       professionData: this.data.professionData,
       degreeData: this.data.degreeData,
@@ -349,9 +349,9 @@ Page({
       long_birth_date: tax_info.birth_date,
       birthDate: this.data.birthDate,
-      long_start_date: tax_info.join_date,
+      long_start_date: tax_info.join_date ? tax_info.join_date:0,
       startDate: this.data.startDate,
-      long_end_date: tax_info.separate_date,
+      long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: this.data.card_number
@@ -458,7 +458,7 @@ Page({
         bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
         that.setData({
-          banklist: res.data.items,
+          // banklist: res.data.items,
           bankInfo: bank_info
         })
         console.log("bankInfo", that.data.bankInfo)
@@ -786,6 +786,16 @@ Page({
   idcardblur: function (e) {
     var idCardNo = e.detail.value
+    this.setData({
+      card_number: idCardNo
+    })
+    if (!idCardNo.length) {
+      wx.showToast({
+        image: "../../../../images/warn.png",
+        title: '请输入身份证号'
+      })
+      return;
+    }
     if (!format.isIDCardNum(idCardNo)) {
       wx.showToast({
         image: "../../../../images/warn.png",
@@ -793,10 +803,12 @@ Page({
       })
       return;
     }
-    this.dealIdInfo(idCardNo)
   },
   bindinputcardnum: function(e) {
     var idCardNo = e.detail.value
+    this.setData({
+      card_number: idCardNo
+    })
     if (e.detail.value.length == 18) {
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
@@ -811,9 +823,22 @@ Page({
   //根据身份证号码，获取相关信息
   dealIdInfo: function (idCardNum) {
     var info = format.analyzeIDCard(idCardNum)
-    this.setData({
-      card_number: idCardNum
-    })
+    console.log('info', info.age, info.sex)
+    if (info.age) {
+      this.data.birthDate.selected = info.birthDay
+      this.setData({
+        age: info.age,
+        long_birth_date: Date.parse(new Date(info.birthDay)) / 1000,
+        birthDate: this.data.birthDate
+      })
+    }
+    if (info.sex) {
+      var gender_data = this.data.genderData
+      gender_data.selected = info.sex
+      this.setData({
+        genderData: gender_data
+      })
+    }
   },
   personalmoney:function(e){
     console.log('personalmoney', e)
@@ -838,9 +863,8 @@ Page({
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
     var formdata = e.detail.value;
     console.log("formdata", formdata)
-    console.log("card_number", this.data.card_number)
     if (this.data.card_number.length < 1) {
-      this.showtoast('请输入身份证号码');
+      this.showtoast('请填写证照号码');
       return
     } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
       this.showtoast('证照号码有误');
@@ -853,6 +877,14 @@ Page({
       this.showtoast('请输入正确姓名');
       return
     } 
+    if (this.data.mobile.length < 1) {
+      this.showtoast('请输入手机号码');
+      return
+    } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
+      this.showtoast('手机号码有误');
+      return
+    }
+    this.goCommit(formdata);
     // else if (this.data.personstatusData.selected.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
@@ -869,13 +901,6 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } else 
-    if (this.data.mobile.length < 1) {
-      this.showtoast('请输入手机号码');
-      return
-    } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
-      this.showtoast('手机号码有误');
-      return
-    } 
     // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
     //   this.showtoast('请输入正确邮箱');
     //   return
@@ -908,7 +933,6 @@ Page({
     // this.setData({
     //   card_number: new_ard_num,
     // })
-    this.goCommit(formdata);
   },
   goCommit: function(data) {
@@ -920,8 +944,6 @@ Page({
     var request_current_address = that.getCurrentAddressRequest()
     var request_birth_address = that.getBirthAddressRequest()
     var Authorization = app.globalData.Authorization;
-    console.log('long_birth_date', that.data.long_birth_date)
-
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
@@ -1079,7 +1101,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.taxInfo.certification_status == 'active'||(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 ''