|
@@ -81,16 +81,16 @@ Page({ |
|
@@ -81,16 +81,16 @@ Page({ |
|
81
|
end: '2018-01-01',
|
81
|
end: '2018-01-01',
|
|
82
|
onChange: 'onPickerSelect',
|
82
|
onChange: 'onPickerSelect',
|
|
83
|
},
|
83
|
},
|
|
84
|
- older_relativeData: {
|
|
|
|
85
|
- label: '与纳税人关系',
|
|
|
|
86
|
- isrequre: true,
|
|
|
|
87
|
- bindtype: 'older_relative',
|
|
|
|
88
|
- selected: '',
|
|
|
|
89
|
- isblack: 'true',
|
|
|
|
90
|
- placeholder: '请选择与纳税人关系',
|
|
|
|
91
|
- values: ["父母", "祖父母、外祖父母"],
|
|
|
|
92
|
- onChange: 'onPickerSelect'
|
|
|
|
93
|
- },
|
84
|
+ // older_relativeData: {
|
|
|
|
85
|
+ // label: '与纳税人关系',
|
|
|
|
86
|
+ // isrequre: true,
|
|
|
|
87
|
+ // bindtype: 'older_relative',
|
|
|
|
88
|
+ // selected: '',
|
|
|
|
89
|
+ // isblack: 'true',
|
|
|
|
90
|
+ // placeholder: '请选择与纳税人关系',
|
|
|
|
91
|
+ // values: ["父母", "祖父母、外祖父母"],
|
|
|
|
92
|
+ // onChange: 'onPickerSelect'
|
|
|
|
93
|
+ // },
|
|
94
|
taxperson_relativeData: {
|
94
|
taxperson_relativeData: {
|
|
95
|
label: '与纳税人的关系',
|
95
|
label: '与纳税人的关系',
|
|
96
|
isrequre: true,
|
96
|
isrequre: true,
|
|
@@ -783,11 +783,6 @@ Page({ |
|
@@ -783,11 +783,6 @@ Page({ |
|
783
|
olderbirthDate.datelong = data.birth_date
|
783
|
olderbirthDate.datelong = data.birth_date
|
|
784
|
setData.olderbirthDate = olderbirthDate
|
784
|
setData.olderbirthDate = olderbirthDate
|
|
785
|
}
|
785
|
}
|
|
786
|
- if (data.family_ties && data.family_ties.length) {
|
|
|
|
787
|
- var older_relativeData = this.data.older_relativeData
|
|
|
|
788
|
- older_relativeData.selected = data.family_ties
|
|
|
|
789
|
- setData.older_relativeData = older_relativeData
|
|
|
|
790
|
- }
|
|
|
|
791
|
this.setData(setData)
|
786
|
this.setData(setData)
|
|
792
|
break;
|
787
|
break;
|
|
793
|
case 'medical_fund':
|
788
|
case 'medical_fund':
|
|
@@ -1204,10 +1199,10 @@ Page({ |
|
@@ -1204,10 +1199,10 @@ Page({ |
|
1204
|
this.showToast('请选择被赡养人出生日期')
|
1199
|
this.showToast('请选择被赡养人出生日期')
|
|
1205
|
return
|
1200
|
return
|
|
1206
|
}
|
1201
|
}
|
|
1207
|
- if (this.data.older_relativeData.selected.length < 1) {
|
|
|
|
1208
|
- this.showToast('请选择与纳税人关系')
|
|
|
|
1209
|
- return
|
|
|
|
1210
|
- }
|
1202
|
+ // if (this.data.older_relativeData.selected.length < 1) {
|
|
|
|
1203
|
+ // this.showToast('请选择与纳税人关系')
|
|
|
|
1204
|
+ // return
|
|
|
|
1205
|
+ // }
|
|
1211
|
// if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
|
1206
|
// if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
|
|
1212
|
// this.showToast('请填写合理分摊比例')
|
1207
|
// this.showToast('请填写合理分摊比例')
|
|
1213
|
// return
|
1208
|
// return
|
|
@@ -1220,7 +1215,7 @@ Page({ |
|
@@ -1220,7 +1215,7 @@ Page({ |
|
1220
|
newdata.share_method = this.share_method
|
1215
|
newdata.share_method = this.share_method
|
|
1221
|
}
|
1216
|
}
|
|
1222
|
newdata.birthday = this.data.olderbirthDate.datelong
|
1217
|
newdata.birthday = this.data.olderbirthDate.datelong
|
|
1223
|
- newdata.relationship = this.data.older_relativeData.selected
|
1218
|
+ // newdata.relationship = this.data.older_relativeData.selected
|
|
1224
|
newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
|
1219
|
newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
|
|
1225
|
newdata.nation = "中国"
|
1220
|
newdata.nation = "中国"
|
|
1226
|
break;
|
1221
|
break;
|
|
@@ -1634,13 +1629,13 @@ Page({ |
|
@@ -1634,13 +1629,13 @@ Page({ |
|
1634
|
loverbirthDate: lover_birthDate
|
1629
|
loverbirthDate: lover_birthDate
|
|
1635
|
})
|
1630
|
})
|
|
1636
|
break;
|
1631
|
break;
|
|
1637
|
- case 'older_relative':
|
|
|
|
1638
|
- var older_relativeData = this.data.older_relativeData
|
|
|
|
1639
|
- older_relativeData.selected = older_relativeData.values[e.detail.value]
|
|
|
|
1640
|
- this.setData({
|
|
|
|
1641
|
- older_relativeData: older_relativeData
|
|
|
|
1642
|
- })
|
|
|
|
1643
|
- break;
|
1632
|
+ // case 'older_relative':
|
|
|
|
1633
|
+ // var older_relativeData = this.data.older_relativeData
|
|
|
|
1634
|
+ // older_relativeData.selected = older_relativeData.values[e.detail.value]
|
|
|
|
1635
|
+ // this.setData({
|
|
|
|
1636
|
+ // older_relativeData: older_relativeData
|
|
|
|
1637
|
+ // })
|
|
|
|
1638
|
+ // break;
|
|
1644
|
case 'taxperson_relative':
|
1639
|
case 'taxperson_relative':
|
|
1645
|
var taxperson_relativedata = this.data.taxperson_relativeData
|
1640
|
var taxperson_relativedata = this.data.taxperson_relativeData
|
|
1646
|
taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]
|
1641
|
taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]
|
