子女教育 日期改版

@@ -293,7 +293,7 @@ Page({
       onChange: 'onPickerSelect'
     },
     studystartdate: {
-      label: '受教育日期起',
+      label: '受教育时间起',
       isrequre: true,
       bindtype: 'study_start_date',
       selected: '',
@@ -305,16 +305,32 @@ Page({
       fields: "month",
       datelong: 0,
       start: '1970-01-01',
+      end: (new Date()).getFullYear() +'-'+ ((new Date()).getMonth()+1),
+      // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
+      // end: (new Date()).getFullYear() + '-09-01',
+      // onTap: 'studyDataTap'
+    },
+    studyCompleteDate: {
+      label: '受教育时间止',
+      isrequre: true,
+      bindtype: 'study_comp_date',
+      selected: '',
+      isblack: 'true',
+      values: ["是", "否"],
+      placeholder: '请选择时间',
+      onChange: 'onPickerSelect',
+      mode: "date",
+      fields: "month",
+      start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-09-01',
       // onTap: 'studyDataTap'
     },
     studyenddate: {
       label: '教育终止时间',
-      isrequre: true,
+      // isrequre: true,
       bindtype: 'study_end_date',
       selected: '',
-      isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
@@ -549,7 +565,7 @@ Page({
       studystart_date.label = "入学时间起"
       var studyend_date = this.data.studyenddate
       studyend_date.label = "(预计)毕业时间"
-
+      studyend_date.isrequre = true
       this.setData({
         studystartdate: studystart_date,
         studyenddate: studyend_date
@@ -703,6 +719,10 @@ Page({
         studystartdate.selected = format.formatTime_month(data.education_start)
         studystartdate.datelong = data.education_start
         setData.studystartdate = studystartdate
+        var studyCompleteDate = this.data.studyCompleteDate
+        studyCompleteDate.selected = format.formatTime_month(data.education_period_end)
+        studyCompleteDate.datelong = data.education_period_end
+        setData.studyCompleteDate = studyCompleteDate
         var studyenddate = this.data.studyenddate
         studyenddate.selected = format.formatTime_month(data.education_end)
         studyenddate.datelong = data.education_end
@@ -1263,15 +1283,19 @@ Page({
           this.showToast('请选择受教育起始日期')
           return
         }
-        if (this.data.studyenddate.selected.length < 1) {
-          this.showToast('请选择受教育终止日期')
+        if (this.data.studyCompleteDate.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
-          }
+          // var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+          // if (this.data.studyCompleteDate.datelong < activedDate) {
+          //   this.showToast('受教育时间止不符合要求，无法申报')
+          //   return
+          // }
+          // if (this.data.studyenddate.selected.length > 0 && this.data.studyenddate.datelong < activedDate) {
+          //   this.showToast('教育终止时间不符合要求，无法申报')
+          //   return
+          // }
         }
         if (!formdata.school_name || formdata.school_name.length < 1) {
           this.showToast('请填写就读学校')
@@ -1304,6 +1328,7 @@ Page({
         newdata.percent = parseFloat(this.data.childrenpercentData.selected.replace("%",""))
         newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
         newdata.children_birthday = this.data.commonbirthDate.datelong
+        newdata.education_period_end = this.data.studyCompleteDate.datelong
         newdata.education_end = this.data.studyenddate.datelong
         newdata.education_start = this.data.studystartdate.datelong 
         newdata.education_period = this.data.childedudegreeData.selected
@@ -1332,7 +1357,7 @@ Page({
           } else {
             var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
             if (this.data.studyenddate.datelong < activedDate) {
-              this.showToast('终止(毕业)日期不符合要求，无法申报')
+              this.showToast('毕业日期不符合要求，无法申报')
               return
             }
           }
@@ -1929,12 +1954,45 @@ Page({
         })
         break;
       case 'study_start_date':
+        var select_date = e.detail.value
         var study_startdate = this.data.studystartdate
-        study_startdate.selected = e.detail.value
-        study_startdate.datelong = (Date.parse(new Date(e.detail.value)) / 1000)
+        study_startdate.selected = select_date
+        study_startdate.datelong = (Date.parse(new Date(select_date)) / 1000)
+        //处理两个终止时间的限制
+        var select_year = select_date.substring(0, 4)
+        var start = select_date
+        if (select_year<2019){
+          start = '2019-01'
+        } 
+        var studyCompleteDate = this.data.studyCompleteDate
+        studyCompleteDate.start = start
+        studyCompleteDate.selected = ''
+        var study_enddate = this.data.studyenddate
+        study_enddate.start = start
+        study_enddate.selected = ''
+        this.setData({
+          studystartdate: study_startdate,
+          studyCompleteDate: studyCompleteDate,
+          studyenddate: study_enddate
+        })
+        break;
+      case 'study_comp_date':
+        var studyCompleteDate = this.data.studyCompleteDate
+        studyCompleteDate.selected = e.detail.value
+        var datelong = (Date.parse(new Date(e.detail.value)) / 1000)
+        studyCompleteDate.datelong = datelong
+
+        var study_enddate = this.data.studyenddate
+        study_enddate.end = e.detail.value
+        study_enddate.selected = ''
         this.setData({
-          studystartdate: study_startdate
+          studyCompleteDate: studyCompleteDate,
+          studyenddate: study_enddate
         })
+        // var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+        // if (datelong < activedDate) {
+        //   this.showToast('受教育时间止不符合要求，无法申报')
+        // }
         break;
       case 'study_end_date':
         var study_enddate = this.data.studyenddate
@@ -1944,10 +2002,10 @@ Page({
         this.setData({
           studyenddate: study_enddate
         })
-        var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
-        if (datelong < activedDate){
-          this.showToast('终止(毕业)日期不符合要求，无法申报')
-        }
+        // 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

@@ -60,8 +60,10 @@
       <template is="picker_cell_normal" data="{{...studystartdate}}" />
       <view class='divide_line_30'></view>
 
-      <template is="picker_cell_normal" data="{{...studyenddate}}" />
+      <template is="picker_cell_normal" data="{{...studyCompleteDate}}" />
+      <view class='divide_line_30'></view>  
 
+      <template is="picker_cell_normal" data="{{...studyenddate}}" />
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
       <view class='divide_line_30'></view>