Merge branch 'dev_py' into dev2.0

@@ -146,6 +146,7 @@ App({
     // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
+    hostInfo:null,
     hasLogin: false,
     openid: null,
     Authorization: null,

@@ -81,16 +81,17 @@ 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,
+      // disabled: true,
+      bindtype: 'older_relative',
+      selected: "",
+      isblack: 'true',
+      placeholder: '请选择与纳税人关系',
+      values: ["父母", "其他"],
+      onChange: 'onPickerSelect'
+    },
     taxperson_relativeData: {
       label: '与纳税人的关系',
       isrequre: true,
@@ -127,10 +128,11 @@ Page({
     commonbirthDate: {
       label: '出生日期',
       isrequre: true,
+      disabled:true,
       bindtype: 'commonbirthday',
       selected: '',
       isblack: 'true',
-      placeholder: '请选择出生日期',
+      placeholder: '出生日期',
       mode: "date",
       fields: "day",
       start: '1970-01-01',
@@ -143,7 +145,8 @@ Page({
       bindtype: 'child_edu_degree',
       selected: '',
       isblack: 'true',
-      values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育", "硕士研究生教育", "博士研究生教育"],
+      // values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育", "硕士研究生教育", "博士研究生教育"],
+      values: ["学前教育阶段", "义务教育", "高中阶段教育", "高等教育"],
       placeholder: '请选择教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -182,7 +185,8 @@ Page({
       bindtype: 'edu_level',
       selected: '',
       isblack: 'true',
-      values: ["专科", "本科", "硕士研究生", "博士研究生", "其他"],
+      // values: ["专科", "本科", "硕士研究生", "博士研究生", "其他"],
+      values: ["大学专科", "大学本科", "硕士研究生", "博士研究生", "其他"],
       placeholder: '请选择学历教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -235,10 +239,11 @@ Page({
     olderbirthDate: {
       label: '被赡养人出生日期',
       isrequre: true,
+      disabled: true,
       bindtype: 'olderbirthday',
       selected: '',
       isblack: 'true',
-      placeholder: '请选择日期',
+      placeholder: '出生日期',
       mode: "date",
       fields: "day",
       start: '1970-01-01',
@@ -285,7 +290,7 @@ Page({
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
-      fields: "day",
+      fields: "month",
       datelong: 0,
       start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
@@ -302,7 +307,7 @@ Page({
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
-      fields: "day",
+      fields: "month",
       start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-07-31',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-07-31',
@@ -658,6 +663,10 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
+        var commonbirthDate = this.data.commonbirthDate
+        commonbirthDate.selected = format.formatTime_date(data.birth_date)
+        commonbirthDate.datelong = data.birth_date
+        setData.commonbirthDate = commonbirthDate
         if (data.id_card_no && data.id_card_no.length) {
           setData.children_id_card_no = data.id_card_no
           this.dealIdInfo(data.id_card_no, 'children_id_card_no_input')
@@ -665,12 +674,6 @@ Page({
         if (data.name && data.name.length) {
           setData.children_name = data.name
         }
-        if (data.birth_date && data.birth_date > 0) {
-          var commonbirthDate = this.data.commonbirthDate
-          commonbirthDate.selected = format.formatTime_date(data.birth_date)
-          commonbirthDate.datelong = data.birth_date
-          setData.commonbirthDate = commonbirthDate
-        }
         if (data.percent && data.percent.length) {
           var childrenpercentData = this.data.childrenpercentData
           childrenpercentData.selected = data.percent
@@ -770,6 +773,10 @@ Page({
         break;
       case 'support_duty':
         var setData = {}
+        var olderbirthDate = this.data.olderbirthDate
+        olderbirthDate.selected = format.formatTime_date(data.birth_date)
+        olderbirthDate.datelong = data.birth_date
+        setData.olderbirthDate = olderbirthDate
         if (data.name && data.name.length) {
           setData.supported_name = data.name
         }
@@ -777,16 +784,14 @@ Page({
           setData.id_card_no = data.id_card_no
           this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
         }
-        if (data.birth_date && data.birth_date.length) {
-          var olderbirthDate = this.data.olderbirthDate
-          olderbirthDate.selected = format.formatTime_date(data.birth_date)
-          olderbirthDate.datelong = data.birth_date
-          setData.olderbirthDate = olderbirthDate
-        }
         this.setData(setData)
         break;
       case 'medical_fund':
         var setData = {}
+        var commonbirthDate = this.data.commonbirthDate
+        commonbirthDate.selected = format.formatTime_date(data.patient_birthday)
+        commonbirthDate.datelong = data.patient_birthday
+        setData.commonbirthDate = commonbirthDate
         if (data.name && data.name.length) {
           setData.name = data.name
         }
@@ -799,12 +804,6 @@ Page({
           taxperson_relativeData.selected = data.family_ties
           setData.taxperson_relativeData = taxperson_relativeData
         }
-        if (data.patient_birthday && data.patient_birthday > 0) {
-          var commonbirthDate = this.data.commonbirthDate
-          commonbirthDate.selected = format.formatTime_date(data.patient_birthday)
-          commonbirthDate.datelong = data.birth_date
-          setData.commonbirthDate = commonbirthDate
-        }
         this.setData(setData)
         break;
       case "house_fund":
@@ -960,6 +959,9 @@ Page({
               children_name: id_info.name,
               commonbirthDate: that.data.commonbirthDate
             }
+            if (format.getAge(birth_day) < 3) {
+              this.showToast('子女年龄小于3岁,不可申报')
+            }
           } else if (that.idcard_belong == 'spouse_id_card_no') {
             that.data.loverbirthDate.selected = birth_day
             that.data.loverbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
@@ -976,6 +978,9 @@ Page({
               supported_name: id_info.name,
               olderbirthDate: that.data.olderbirthDate
             }
+            if (format.getAge(birth_day) < 60) {
+              this.showToast('被赡养人年龄不足60岁,不可申报')
+            }
           } else if (that.idcard_belong == 'medical_id_card_no') {
             that.data.commonbirthDate.selected = birth_day
             that.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
@@ -1053,14 +1058,18 @@ Page({
           this.showToast('身份证格式有误')
           return
         }
-        if (!formdata.children_name || formdata.children_name.length < 1) {
-          this.showToast('请填写子女姓名')
+        if (format.getAge(this.data.commonbirthDate.selected) < 3) {
+          this.showToast('子女年龄小于3岁,不可申报')
           return
         }
-        if (this.data.commonbirthDate.selected.length < 1) {
-          this.showToast('请选择子女出生日期')
+        if (!formdata.children_name || formdata.children_name.length < 1) {
+          this.showToast('请填写子女姓名')
           return
         }
+        // if (this.data.commonbirthDate.selected.length < 1) {
+        //   this.showToast('请选择子女出生日期')
+        //   return
+        // }
         if (this.data.childrenpercentData.selected.length < 1) {
           this.showToast('请选择分配比例')
           return
@@ -1195,14 +1204,18 @@ Page({
           this.showToast('被赡养人身份证格式有误')
           return
         }
-        if (this.data.olderbirthDate.selected.length < 1) {
-          this.showToast('请选择被赡养人出生日期')
-          return
-        }
-        // if (this.data.older_relativeData.selected.length < 1) {
-        //   this.showToast('请选择与纳税人关系')
+        // if (this.data.olderbirthDate.selected.length < 1) {
+        //   this.showToast('请选择被赡养人出生日期')
         //   return
         // }
+        if (format.getAge(this.data.olderbirthDate.selected) < 60) {
+          this.showToast('被赡养人年龄不足60岁,不可申报')
+          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
@@ -1215,7 +1228,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;
@@ -1513,26 +1526,38 @@ Page({
     }
   },
   loan_input: function (e) {
-    console.log('-------', e.detail.value)
+    var value = e.detail.value
     switch (e.currentTarget.id) {
       case 'loan_contract_no':
         this.setData({
-          loan_contract_no: e.detail.value
+          loan_contract_no: value
         })
         break;
       case 'loan_months':
+        if (value.length && value <= 0) {
+          value = 1
+        } else if (value > 240) {
+          value = 240
+          this.showToast('月数不得大于240')
+        }
         this.setData({
-          loan_months: e.detail.value
+          loan_months: value
         })
         break;
       case 'sec_loan_contract_no':
         this.setData({
-          sec_loan_contract_no: e.detail.value
+          sec_loan_contract_no: value
         })
         break;
       case 'sec_loan_months':
+        if (value.length && value <= 0) {
+          value = 1
+        }else if (value>240){
+          value = 240
+          this.showToast('月数不得大于240')
+        }
         this.setData({
-          sec_loan_months: e.detail.value
+          sec_loan_months: value
         })
         break;
     }
@@ -1548,6 +1573,9 @@ Page({
       data = {
         commonbirthDate: this.data.commonbirthDate
       }
+      if (info.age<3){
+        this.showToast('子女年龄小于3岁,不可申报')
+      }
     } else if (idcard_belong == 'spouse_id_card_no_input') {
       this.data.loverbirthDate.selected = info.birthDay
       this.data.loverbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
@@ -1566,6 +1594,9 @@ Page({
       data = {
         olderbirthDate: this.data.olderbirthDate
       }
+      if (info.age < 60) {
+        this.showToast('被赡养人年龄不足60岁,不可申报')
+      }
     } else if (idcard_belong == 'owner_id_card_no_input') {
       // this.data.olderbirthDate.selected = info.birthDay
       // this.data.olderbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
@@ -1629,13 +1660,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]

@@ -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>

@@ -31,7 +31,7 @@ Page({
       disabled: false,
       placeholder: '请选择关系',
       // values: ["子","女" ,"配偶", "父母", "祖父母、外祖父母"],
-      values: ["子", "女", "配偶", "父母"],
+      values: ["子", "女", "配偶", "父母","其他"],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
@@ -58,8 +58,10 @@ Page({
     genderData: {
       label: '性别',
       bindtype: 'gender',
+      disabled: true,
       selected: '',
-      placeholder: '请选择性别',
+      // placeholder: '请选择性别',
+      placeholder: '性别',
       values: ["男", "女"],
       onChange: 'onPickerSelect'
     },
@@ -116,7 +118,7 @@ Page({
     this.data.relativeData.selected = tax_info.family_ties
     // this.data.cardtypeData.selected = tax_info.id_card_type
     this.data.genderData.selected = tax_info.gender
-    this.data.genderData.disabled = isDisable
+    // this.data.genderData.disabled = isDisable
     
     this.setData({
       isDisable: isDisable,
@@ -287,6 +289,23 @@ Page({
       this.showtoast('手机号码有误');
       return
     } 
+    if (this.data.genderData.selected == '男') {
+      var rel = this.data.relativeData.selected
+      if (rel == '女'){
+        this.showtoast('关系和性别冲突');
+        return
+      }
+    }else{
+      var rel = this.data.relativeData.selected
+      if (rel == '子') {
+        this.showtoast('关系和性别冲突');
+        return
+      }
+    }
+    if (this.data.genderData.selected == app.globalData.hostInfo.gender) {
+      this.showtoast('关系和性别冲突');
+      return
+    }
     this.goCommit(formdata);
   },
 

@@ -24,10 +24,10 @@
           <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_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_777_30' name='id_card_no' maxlength='18' 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='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
         <view class="divide_line_30"></view>
@@ -35,7 +35,7 @@
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap' placeholder='请填写姓名' name='person_name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}' bindinput='nameInput'></input>
+          <input class='input_wrap' placeholder='请填写姓名' name='person_name' value='{{name}}' placeholder-class='text_999_30' maxlength='15' disabled='{{isDisable}}' bindinput='nameInput'></input>
         </view>
         <view class="divide_line_30"></view>
 
@@ -43,7 +43,7 @@
           <view class="divide_line_30"></view>
           <view class='item_body'>
             <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>年龄</text>
-            <input class='input_wrap' name='age' type='number'  placeholder-class='text_777_30' placeholder='请输入年龄' maxlength='2' value='{{age}}' disabled='{{isDisable}}'></input>
+            <input class='input_wrap' name='age' type='number'  placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='true'></input>
           </view>
           <view class="divide_line_30"></view>
 

@@ -74,7 +74,8 @@ Page({
     genderData: {
       label: '性别',
       bindtype: 'gender',
-      placeholder: '请选择性别',
+      disabled: true,
+      placeholder: '性别',
       values: ["男", "女"],
       selected: '',
       onChange: 'onPickerSelect'
@@ -159,8 +160,9 @@ Page({
     // 时间picker
     birthDate: {
       label: '出生年月',
+      disabled:true,
       bindtype: 'birthday',
-      placeholder: '请选择出生日期',
+      placeholder: '出生日期',
       selected: '',
       mode: "date",
       fields: "day",

@@ -112,6 +112,7 @@ Page({
               text_tip: '去查看'
             })
           }
+          app.globalData.hostInfo = data.items[i]
         }
         datalist.push(data.items[i])
       }

@@ -150,6 +150,21 @@ function checkNumber(theObj) {
   return false;
 }
 
+function getAge(birthdate) {
+  var yearBirth = birthdate.substring(0, 4);
+  var monthBirth = birthdate.substring(5, 7);
+  var dayBirth = birthdate.substring(8, 10);
+  //获取当前年月日并计算年龄
+  var myDate = new Date();
+  var monthNow = myDate.getMonth() + 1;
+  var dayNow = myDate.getDay();
+  var age = myDate.getFullYear() - yearBirth;
+  if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+    age--;
+  }
+  return age;
+}
+
 module.exports = {
   formatTime: formatTime,
   formatTime_date: formatTime_date,  
@@ -162,5 +177,6 @@ module.exports = {
   curDateTime: curDateTime,
   analyzeIDCard: analyzeIDCard,
   checkNumber: checkNumber,
-  isMobile: isMobile
+  isMobile: isMobile,
+  getAge: getAge
 }