正在显示
4 个修改的文件
包含
61 行增加
和
23 行删除
... | ... | @@ -65,7 +65,7 @@ Page({ |
65 | 65 | lovercardtypeData: { |
66 | 66 | label: '配偶证照类型', |
67 | 67 | bindtype: 'lovercardtype', |
68 | - selected: '居民身份证', | |
68 | + // selected: '居民身份证', | |
69 | 69 | disabled: true, |
70 | 70 | placeholder: '请选择证照类型', |
71 | 71 | values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照', |
... | ... | @@ -506,6 +506,16 @@ Page({ |
506 | 506 | placeholder: '中国', |
507 | 507 | onChange: 'onPickerSelect', |
508 | 508 | }, |
509 | + countryData: { | |
510 | + label: '国籍', | |
511 | + bindtype: 'country', | |
512 | + isrequre: true, | |
513 | + disabled: true, | |
514 | + selected: '中国', | |
515 | + // range_key:'name', | |
516 | + placeholder: '请选择国籍', | |
517 | + onChange: 'onPickerSelect', | |
518 | + }, | |
509 | 519 | // bankInfo: { |
510 | 520 | // label: '公积金贷款银行', |
511 | 521 | // bindtype: 'bank', |
... | ... | @@ -708,10 +718,18 @@ Page({ |
708 | 718 | if (data.name && data.name.length) { |
709 | 719 | setData.spouse_name = data.name |
710 | 720 | } |
721 | + that.data.lovercardtypeData.selected = data.id_card_type | |
722 | + setData.lovercardtypeData = that.data.lovercardtypeData | |
711 | 723 | if (data.id_card_no && data.id_card_no.length) { |
712 | 724 | setData.spouse_id_card_no = data.id_card_no |
713 | - that.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input') | |
725 | + if ('居民身份证' == data.id_card_type) { | |
726 | + that.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input') | |
727 | + } | |
714 | 728 | } |
729 | + that.data.loverbirthDate.selected = format.formatTime_date(data.birth_date) | |
730 | + that.data.loverbirthDate.datelong = data.birth_date | |
731 | + setData.loverbirthDate = that.data.loverbirthDate | |
732 | + setData.lover_country = data.native | |
715 | 733 | that.setData(setData) |
716 | 734 | } |
717 | 735 | }, |
... | ... | @@ -785,6 +803,8 @@ Page({ |
785 | 803 | switch (this.data.cur_index + '') { |
786 | 804 | case 'children_education': |
787 | 805 | var setData = {} |
806 | + this.data.countryData.selected = data.native | |
807 | + setData.countryData = this.data.countryData | |
788 | 808 | if (data.relationship && data.relationship.length) { |
789 | 809 | this.data.taxperson_relativeData.selected = data.relationship |
790 | 810 | setData.taxperson_relativeData = this.data.taxperson_relativeData |
... | ... | @@ -817,7 +837,9 @@ Page({ |
817 | 837 | setData.deduction_amount = data.deduction_amount |
818 | 838 | if (data.children_id_card_no && data.children_id_card_no.length) { |
819 | 839 | setData.children_id_card_no = data.children_id_card_no |
820 | - this.dealIdInfo(data.children_id_card_no, 'children_id_card_no_input') | |
840 | + if ('居民身份证' == data.id_card_type) { | |
841 | + this.dealIdInfo(data.children_id_card_no, 'children_id_card_no_input') | |
842 | + } | |
821 | 843 | } |
822 | 844 | if (data.children_name && data.children_name.length) { |
823 | 845 | setData.children_name = data.children_name |
... | ... | @@ -850,7 +872,9 @@ Page({ |
850 | 872 | } |
851 | 873 | if (data.spouse_id_card_no && data.spouse_id_card_no.length) { |
852 | 874 | setData.spouse_id_card_no = data.spouse_id_card_no |
853 | - this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input') | |
875 | + if ('居民身份证' == data.id_card_type) { | |
876 | + this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input') | |
877 | + } | |
854 | 878 | } |
855 | 879 | this.setData(setData) |
856 | 880 | break; |
... | ... | @@ -922,7 +946,9 @@ Page({ |
922 | 946 | } |
923 | 947 | if (data.id_card_no && data.id_card_no.length) { |
924 | 948 | setData.id_card_no = data.id_card_no |
925 | - this.dealIdInfo(data.id_card_no, 'older_id_card_no_input') | |
949 | + if ('居民身份证' == data.id_card_type) { | |
950 | + this.dealIdInfo(data.id_card_no, 'older_id_card_no_input') | |
951 | + } | |
926 | 952 | } |
927 | 953 | if (data.relationship && data.relationship.length) { |
928 | 954 | var older_relativeData = this.data.older_relativeData |
... | ... | @@ -968,7 +994,9 @@ Page({ |
968 | 994 | } |
969 | 995 | if (data.id_card_no && data.id_card_no.length) { |
970 | 996 | setData.spouse_id_card_no = data.id_card_no |
971 | - this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input') | |
997 | + if ('居民身份证' == data.id_card_type) { | |
998 | + this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input') | |
999 | + } | |
972 | 1000 | } |
973 | 1001 | if (this.data.house_type == 'house_fund_rent'){ |
974 | 1002 | var workingcityInfo = this.data.workingcityInfo |
... | ... | @@ -1097,13 +1125,17 @@ Page({ |
1097 | 1125 | switch (this.data.cur_index + '') { |
1098 | 1126 | case 'children_education': |
1099 | 1127 | var setData = {} |
1128 | + this.data.countryData.selected = data.native | |
1129 | + setData.countryData = this.data.countryData | |
1100 | 1130 | var commonbirthDate = this.data.commonbirthDate |
1101 | 1131 | commonbirthDate.selected = format.formatTime_date(data.birth_date) |
1102 | 1132 | commonbirthDate.datelong = data.birth_date |
1103 | 1133 | setData.commonbirthDate = commonbirthDate |
1104 | 1134 | if (data.id_card_no && data.id_card_no.length) { |
1105 | 1135 | setData.children_id_card_no = data.id_card_no |
1106 | - this.dealIdInfo(data.id_card_no, 'children_id_card_no_input') | |
1136 | + if ('居民身份证' == data.id_card_type) { | |
1137 | + this.dealIdInfo(data.id_card_no, 'children_id_card_no_input') | |
1138 | + } | |
1107 | 1139 | } |
1108 | 1140 | if (data.name && data.name.length) { |
1109 | 1141 | setData.children_name = data.name |
... | ... | @@ -1126,7 +1158,9 @@ Page({ |
1126 | 1158 | } |
1127 | 1159 | if (data.id_card_no && data.id_card_no.length) { |
1128 | 1160 | setData.id_card_no = data.id_card_no |
1129 | - this.dealIdInfo(data.id_card_no, 'older_id_card_no_input') | |
1161 | + if ('居民身份证' == data.id_card_type) { | |
1162 | + this.dealIdInfo(data.id_card_no, 'older_id_card_no_input') | |
1163 | + } | |
1130 | 1164 | } |
1131 | 1165 | if (data.family_ties && data.family_ties.length) { |
1132 | 1166 | var older_relativeData = this.data.older_relativeData |
... | ... | @@ -1146,7 +1180,9 @@ Page({ |
1146 | 1180 | } |
1147 | 1181 | if (data.id_card_no && data.id_card_no.length) { |
1148 | 1182 | setData.id_card_no = data.id_card_no |
1149 | - this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input') | |
1183 | + if ('居民身份证' == data.id_card_type) { | |
1184 | + this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input') | |
1185 | + } | |
1150 | 1186 | } |
1151 | 1187 | if (data.family_ties && data.family_ties.length) { |
1152 | 1188 | var taxperson_relativeData = this.data.taxperson_relativeData |
... | ... | @@ -1441,13 +1477,13 @@ Page({ |
1441 | 1477 | this.showToast('请选择配偶出生日期') |
1442 | 1478 | return |
1443 | 1479 | } |
1444 | - newdata.spouse_id_card_type = '居民身份证' //this.data.lovercardtypeData.selected | |
1480 | + newdata.spouse_id_card_type = this.data.lovercardtypeData.selected | |
1445 | 1481 | newdata.spouse_birthday = this.data.loverbirthDate.datelong |
1446 | 1482 | } |
1447 | 1483 | newdata.has_spouse = this.data.hasLover?'y':'n' |
1448 | 1484 | newdata.relationship = this.data.taxperson_relativeData.selected |
1449 | 1485 | newdata.percent = this.data.childrenpercentData.selected.replace("%","") |
1450 | - newdata.children_id_card_type = '居民身份证' //this.data.childrencardtypeData.selected | |
1486 | + newdata.children_id_card_type = this.data.childrencardtypeData.selected | |
1451 | 1487 | newdata.children_birthday = this.data.commonbirthDate.datelong |
1452 | 1488 | newdata.education_period_end = this.data.studyPeriodDate.datelong |
1453 | 1489 | newdata.education_end = this.data.studyEndDate.datelong |
... | ... | @@ -1787,7 +1823,7 @@ Page({ |
1787 | 1823 | return |
1788 | 1824 | } |
1789 | 1825 | newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : '' |
1790 | - newdata.id_card_type = '居民身份证' //this.data.lovercardtypeData.selected | |
1826 | + newdata.id_card_type = this.data.lovercardtypeData.selected | |
1791 | 1827 | newdata.birthday = this.data.loverbirthDate.datelong |
1792 | 1828 | newdata.nation = "中国" |
1793 | 1829 | } |
... | ... |
... | ... | @@ -28,11 +28,12 @@ |
28 | 28 | <view class='divide_line_30'></view> |
29 | 29 | <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> |
30 | 30 | <view class='divide_line_30'></view> |
31 | - <view style='height:90rpx'> | |
31 | + <template is="picker_cell_normal" data="{{...countryData}}" /> | |
32 | + <!-- <view style='height:90rpx'> | |
32 | 33 | <text class='red_star_right_10'>*</text> |
33 | 34 | <text class='text_777_30 float_left'>国籍</text> |
34 | 35 | <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text> |
35 | - </view> | |
36 | + </view> --> | |
36 | 37 | <view class='divide_line_30'></view> |
37 | 38 | <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> |
38 | 39 | </view> |
... | ... | @@ -243,7 +244,7 @@ |
243 | 244 | <view style='height:90rpx'> |
244 | 245 | <text class='red_star_right_10'>*</text> |
245 | 246 | <text class='text_777_30 float_left'>公积金贷款银行</text> |
246 | - <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_bank' value='{{loan_bank}}'></input> | |
247 | + <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入公积金贷款银行' name='loan_bank' value='{{loan_bank}}'></input> | |
247 | 248 | </view> |
248 | 249 | <view class='divide_line_30'></view> |
249 | 250 | <template is="picker_cell_normal" data="{{...firstpaybackDate}}" /> |
... | ... | @@ -374,7 +375,7 @@ |
374 | 375 | <view class='divide_line_30'></view> |
375 | 376 | <view style='height:90rpx'> |
376 | 377 | <text class='text_777_30 float_left head_in'>国籍</text> |
377 | - <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right;' name='lover_country'>中国</text> | |
378 | + <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right;' name='lover_country'>{{lover_country}}</text> | |
378 | 379 | </view> |
379 | 380 | </view> |
380 | 381 | |
... | ... |
... | ... | @@ -40,12 +40,13 @@ |
40 | 40 | <view class="divide_line_30"></view> |
41 | 41 | |
42 | 42 | <template is="picker_cell_normal" data="{{...genderData}}" /> |
43 | - <view class="divide_line_30"></view> | |
44 | - <view class='item_body'> | |
45 | - <text class='red_star_right_10'>*</text> | |
46 | - <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text> | |
47 | - <input class='input_wrap' name='age' type='number' placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input> | |
48 | - </view> | |
43 | + <view class="divide_line_30"></view> | |
44 | + <template is="picker_cell_normal" data="{{...birthDate}}" /> | |
45 | + <!-- <view class='item_body'> | |
46 | + <text class='red_star_right_10'>*</text> | |
47 | + <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text> | |
48 | + <input class='input_wrap' name='age' type='number' placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input> | |
49 | + </view> --> | |
49 | 50 | <view class="divide_line_30"></view> |
50 | 51 | <template is="picker_cell_normal" data="{{...countryData}}" /> |
51 | 52 | <!-- <view class='item_body'> |
... | ... |
... | ... | @@ -422,7 +422,7 @@ Page({ |
422 | 422 | this.data.birthDate.selected = '' |
423 | 423 | } else { |
424 | 424 | // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date) |
425 | - this.data.birthDate.selected = format.birth_date_str //formatTime_date(tax_info.birth_date) | |
425 | + this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) | |
426 | 426 | } |
427 | 427 | //非必填 |
428 | 428 | if (tax_info.join_date > 1000) { |
... | ... |
请
注册
或
登录
后发表评论