Merge branch 'dev_py' into dev2.0

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @3478dde
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @3478dde
@@ -185,6 +185,7 @@ Page({
     },
     certificateDate: {
       label: '证书名称',
+      maxWidth: 460,
       isrequre: true,
       bindtype: 'certificate',
       values: [],
@@ -310,10 +311,10 @@ Page({
       // end: (new Date()).getFullYear() + '-09-01',
       // onTap: 'studyDataTap'
     },
-    studyCompleteDate: {
+    studyEndDate: {
       label: '受教育时间止',
       isrequre: true,
-      bindtype: 'study_comp_date',
+      bindtype: 'study_end_date',
       selected: '',
       isblack: 'true',
       values: ["是", "否"],
@@ -326,10 +327,10 @@ Page({
       // end: (new Date()).getFullYear() + '-09-01',
       // onTap: 'studyDataTap'
     },
-    studyenddate: {
+    studyPeriodDate: {
       label: '教育终止时间',
       // isrequre: true,
-      bindtype: 'study_end_date',
+      bindtype: 'study_per_date',
       selected: '',
       values: ["是", "否"],
       placeholder: '请选择时间',
@@ -563,12 +564,12 @@ Page({
       this.getCertificates()
       var studystart_date = this.data.studystartdate
       studystart_date.label = "入学时间起"
-      var studyend_date = this.data.studyenddate
+      var studyend_date = this.data.studyEndDate
       studyend_date.label = "(预计)毕业时间"
       studyend_date.isrequre = true
       this.setData({
         studystartdate: studystart_date,
-        studyenddate: studyend_date
+        studyEndDate: studyend_date
       })
     } else if ("medical_fund" == options.status) {
       var cardtype_data = this.data.cardtypeData
@@ -719,14 +720,18 @@ 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
-        setData.studyenddate = studyenddate
+        var studyEndDate = this.data.studyEndDate
+        studyEndDate.selected = format.formatTime_month(data.education_end)
+        studyEndDate.datelong = data.education_end
+        setData.studyEndDate = studyEndDate
+        var studyPeriodDate = this.data.studyPeriodDate
+        if (data.education_period_end > 0){
+          studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
+          studyPeriodDate.datelong = data.education_period_end
+        }
+        studyPeriodDate.start = studystartdate.selected
+        studyPeriodDate.end = studyEndDate.selected
+        setData.studyPeriodDate = studyPeriodDate
         setData.deduction_amount = data.deduction_amount
         if (data.children_id_card_no && data.children_id_card_no.length) {
           setData.children_id_card_no = data.children_id_card_no
@@ -785,20 +790,23 @@ Page({
             studystartdate.selected = format.formatTime_month(data.education_start)
             studystartdate.datelong = data.education_start
             setData.studystartdate = studystartdate
-            var studyenddate = this.data.studyenddate
-            studyenddate.selected = format.formatTime_month(data.education_end)
-            studyenddate.datelong = data.education_end
-            setData.studyenddate = studyenddate
+            var studyEndDate = this.data.studyEndDate
+            studyEndDate.selected = format.formatTime_month(data.education_end)
+            studyEndDate.datelong = data.education_end
+            setData.studyEndDate = studyEndDate
           } else {
             setData.edu_lable = 'tech'
             var edutypeData = this.data.edutypeData
             edutypeData.selected = "职业资格继续教育"
             var edustyleData = this.data.edustyleData
+            var certificateDate = this.data.certificateDate
             if (data.education_type == 'major'){
               edustyleData.selected = "专业技术人员职业资格"
+              // certificateDate.values = this.major_cers //  网络延迟
             } else if (data.education_type == 'profession'){
               edustyleData.selected = "技能人员职业资格"
+              // certificateDate.values = this.profs_cers //  网络延迟
             }
             setData.edutypeData = edutypeData
             setData.edustyleData = edustyleData
@@ -808,7 +816,6 @@ Page({
             setData.applydate = applydate
             if (data.certification_name && data.certification_name.length) {
-              var certificateDate = this.data.certificateDate
               certificateDate.selected = data.certification_name
               setData.certificateDate = certificateDate
             }
@@ -1222,6 +1229,17 @@ Page({
         console.log('certification', res)
         that.profs_cers = res.data.profession_certificates
         that.major_cers = res.data.major_certificates
+
+        var certificateDate = that.data.certificateDate
+        if (that.data.edustyleData.selected == "专业技术人员职业资格"){
+          certificateDate.values = that.major_cers 
+        } else if (that.data.edustyleData.selected == '技能人员职业资格') {
+          certificateDate.values = that.profs_cers
+        }
+        that.setData({
+          certificateDate: certificateDate
+        })
+
       },
       fail(res) {
         console.log(res)
@@ -1283,19 +1301,19 @@ Page({
           this.showToast('请选择受教育起始日期')
           return
         }
-        if (this.data.studyCompleteDate.selected.length < 1) {
+        if (this.data.studyEndDate.selected.length < 1) {
           this.showToast('请选择受教育时间止')
           return
         }else{
-          // 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
-          // }
+          var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
+          if (this.data.studyEndDate.datelong < activedDate) {
+            this.showToast('受教育时间止不符合要求，无法申报')
+            return
+          }
+          if (this.data.studyPeriodDate.selected.length > 0 && this.data.studyPeriodDate.datelong < activedDate) {
+            this.showToast('教育终止时间不符合要求，无法申报')
+            return
+          }
         }
         if (!formdata.school_name || formdata.school_name.length < 1) {
           this.showToast('请填写就读学校')
@@ -1328,8 +1346,8 @@ 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_period_end = this.data.studyPeriodDate.datelong
+        newdata.education_end = this.data.studyEndDate.datelong
         newdata.education_start = this.data.studystartdate.datelong 
         newdata.education_period = this.data.childedudegreeData.selected
         newdata.school_country = this.data.schoolCountryData.selected
@@ -1351,18 +1369,18 @@ Page({
             this.showToast('请选择入学时间')
             return
           }
-          if (this.data.studyenddate.selected.length < 1) {
+          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) {
+            if (this.data.studyEndDate.datelong < activedDate) {
               this.showToast('毕业日期不符合要求，无法申报')
               return
             }
           }
           newdata.education_start = this.data.studystartdate.datelong
-          newdata.education_end = this.data.studyenddate.datelong
+          newdata.education_end = this.data.studyEndDate.datelong
           newdata.education_type = 'title' //学历
           newdata.education_period = this.data.edulevelData.selected
         } else if (this.data.edu_lable == 'tech') {
@@ -1872,11 +1890,11 @@ Page({
   //     })
   //   } else if (e.currentTarget.id == 'study_end_date') {
   //     console.log('study_end_date')
-  //     var study_enddate = this.data.studyenddate
+  //     var study_enddate = this.data.studyEndDate
   //     study_enddate.start = '1970-01-01'
   //     study_enddate.end = ''
   //     this.setData({
-  //       studyenddate: study_enddate
+  //       studyEndDate: study_enddate
   //     })
   //   } 
   // },
@@ -1964,47 +1982,56 @@ Page({
         if (select_year<2019){
           start = '2019-01'
         } 
-        var studyCompleteDate = this.data.studyCompleteDate
-        studyCompleteDate.start = start
-        studyCompleteDate.selected = ''
-        var study_enddate = this.data.studyenddate
+        var studyPeriodDate = this.data.studyPeriodDate
+        studyPeriodDate.start = start
+        studyPeriodDate.selected = ''
+        studyPeriodDate.datelong = null
+        var study_enddate = this.data.studyEndDate
         study_enddate.start = start
         study_enddate.selected = ''
         this.setData({
           studystartdate: study_startdate,
-          studyCompleteDate: studyCompleteDate,
-          studyenddate: study_enddate
+          studyPeriodDate: studyPeriodDate,
+          studyEndDate: study_enddate
         })
         break;
-      case 'study_comp_date':
-        var studyCompleteDate = this.data.studyCompleteDate
-        studyCompleteDate.selected = e.detail.value
+      case 'study_end_date':
+        var study_enddate = this.data.studyEndDate
+        study_enddate.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 = ''
+        study_enddate.datelong = datelong
+       
+        var studyPeriodDate = this.data.studyPeriodDate
+        studyPeriodDate.end = e.detail.value
+        studyPeriodDate.selected = ''
+        studyPeriodDate.datelong = null
         this.setData({
-          studyCompleteDate: studyCompleteDate,
-          studyenddate: study_enddate
+          studyPeriodDate: studyPeriodDate,
+          studyEndDate: study_enddate
         })
         // var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
-        // if (datelong < activedDate) {
-        //   this.showToast('受教育时间止不符合要求，无法申报')
+        // if (datelong < activedDate){
+        //   this.showToast('教育终止时间不符合要求，无法申报')
         // }
         break;
-      case 'study_end_date':
-        var study_enddate = this.data.studyenddate
-        study_enddate.selected = e.detail.value
+      case 'study_per_date':
+        var studyPeriodDate = this.data.studyPeriodDate
+        studyPeriodDate.selected = e.detail.value
         var datelong = (Date.parse(new Date(e.detail.value)) / 1000)
-        study_enddate.datelong = datelong
+        studyPeriodDate.datelong = datelong
+        if (datelong > this.data.studyEndDate.datelong) {
+          wx.showToast({
+            title: '教育终止日应不大于受教育时间止',
+            icon:'none'
+          })
+          return
+        }
         this.setData({
-          studyenddate: study_enddate
+          studyPeriodDate: studyPeriodDate,
         })
         // var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
-        // if (datelong < activedDate){
-        //   this.showToast('教育终止时间不符合要求，无法申报')
+        // if (datelong < activedDate) {
+        //   this.showToast('受教育时间止不符合要求，无法申报')
         // }
         break;
       case 'child_edu_degree':
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @3478dde
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @3478dde
@@ -60,10 +60,10 @@
       <template is="picker_cell_normal" data="{{...studystartdate}}" />
       <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...studyCompleteDate}}" />
+      <template is="picker_cell_normal" data="{{...studyEndDate}}" />
       <view class='divide_line_30'></view>  
-      <template is="picker_cell_normal" data="{{...studyenddate}}" />
+      <template is="picker_cell_normal" data="{{...studyPeriodDate}}" />
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
       <view class='divide_line_30'></view>