提交 fc4005a6190762ff6342c6133a552b4e0d56c27b

作者 pangy
2 个父辈 681d766f fcaabbba

Merge branch '机器人_py' into 机器人dev

@@ -836,18 +836,26 @@ Page({ @@ -836,18 +836,26 @@ Page({
836 studystartdate.datelong = data.education_start 836 studystartdate.datelong = data.education_start
837 setData.studystartdate = studystartdate 837 setData.studystartdate = studystartdate
838 var studyEndDate = this.data.studyEndDate 838 var studyEndDate = this.data.studyEndDate
  839 + var studyPeriodDate = this.data.studyPeriodDate
839 if (data.education_end > 0) { 840 if (data.education_end > 0) {
840 studyEndDate.selected = format.formatTime_month(data.education_end) 841 studyEndDate.selected = format.formatTime_month(data.education_end)
841 studyEndDate.datelong = data.education_end 842 studyEndDate.datelong = data.education_end
842 - setData.studyEndDate = studyEndDate  
843 } 843 }
844 - var studyPeriodDate = this.data.studyPeriodDate  
845 if (data.education_period_end > 0){ 844 if (data.education_period_end > 0){
846 studyPeriodDate.selected = format.formatTime_month(data.education_period_end) 845 studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
847 studyPeriodDate.datelong = data.education_period_end 846 studyPeriodDate.datelong = data.education_period_end
848 } 847 }
849 - studyPeriodDate.start = studystartdate.selected 848 + var start = studystartdate.selected, select_year = 0
  849 + if (start.length > 4) {
  850 + select_year = start.substring(0, 4)
  851 + }
  852 + if (select_year < 2019) {
  853 + start = '2019-01'
  854 + }
  855 + studyEndDate.start = start
  856 + studyPeriodDate.start = start
850 studyPeriodDate.end = studyEndDate.selected 857 studyPeriodDate.end = studyEndDate.selected
  858 + setData.studyEndDate = studyEndDate
851 setData.studyPeriodDate = studyPeriodDate 859 setData.studyPeriodDate = studyPeriodDate
852 setData.deduction_amount = data.deduction_amount 860 setData.deduction_amount = data.deduction_amount
853 if (data.children_id_card_no && data.children_id_card_no.length) { 861 if (data.children_id_card_no && data.children_id_card_no.length) {
注册登录 后发表评论