子女教育 加关系字段

@@ -561,6 +561,10 @@ Page({
       if (options.isedit != 'true'){
       if (options.isedit != 'true'){
         this.getTaxList()
         this.getTaxList()
       }
       }
+      this.data.taxperson_relativeData.values = ['子','女']
+      this.setData({
+        taxperson_relativeData: this.data.taxperson_relativeData
+      })
     } else if ("continuing_education" == options.status) {
     } else if ("continuing_education" == options.status) {
       this.getCertificates()
       this.getCertificates()
       var studystart_date = this.data.studystartdate
       var studystart_date = this.data.studystartdate
@@ -781,6 +785,10 @@ Page({
     switch (this.data.cur_index + '') {
     switch (this.data.cur_index + '') {
       case 'children_education':
       case 'children_education':
         var setData = {}
         var setData = {}
+        if (data.relationship && data.relationship.length) {
+          this.data.taxperson_relativeData.selected = data.relationship
+          setData.taxperson_relativeData = this.data.taxperson_relativeData
+        }
         var commonbirthDate = this.data.commonbirthDate
         var commonbirthDate = this.data.commonbirthDate
         commonbirthDate.selected = format.formatTime_date(data.birth_date)
         commonbirthDate.selected = format.formatTime_date(data.birth_date)
         commonbirthDate.datelong = data.birth_date
         commonbirthDate.datelong = data.birth_date
@@ -793,9 +801,11 @@ Page({
         studystartdate.datelong = data.education_start
         studystartdate.datelong = data.education_start
         setData.studystartdate = studystartdate
         setData.studystartdate = studystartdate
         var studyEndDate = this.data.studyEndDate
         var studyEndDate = this.data.studyEndDate
-        studyEndDate.selected = format.formatTime_month(data.education_end)
-        studyEndDate.datelong = data.education_end
-        setData.studyEndDate = studyEndDate
+        if (data.education_end > 0) {
+          studyEndDate.selected = format.formatTime_month(data.education_end)
+          studyEndDate.datelong = data.education_end
+          setData.studyEndDate = studyEndDate
+        }
         var studyPeriodDate = this.data.studyPeriodDate
         var studyPeriodDate = this.data.studyPeriodDate
         if (data.education_period_end > 0){
         if (data.education_period_end > 0){
           studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
           studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
@@ -1097,6 +1107,11 @@ Page({
         if (data.name && data.name.length) {
         if (data.name && data.name.length) {
           setData.children_name = data.name
           setData.children_name = data.name
         }
         }
+        if (data.family_ties && data.family_ties.length) {
+          var taxperson_relativeData = this.data.taxperson_relativeData
+          taxperson_relativeData.selected = data.family_ties
+          setData.taxperson_relativeData = taxperson_relativeData
+        }
         this.setData(setData)
         this.setData(setData)
         break;
         break;
       case 'support_duty':
       case 'support_duty':
@@ -1367,6 +1382,11 @@ Page({
         //   this.showToast('请选择子女出生日期')
         //   this.showToast('请选择子女出生日期')
         //   return
         //   return
         // }
         // }
+
+        if (this.data.taxperson_relativeData.selected.length < 1) {
+          this.showToast('请选择与纳税人关系')
+          return
+        }
         if (this.data.childrenpercentData.selected.length < 1) {
         if (this.data.childrenpercentData.selected.length < 1) {
           this.showToast('请选择分配比例')
           this.showToast('请选择分配比例')
           return
           return

@@ -33,6 +33,8 @@
           <text class='text_777_30 float_left'>国籍</text>
           <text class='text_777_30 float_left'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
         </view>
         </view>
+        <view class='divide_line_30'></view>
+        <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
       </view>
       </view>
 
 
       <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
       <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>