Merge branch 'dev_py' into dev2.0

@@ -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
@@ -997,103 +1017,6 @@ Page({
         if (data.name && data.name.length) {
           setData.children_name = data.name
         }
-        if (data.percent && data.percent.length) {
-          var childrenpercentData = this.data.childrenpercentData
-          childrenpercentData.selected = data.percent
-          setData.childrenpercentData = childrenpercentData
-        }
-        if (data.student_no && data.student_no.length) {
-          setData.children_student_no = data.student_no
-        }
-        if (data.education_period && data.education_period.length) {
-          var childedudegreeData = this.data.childedudegreeData
-          childedudegreeData.selected = data.education_period
-          setData.childedudegreeData = childedudegreeData
-        }
-        if (data.education_start && data.education_start.length) {
-          var studystartdate = this.data.studystartdate
-          studystartdate.selected = format.formatTime_date(data.education_start)
-          studystartdate.datelong = data.education_start
-          setData.studystartdate = studystartdate
-        }
-        if (data.education_end && data.education_end.length) {
-          var studyenddate = this.data.studyenddate
-          studyenddate.selected = format.formatTime_date(data.education_end)
-          studyenddate.datelong = data.education_end
-          setData.studyenddate = studyenddate
-          console.log("studyenddate", studyenddate)
-        }
-        if (data.school_country && data.school_country.length) {
-          var schoolCountryData = this.data.schoolCountryData
-          schoolCountryData.selected = data.school_country
-          setData.schoolCountryData = schoolCountryData
-        }
-        if (data.school_name && data.school_name.length) {
-          setData.school_name = data.school_name
-        }
-        if (data.spouse_name && data.spouse_name.length) {
-          setData.spouse_name = data.spouse_name
-        }
-        if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
-          setData.spouse_id_card_no = data.spouse_id_card_no
-          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
-        }
-        if (this.data.loverbirthDate.selected.length) {
-          var loverbirthDate = this.data.loverbirthDate
-          loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
-          loverbirthDate.datelong = data.spouse_birthday
-          setData.loverbirthDate = loverbirthDate
-        }
-
-        this.setData(setData)
-        break;
-      case 'continuing_education':
-        var setData = {}
-        if (data.education_type && data.education_type.length) {
-          if ('title' == data.education_type) {
-            var edutypeData = this.data.edutypeData
-            edutypeData.selected = "学历（学位）继续教育"
-            setData.edutypeData = edutypeData
-          } else {
-            var edutypeData = this.data.edutypeData
-            edutypeData.selected = data.education_type == 'major' ? "专业技术人员职业资格" : "技能人员职业资格"
-            setData.edutypeData = edutypeData
-          }
-        }
-        if (data.education_period && data.education_period.length) {
-          var edulevelData = this.data.edulevelData
-          edulevelData.selected = data.education_period
-          setData.edulevelData = edulevelData
-        }
-        if (data.education_start && data.education_start.length) {
-          var studystartdate = this.data.studystartdate
-          studystartdate.selected = format.formatTime_date(data.education_start)
-          studystartdate.datelong = data.education_start
-          setData.studystartdate = studystartdate
-        }
-        if (data.education_end && data.education_end.length) {
-          var studyenddate = this.data.studyenddate
-          studyenddate.selected = format.formatTime_date(data.education_end)
-          studyenddate.datelong = data.education_end
-          setData.studyenddate = studyenddate
-        }
-        if (data.approval_date && data.approval_date.length) {
-          var applydate = this.data.applydate
-          applydate.selected = format.formatTime_date(data.approval_date)
-          applydate.datelong = data.approval_date
-          setData.applydate = applydate
-        }
-        if (data.certification_name && data.certification_name.length) {
-          var certificateDate = this.data.certificateDate
-          certificateDate.selected = data.certification_name
-          setData.certificateDate = certificateDate
-        }
-        if (data.certification_no && data.certification_no.length) {
-          setData.certification_no = data.certification_no
-        }
-        if (data.certification_authority && data.certification_authority.length) {
-          setData.certification_authority = data.certification_authority
-        }
         this.setData(setData)
         break;
       case 'support_duty':
@@ -1131,86 +1054,7 @@ Page({
         }
         this.setData(setData)
         break;
-      case "house_fund":
-        var setData = {}
-        if (data.spouse_name && data.spouse_name.length) {
-          setData.spouse_name = data.spouse_name
-        }
-        if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
-          setData.spouse_id_card_no = data.spouse_id_card_no
-          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
-        }
-        if (this.data.loverbirthDate.selected.length) {
-          var loverbirthDate = this.data.loverbirthDate
-          loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
-          loverbirthDate.datelong = data.spouse_birthday
-          setData.loverbirthDate = loverbirthDate
-        }
-        if (data.loan_type && data.loan_type.length) {
-          var loantypeData = this.data.loantypeData
-          loantypeData.selected = data.loan_type
-          setData.loantypeData = loantypeData
-        }
-        if (data.house_detail_address && data.house_detail_address.length) {
-          setData.house_detail_address = data.house_detail_address
-        }
-        if (data.certification_no && data.certification_no.length) {
-          setData.certification_no = data.certification_no
-        }
-        if (data.certification_type && data.certification_type.length) {
-          var identifytypeData = this.data.identifytypeData
-          identifytypeData.selected = data.certification_type
-          setData.identifytypeData = identifytypeData
-        }
-        if (data.loan_before_marry && data.loan_before_marry.length) {
-          var beforemarryData = this.data.beforemarryData
-          beforemarryData.selected = data.loan_before_marry
-          setData.beforemarryData = beforemarryData
-        }
-        if (data.loan_by_self && data.loan_by_self.length) {
-          var isselfData = this.data.isselfData
-          isselfData.selected = data.loan_by_self
-          setData.isselfData = isselfData
-        }
-        if (data.loan_contract_no && data.loan_contract_no.length) {
-          setData.loan_contract_no = data.loan_contract_no
-        }
-        if (data.rent_contract_no && data.rent_contract_no.length) {
-          setData.rent_contract_no = data.rent_contract_no
-        }
-        if (data.rent_start && data.rent_start.length) {
-          var leasestartDate = this.data.leasestartDate
-          leasestartDate.selected = format.formatTime_date(data.rent_start)
-          leasestartDate.datelong = data.rent_start
-          setData.leasestartDate = leasestartDate
-        }
-        if (data.rent_end && data.rent_end.length) {
-          var leaseendDate = this.data.leaseendDate
-          leaseendDate.selected = format.formatTime_date(data.rent_end)
-          leaseendDate.datelong = data.rent_end
-          setData.leaseendDate = leaseendDate
-        }
-        if (data.work_city && data.work_city.province) {
-          var workingcityInfo = this.data.workingcityInfo
-          workingcityInfo.requestdata = data.work_city
-          workingcityInfo.selected = data.work_city.province + data.work_city.city
-          setData.workingcityInfo = workingcityInfo
-        }
-        if (this.data.house_type == 'house_fund_loan' && data.house_address && data.house_address.province) {
-          var houseLocateInfo = this.data.houseLocateInfo
-          houseLocateInfo.requestdata = data.house_address
-          houseLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
-          setData.houseLocateInfo = houseLocateInfo
-        }
-        if (this.data.house_type == 'house_fund_rent' && data.house_address && data.house_address.province) {
-          var rentLocateInfo = this.data.rentLocateInfo
-          rentLocateInfo.requestdata = data.house_address
-          rentLocateInfo.selected = data.work_city.province + data.work_city.city + data.work_city.district
-          setData.rentLocateInfo = rentLocateInfo
-        }
-
-        this.setData(setData)
-        break;
+      
     }
 
   },
@@ -1439,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('请填写就读学校')
@@ -1480,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
@@ -1508,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
             }
           }
@@ -2105,13 +1954,46 @@ 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
+          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({
+          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
         study_enddate.selected = e.detail.value
@@ -2120,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>