正在显示
2 个修改的文件
包含
24 行增加
和
7 行删除
| @@ -4,8 +4,8 @@ var OSSInit; | @@ -4,8 +4,8 @@ var OSSInit; | ||
| 4 | var app = getApp(); | 4 | var app = getApp(); |
| 5 | var baseUrl = app.globalData.baseUrl; | 5 | var baseUrl = app.globalData.baseUrl; |
| 6 | const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' } | 6 | const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' } |
| 7 | -const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': 400, 'support_duty': '', 'medical_fund': '','house_fund':''} | ||
| 8 | -const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': '', 'medical_fund': '', 'house_fund': '' } | 7 | +const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': 400, 'support_duty': 2000, 'medical_fund': 0,'house_fund':0} |
| 8 | +const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': 24000, 'medical_fund': 0, 'house_fund': 0 } | ||
| 9 | 9 | ||
| 10 | Page({ | 10 | Page({ |
| 11 | idcard_belong:null,//照片信息获取返回时判断所属 | 11 | idcard_belong:null,//照片信息获取返回时判断所属 |
| @@ -43,6 +43,16 @@ Page({ | @@ -43,6 +43,16 @@ Page({ | ||
| 43 | end: '2018-01-01', | 43 | end: '2018-01-01', |
| 44 | onChange: 'onPickerSelect', | 44 | onChange: 'onPickerSelect', |
| 45 | }, | 45 | }, |
| 46 | + older_relativeData: { | ||
| 47 | + label: '与纳税人的关系', | ||
| 48 | + isrequre: true, | ||
| 49 | + bindtype: 'older_relative', | ||
| 50 | + selected: '', | ||
| 51 | + isblack: 'true', | ||
| 52 | + placeholder: '请选择与纳税人的关系', | ||
| 53 | + values: ["父母", "祖父母", "外祖父母"], | ||
| 54 | + onChange: 'onPickerSelect' | ||
| 55 | + }, | ||
| 46 | taxperson_relativeData: { | 56 | taxperson_relativeData: { |
| 47 | label: '与纳税人的关系', | 57 | label: '与纳税人的关系', |
| 48 | isrequre: true, | 58 | isrequre: true, |
| @@ -649,7 +659,7 @@ Page({ | @@ -649,7 +659,7 @@ Page({ | ||
| 649 | } | 659 | } |
| 650 | break; | 660 | break; |
| 651 | case 'support_duty': | 661 | case 'support_duty': |
| 652 | - // subUrl = 'persontax/v1/continuing-educations' | 662 | + subUrl = 'persontax/v1/support-duties' |
| 653 | if (this.data.supporttypeData.selected.length < 1) { | 663 | if (this.data.supporttypeData.selected.length < 1) { |
| 654 | this.showToast('请选择赡养类型') | 664 | this.showToast('请选择赡养类型') |
| 655 | return | 665 | return |
| @@ -668,12 +678,12 @@ Page({ | @@ -668,12 +678,12 @@ Page({ | ||
| 668 | this.showToast('请选择赡养人出生日期') | 678 | this.showToast('请选择赡养人出生日期') |
| 669 | return | 679 | return |
| 670 | } | 680 | } |
| 671 | - if (this.data.taxperson_relativeData.selected.length < 1) { | 681 | + if (this.data.older_relativeData.selected.length < 1) { |
| 672 | this.showToast('请选择与纳税人关系') | 682 | this.showToast('请选择与纳税人关系') |
| 673 | return | 683 | return |
| 674 | } | 684 | } |
| 675 | newdata.older_birthday = this.data.olderbirthDate.selected | 685 | newdata.older_birthday = this.data.olderbirthDate.selected |
| 676 | - newdata.older_relative = this.data.taxperson_relativeData.selected | 686 | + newdata.older_relative = this.data.older_relativeData.selected |
| 677 | } | 687 | } |
| 678 | 688 | ||
| 679 | newdata.support_type = this.data.supporttypeData.selected | 689 | newdata.support_type = this.data.supporttypeData.selected |
| @@ -865,6 +875,13 @@ Page({ | @@ -865,6 +875,13 @@ Page({ | ||
| 865 | loverbirthDate: lover_birthDate | 875 | loverbirthDate: lover_birthDate |
| 866 | }) | 876 | }) |
| 867 | break; | 877 | break; |
| 878 | + case 'older_relative': | ||
| 879 | + var older_relativeData = this.data.older_relativeData | ||
| 880 | + older_relativeData.selected = older_relativeData.values[e.detail.value] | ||
| 881 | + this.setData({ | ||
| 882 | + older_relativeData: older_relativeData | ||
| 883 | + }) | ||
| 884 | + break; | ||
| 868 | case 'taxperson_relative': | 885 | case 'taxperson_relative': |
| 869 | var taxperson_relativedata = this.data.taxperson_relativeData | 886 | var taxperson_relativedata = this.data.taxperson_relativeData |
| 870 | taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value] | 887 | taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value] |
| @@ -125,11 +125,11 @@ | @@ -125,11 +125,11 @@ | ||
| 125 | <view style='height:90rpx'> | 125 | <view style='height:90rpx'> |
| 126 | <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | 126 | <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> |
| 127 | <text class='text_black_30 float_left'>被赡养人国籍(地区)</text> | 127 | <text class='text_black_30 float_left'>被赡养人国籍(地区)</text> |
| 128 | - <text class='text_333_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text> | 128 | + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text> |
| 129 | </view> | 129 | </view> |
| 130 | <view class='divide_line_f5f5f5'></view> | 130 | <view class='divide_line_f5f5f5'></view> |
| 131 | 131 | ||
| 132 | - <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> | 132 | + <template is="picker_cell_normal" data="{{...older_relativeData}}" /> |
| 133 | 133 | ||
| 134 | <!-- <view class='divide_line_f5f5f5'></view> | 134 | <!-- <view class='divide_line_f5f5f5'></view> |
| 135 | <view style='height:90rpx'> | 135 | <view style='height:90rpx'> |
请
注册
或
登录
后发表评论