Merge branch 'dev_py' into dev2.0

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/taxperson/addinfo/addinfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @48cbd55
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @48cbd55
@@ -1089,6 +1089,12 @@ Page({
         if (this.data.studyenddate.selected.length < 1) {
           this.showToast('请选择受教育终止日期')
           return
+        }else{
+          var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+          if (this.data.studyenddate.datelong < activedDate) {
+            this.showToast('终止(毕业)日期不符合要求，无法申报')
+            return
+          }
         }
         if (!formdata.school_name || formdata.school_name.length < 1) {
           this.showToast('请选择就读学校')
@@ -1146,6 +1152,12 @@ Page({
           if (this.data.studyenddate.selected.length < 1) {
             this.showToast('请选择受毕业时间')
             return
+          } else {
+            var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+            if (this.data.studyenddate.datelong < activedDate) {
+              this.showToast('终止(毕业)日期不符合要求，无法申报')
+              return
+            }
           }
           newdata.education_start = this.data.studystartdate.datelong
           newdata.education_end = this.data.studyenddate.datelong
@@ -1159,6 +1171,14 @@ Page({
           if (this.data.applydate.selected.length < 1) {
             this.showToast('请选择发证日期')
             return
+          } else {
+            // var d = new Date();
+            // var curYear = d.getFullYear();
+            var selYear = this.data.applydate.selected.substring(0, 4);
+            if (selYear < 2019) {
+              this.showToast('发证(批准)日期不符合要求，无法申报')
+              return
+            }
           }
           if (!formdata.certification_name || formdata.certification_name.length < 1) {
             this.showToast('请填写证书名称')
@@ -1390,10 +1410,18 @@ Page({
           } else if (this.data.leasestartDate.selected.length < 1) {
             this.showToast('请选择日期')
             return
-          } else if (this.data.leaseendDate.selected.length < 1) {
+          }
+          if (this.data.leaseendDate.selected.length < 1) {
             this.showToast('请选择日期')
             return
+          } else {
+            var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+            if (this.data.leaseendDate.datelong < activedDate) {
+              this.showToast('终止日期不符合要求，无法申报')
+              return
+            }
           }
+
           newdata.owner_type = this.data.leasetypeData.selected
           newdata.rent_start = this.data.leasestartDate.datelong
           newdata.rent_end = this.data.leaseendDate.datelong
@@ -1717,10 +1745,15 @@ Page({
       case 'study_end_date':
         var study_enddate = this.data.studyenddate
         study_enddate.selected = e.detail.value
-        study_enddate.datelong = (Date.parse(new Date(e.detail.value)) / 1000)
+        var datelong = (Date.parse(new Date(e.detail.value)) / 1000)
+        study_enddate.datelong = datelong
         this.setData({
           studyenddate: study_enddate
         })
+        var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+        if (datelong < activedDate){
+          this.showToast('终止(毕业)日期不符合要求，无法申报')
+        }
         break;
       case 'child_edu_degree':
         var childedudegreeData = this.data.childedudegreeData
@@ -1837,7 +1870,11 @@ Page({
         this.setData({
           applydate: apply_date
         })
-        break;
+        var selYear = apply_date.selected.substring(0, 4);
+        if (selYear < 2019) {
+          this.showToast('发证(批准)日期不符合要求，无法申报')
+          return
+        }
         break;
       case 'cardtype':
         var cardtype_Data = this.data.cardtypeData
@@ -1922,6 +1959,10 @@ Page({
         this.setData({
           leaseendDate: leaseend_Date
         })
+        var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+        if (leaseend_Date.datelong < activedDate) {
+          this.showToast('终止日期不符合要求，无法申报')
+        }
         break;
       case 'bank':
         var bank_data = this.data.bankInfo
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @48cbd55
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @48cbd55
@@ -277,6 +277,16 @@ Page({
       this.showtoast('证照号码有误');
       return
     }
+    var rel = this.data.relativeData.selected
+    var hostInfo = format.analyzeIDCard(app.globalData.hostInfo.id_card_no)
+    if ((rel == '子' || rel =='女') && formdata.age > hostInfo.age) {
+      this.showtoast('子女年龄有误');
+      return
+    }
+    if (rel == '父母' && formdata.age < hostInfo.age) {
+      this.showtoast('父母年龄有误');
+      return
+    }
     var name = formdata.person_name.length ? formdata.person_name : this.data.name
     if (name.length < 1 ) {
       this.showtoast('姓名未填写');
@@ -290,19 +300,17 @@ Page({
       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) {
+    } 
+    if (rel == '配偶' &&  this.data.genderData.selected == app.globalData.hostInfo.gender) {
       this.showtoast('关系和性别冲突');
       return
     }