wangyu / naturalPersonTax · 提交

提交 b17062ccd39d06b181bdccb05505824b233beb06

作者 wangyu
1 个父辈 49d503a7
构建： 未知

优化

内嵌 并排对比
正在显示 4 个修改的文件 包含 535 行增加 和 55 行删除
@@ -9,7 +9,6 @@ Page({ @@ -9,7 +9,6 @@ Page({
9 data: { 9 data: {
10 lable: 0, 10 lable: 0,
11 datas02: [], 11 datas02: [],
12 - curdata: {},  
13 title: '', 12 title: '',
14 extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"], 13 extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
15 cur_index: 0, 14 cur_index: 0,
@@ -106,6 +105,17 @@ Page({ @@ -106,6 +105,17 @@ Page({
106 ], 105 ],
107 onChange: 'onPickerSelect' 106 onChange: 'onPickerSelect'
108 }, 107 },
  108 + cardtypeData: {
  109 + label: '证件类型',
  110 + bindtype: 'cardtype',
  111 + selected: '',
  112 + isblack: 'true',
  113 + placeholder: '请选择证件类型',
  114 + values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
  115 + '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
  116 + ],
  117 + onChange: 'onPickerSelect'
  118 + },
109 olderbirthDate: { 119 olderbirthDate: {
110 label: '被赡养人出生日期', 120 label: '被赡养人出生日期',
111 bindtype: 'olderbirthday', 121 bindtype: 'olderbirthday',
@@ -127,6 +137,15 @@ Page({ @@ -127,6 +137,15 @@ Page({
127 placeholder: '请选择是否独生子女', 137 placeholder: '请选择是否独生子女',
128 onChange: 'onPickerSelect' 138 onChange: 'onPickerSelect'
129 }, 139 },
  140 + reducetypeData: {
  141 + label: '扣除方式',
  142 + bindtype: 'reduce_type',
  143 + selected: '',
  144 + isblack: 'true',
  145 + values: ["月度扣除", "年度扣除"],
  146 + placeholder: '请选择扣除方式',
  147 + onChange: 'onPickerSelect'
  148 + },
130 studystartdate: { 149 studystartdate: {
131 label: '受教育日期起', 150 label: '受教育日期起',
132 bindtype: 'study_start_date', 151 bindtype: 'study_start_date',
@@ -151,6 +170,89 @@ Page({ @@ -151,6 +170,89 @@ Page({
151 fields: "day", 170 fields: "day",
152 start: '1970-01-01', 171 start: '1970-01-01',
153 }, 172 },
  173 + identifytypeData: {
  174 + label: '证书类型',
  175 + bindtype: 'identify_type',
  176 + selected: '',
  177 + isblack: 'true',
  178 + values: ["产权证", "不动产权登记证"],
  179 + placeholder: '请选择证书类型',
  180 + onChange: 'onPickerSelect'
  181 + },
  182 + loantypeData: {
  183 + label: '贷款类型',
  184 + bindtype: 'loan_type',
  185 + selected: '',
  186 + isblack: 'true',
  187 + values: ["公积金贷款", "商业贷款"],
  188 + placeholder: '请选择贷款类型',
  189 + onChange: 'onPickerSelect'
  190 + },
  191 + leasetypeData: {
  192 + label: '出租方类型',
  193 + bindtype: 'lease_type',
  194 + selected: '',
  195 + isblack: 'true',
  196 + values: ["组织", "自然人"],
  197 + placeholder: '请选择出租方类型',
  198 + onChange: 'onPickerSelect'
  199 + },
  200 + houseLocateInfo: {
  201 + label: '房屋坐落地址',
  202 + mode: 'region',
  203 + bindtype: 'house_locate',
  204 + isblack: 'true',
  205 + address_code: ['', '', ''],
  206 + address_value: ['', '', ''],
  207 + selected: '',
  208 + placeholder: '请选择地址',
  209 + onChange: 'onPickerSelect'
  210 + },
  211 + firstpaybackDate: {
  212 + label: '首次还款日期',
  213 + bindtype: 'payback_date',
  214 + selected: '',
  215 + isblack: 'true',
  216 + values: ["是", "否"],
  217 + placeholder: '请选择日期',
  218 + onChange: 'onPickerSelect',
  219 + mode: "date",
  220 + fields: "day",
  221 + start: '2018-01-01',
  222 + },
  223 + leasestartDate: {
  224 + label: '租赁期起',
  225 + bindtype: 'lease_start_date',
  226 + selected: '',
  227 + isblack: 'true',
  228 + values: ["是", "否"],
  229 + placeholder: '请选择日期',
  230 + onChange: 'onPickerSelect',
  231 + mode: "date",
  232 + fields: "day",
  233 + start: '2000-01-01',
  234 + },
  235 + leaseendDate: {
  236 + label: '租赁期止',
  237 + bindtype: 'lease_start_date',
  238 + selected: '',
  239 + isblack: 'true',
  240 + values: ["是", "否"],
  241 + placeholder: '请选择日期',
  242 + onChange: 'onPickerSelect',
  243 + mode: "date",
  244 + fields: "day",
  245 + start: '2000-01-01',
  246 + },
  247 + loandatelongData: {
  248 + label: '贷款期限(月数)',
  249 + bindtype: 'loan_datelong',
  250 + selected: '',
  251 + isblack: 'true',
  252 + values: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
  253 + placeholder: '请选择贷款期限',
  254 + onChange: 'onPickerSelect'
  255 + },
154 reducedateData: { 256 reducedateData: {
155 label: '扣除时间', 257 label: '扣除时间',
156 bindtype: 'reduce_date', 258 bindtype: 'reduce_date',
@@ -175,29 +277,26 @@ Page({ @@ -175,29 +277,26 @@ Page({
175 onLoad: function(options) { 277 onLoad: function(options) {
176 var that = this 278 var that = this
177 console.log("options", options); 279 console.log("options", options);
178 - this.setData({  
179 - cur_index: options.index  
180 - })  
181 wx.getStorage({ 280 wx.getStorage({
182 key: 'selectitems', 281 key: 'selectitems',
183 success: function(res) { 282 success: function(res) {
184 console.log("selectitems", res.data) 283 console.log("selectitems", res.data)
185 - var new_title = '添加' + res.data[options.index].message  
186 - if (new_title == '添加住房') {  
187 - new_title = '添加' + res.data[options.index].extra_message  
188 - }  
189 - wx.setNavigationBarTitle({  
190 - title: new_title,  
191 - })  
192 that.setData({ 284 that.setData({
193 - title: new_title,  
194 - curdata: res.data[options.index].data,  
195 datas02: res.data 285 datas02: res.data
196 }) 286 })
197 }, 287 },
  288 +
  289 + })
  290 + this.setData({
  291 + title: '添加' + options.title,
  292 + cur_index: options.index
  293 + })
  294 + wx.setNavigationBarTitle({
  295 + title: this.data.title,
198 }) 296 })
199 297
200 298
  299 +
201 this.initOSS() 300 this.initOSS()
202 }, 301 },
203 302
@@ -363,7 +462,7 @@ Page({ @@ -363,7 +462,7 @@ Page({
363 this.showToast('请填写赡养人姓名') 462 this.showToast('请填写赡养人姓名')
364 return 463 return
365 } else if (this.data.oldercardtypeData.selected.length < 1) { 464 } else if (this.data.oldercardtypeData.selected.length < 1) {
366 - this.showToast('请填写赡养人证件类型') 465 + this.showToast('请选择赡养人证件类型')
367 return 466 return
368 } else if (!formdata.older_idno || formdata.older_idno.length < 1) { 467 } else if (!formdata.older_idno || formdata.older_idno.length < 1) {
369 this.showToast('请填写赡养人证件号') 468 this.showToast('请填写赡养人证件号')
@@ -379,7 +478,7 @@ Page({ @@ -379,7 +478,7 @@ Page({
379 return 478 return
380 } 479 }
381 newdata.older_birthday = this.data.olderbirthDate.selected 480 newdata.older_birthday = this.data.olderbirthDate.selected
382 - newdata.taxperson_relative = this.data.taxperson_relativeData.selected 481 + newdata.older_relative = this.data.taxperson_relativeData.selected
383 } 482 }
384 483
385 newdata.support_type = this.data.supporttypeData.selected 484 newdata.support_type = this.data.supporttypeData.selected
@@ -387,28 +486,116 @@ Page({ @@ -387,28 +486,116 @@ Page({
387 break; 486 break;
388 break; 487 break;
389 case '3': 488 case '3':
390 - if (!formdata.reduce_money || formdata.reduce_money < 0) {  
391 - this.showToast('请填写扣除金额') 489 + if (!formdata.name || formdata.name.length < 1) {
  490 + this.showToast('请填写姓名')
  491 + return
  492 + } else if (this.data.cardtypeData.selected.length < 1) {
  493 + this.showToast('请选择赡养人证件类型')
  494 + return
  495 + } else if (!formdata.idno || formdata.idno.length < 1) {
  496 + this.showToast('请填写证件号码')
  497 + return
  498 + } else if (this.data.taxperson_relativeData.selected.length < 1) {
  499 + this.showToast('请选择与纳税人关系')
  500 + return
  501 + } else if (!formdata.total_money || formdata.reduce_money < 0) {
  502 + this.showToast('请填写医疗支出总金额')
  503 + return
  504 + } else if (!formdata.personal_money || formdata.personal_money < 0) {
  505 + this.showToast('请填写个人负担金额')
392 return 506 return
393 } 507 }
  508 + newdata.cardtype = this.data.cardtypeData.selected
  509 + newdata.taxperson_relative = this.data.taxperson_relativeData.selected
394 break; 510 break;
395 case '4': 511 case '4':
  512 + console.log('TITLE',this.data.title)
396 if (!formdata.lover_name || formdata.lover_name.length < 1) { 513 if (!formdata.lover_name || formdata.lover_name.length < 1) {
397 this.showToast('请填写配偶姓名') 514 this.showToast('请填写配偶姓名')
398 return 515 return
  516 + } else if (!formdata.lover_idno || formdata.lover_idno.length < 1) {
  517 + this.showToast('请填写配偶证件号码')
  518 + return
399 } 519 }
400 - if (!formdata.lover_idno || formdata.lover_idno.length < 1) {  
401 - this.showToast('请填写配偶身份证号') 520 + if (this.data.lovercardtypeData.selected.length < 1) {
  521 + this.showToast('请选择配偶证件类型')
402 return 522 return
403 } 523 }
  524 + if (this.data.loverbirthDate.selected.length < 1) {
  525 + this.showToast('请选择配偶出生日期')
  526 + return
  527 + }
  528 + if (this.data.title == "添加住房贷款利息") {
  529 + if (this.data.houseLocateInfo.address_value.length < 1) {
  530 + this.showToast('请选择住房地址')
  531 + return
  532 + } else if (this.data.identifytypeData.selected.length < 1) {
  533 + this.showToast('请选择证书类型')
  534 + return
  535 + } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
  536 + this.showToast('请填写证书号码')
  537 + return
  538 + } else if (this.data.loantypeData.selected.length < 1) {
  539 + this.showToast('请选择贷款类型')
  540 + return
  541 + } else if (!formdata.contract_no || formdata.contract_no.length < 1) {
  542 + this.showToast('请填写贷款合同编号')
  543 + return
  544 + } else if (this.data.firstpaybackDate.selected.length < 1) {
  545 + this.showToast('请选择首次还款日期')
  546 + return
  547 + } else if (this.data.loandatelongData.selected.length < 1) {
  548 + this.showToast('请选择贷款期限')
  549 + return
  550 + }
  551 + newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
  552 + newdata.identify_type = this.data.identifytypeData.selected
  553 + newdata.loan_type = this.data.loantypeData.selected
  554 + newdata.payback_date = this.data.firstpaybackDate.selected
  555 + newdata.loan_datelong = this.data.loandatelongData.selected
  556 + } else if (this.data.title == "添加住房租金") {
  557 + if (this.data.houseLocateInfo.address_value.length < 1) {
  558 + this.showToast('请选择住房地址')
  559 + return
  560 + } else if (this.data.leasetypeData.selected.length < 1) {
  561 + this.showToast('请选择出租方类型')
  562 + return
  563 + } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
  564 + this.showToast('请填写出租方号码')
  565 + return
  566 + } else if (this.data.identifytypeData.selected.length < 1) {
  567 + this.showToast('请选择证件类型')
  568 + return
  569 + } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
  570 + this.showToast('请填写证件号码')
  571 + return
  572 + } else if (this.data.leasestartDate.selected.length < 1) {
  573 + this.showToast('请选择日期')
  574 + return
  575 + } else if (this.data.leaseendDate.selected.length < 1) {
  576 + this.showToast('请选择日期')
  577 + return
  578 + }
  579 + newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
  580 + newdata.lease_type = this.data.leasetypeData.selected
  581 + newdata.identify_type = this.data.identifytypeData.selected
  582 + newdata.lease_startdate = this.data.leasestartDate.selected
  583 + newdata.lease_enddate = this.data.leaseendDate.selected
  584 + Console.log('houseLocateInfo',this.data.houseLocateInfo)
  585 + }
  586 + newdata.lover_cardtype = this.data.lovercardtypeData.selected
  587 + newdata.lover_birthdate = this.data.loverbirthDate.selected
404 break; 588 break;
405 } 589 }
406 590
407 - // if (this.data.reducedateData.selected.length < 1) {  
408 - // this.showToast('请选择扣除时间')  
409 - // return  
410 - // }  
411 - newdata.reduce_date = this.data.reducedateData.selected 591 + if (this.data.reducetypeData.selected.length < 1) {
  592 + this.showToast('请选择扣除方式')
  593 + return
  594 + } else if (!formdata.reduce_money || formdata.reduce_money.length < 1) {
  595 + this.showToast('请填写扣除金额')
  596 + return
  597 + }
  598 + newdata.reduce_type = this.data.reducetypeData.selected
412 this.gosave(newdata) 599 this.gosave(newdata)
413 }, 600 },
414 601
@@ -508,6 +695,13 @@ Page({ @@ -508,6 +695,13 @@ Page({
508 olderbirthDate: older_birthDate 695 olderbirthDate: older_birthDate
509 }) 696 })
510 break; 697 break;
  698 + case 'reduce_type':
  699 + var reduce_typeData = this.data.reducetypeData
  700 + reduce_typeData.selected = reduce_typeData.values[e.detail.value]
  701 + this.setData({
  702 + reducetypeData: reduce_typeData
  703 + })
  704 + break;
511 case 'edu_type': 705 case 'edu_type':
512 var edutypee_data = this.data.edutypeData 706 var edutypee_data = this.data.edutypeData
513 edutypee_data.selected = edutypee_data.values[e.detail.value] 707 edutypee_data.selected = edutypee_data.values[e.detail.value]
@@ -516,6 +710,73 @@ Page({ @@ -516,6 +710,73 @@ Page({
516 edutypeData: edutypee_data 710 edutypeData: edutypee_data
517 }) 711 })
518 break; 712 break;
  713 + case 'cardtype':
  714 + var cardtype_Data = this.data.cardtypeData
  715 + cardtype_Data.selected = cardtype_Data.values[e.detail.value]
  716 + this.setData({
  717 + cardtypeData: cardtype_Data
  718 + })
  719 + break;
  720 + case 'identify_type':
  721 + var identifytype_Data = this.data.identifytypeData
  722 + identifytype_Data.selected = identifytype_Data.values[e.detail.value]
  723 + this.setData({
  724 + identifytypeData: identifytype_Data
  725 + })
  726 + break;
  727 + case 'loan_type':
  728 + var loantype_Data = this.data.loantypeData
  729 + loantype_Data.selected = loantype_Data.values[e.detail.value]
  730 + this.setData({
  731 + loantypeData: loantype_Data
  732 + })
  733 + break;
  734 + case 'payback_date':
  735 + var firstpayback_Date = this.data.firstpaybackDate
  736 + firstpayback_Date.selected = e.detail.value
  737 + console.log('reduce_date', Date.parse(new Date(e.detail.value)))
  738 + this.setData({
  739 + firstpaybackDate: firstpayback_Date
  740 + })
  741 + break;
  742 + case 'loan_datelong':
  743 + var loandatelong_Data = this.data.loandatelongData
  744 + loandatelong_Data.selected = loandatelong_Data.values[e.detail.value]
  745 + this.setData({
  746 + loandatelongData: loandatelong_Data
  747 + })
  748 + break;
  749 + case 'lease_type':
  750 + var leasetype_Data = this.data.leasetypeData
  751 + leasetype_Data.selected = leasetype_Data.values[e.detail.value]
  752 + this.setData({
  753 + leasetypeData: leasetype_Data
  754 + })
  755 + break;
  756 + case 'lease_start_date':
  757 + var leasestart_Date = this.data.leasestartDate
  758 + leasestart_Date.selected = e.detail.value
  759 + console.log('reduce_date', Date.parse(new Date(e.detail.value)))
  760 + this.setData({
  761 + leasestartDate: leasestart_Date
  762 + })
  763 + break;
  764 + case 'lease_end_date':
  765 + var leaseend_Date = this.data.leaseendDate
  766 + leaseend_Date.selected = e.detail.value
  767 + console.log('reduce_date', Date.parse(new Date(e.detail.value)))
  768 + this.setData({
  769 + leaseendDate: leaseend_Date
  770 + })
  771 + break;
  772 + case 'house_locate':
  773 + console.log('house_locate', e)
  774 + var house_address = this.data.houseLocateInfo;
  775 + house_address.address_value = e.detail.value
  776 + this.setData({
  777 + houseLocateInfo: house_address
  778 + })
  779 + break;
519 case 'reduce_date': 780 case 'reduce_date':
520 var reducedate_data = this.data.reducedateData 781 var reducedate_data = this.data.reducedateData
521 reducedate_data.selected = e.detail.value 782 reducedate_data.selected = e.detail.value
@@ -146,8 +146,28 @@ @@ -146,8 +146,28 @@
146 <!-- 大病医疗 --> 146 <!-- 大病医疗 -->
147 <view wx:if="{{cur_index==3}}"> 147 <view wx:if="{{cur_index==3}}">
148 <view style='height:90rpx'> 148 <view style='height:90rpx'>
149 - <text class='text_black_30 float_left'>扣除金额</text>  
150 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> 149 + <text class='text_black_30 float_left'>姓名</text>
  150 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name'></input>
  151 + </view>
  152 + <view class='divide_line_f5f5f5'></view>
  153 +
  154 + <template is="picker_cell_normal" data="{{...cardtypeData}}" />
  155 + <view class='divide_line_f5f5f5'></view>
  156 + <view style='height:90rpx'>
  157 + <text class='text_black_30 float_left'>身份证件号码</text>
  158 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='idno'></input>
  159 + </view>
  160 + <view class='divide_line_f5f5f5'></view>
  161 + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
  162 + <view class='divide_line_f5f5f5'></view>
  163 + <view style='height:90rpx'>
  164 + <text class='text_black_30 float_left'>医疗支出总金额</text>
  165 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_money'></input>
  166 + </view>
  167 + <view class='divide_line_f5f5f5'></view>
  168 + <view style='height:90rpx'>
  169 + <text class='text_black_30 float_left'>个人负担金额</text>
  170 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入金额' type='digit' name='personal_money'></input>
151 </view> 171 </view>
152 </view> 172 </view>
153 <!-- 住房 --> 173 <!-- 住房 -->
@@ -157,11 +177,84 @@ @@ -157,11 +177,84 @@
157 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='lover_name'></input> 177 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='lover_name'></input>
158 </view> 178 </view>
159 <view class='divide_line_f5f5f5'></view> 179 <view class='divide_line_f5f5f5'></view>
  180 +
  181 + <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
  182 + <view class='divide_line_f5f5f5'></view>
  183 + <view style='height:90rpx'>
  184 + <text class='text_black_30 float_left'>配偶证件号码</text>
  185 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='lover_idno'></input>
  186 + </view>
  187 + <view class='divide_line_f5f5f5'></view>
  188 + <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
  189 + <view class='divide_line_f5f5f5'></view>
160 <view style='height:90rpx'> 190 <view style='height:90rpx'>
161 - <text class='text_black_30 float_left'>配偶身份证号</text>  
162 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶身份证号' type='idcard' name='lover_idno'></input> 191 + <text class='text_black_30 float_left'>国籍</text>
  192 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
  193 + <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
163 </view> 194 </view>
  195 + <view style='width:100%;height:20rpx;background:#f5f5f5'></view>
  196 + <view wx:if="{{title=='添加住房贷款利息'}}">
  197 +
  198 + <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
  199 + <view class='divide_line_f5f5f5'></view>
  200 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
  201 + <view class='divide_line_f5f5f5'></view>
  202 + <view style='height:90rpx'>
  203 + <text class='text_black_30 float_left'>证书号码</text>
  204 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
  205 + </view>
  206 + <view class='divide_line_f5f5f5'></view>
  207 + <template is="picker_cell_normal" data="{{...loantypeData}}" />
  208 + <view class='divide_line_f5f5f5'></view>
  209 + <view style='height:90rpx'>
  210 + <text class='text_black_30 float_left'>贷款合同编号</text>
  211 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='contract_no'></input>
  212 + </view>
  213 + <view class='divide_line_f5f5f5'></view>
  214 + <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
  215 + <view class='divide_line_f5f5f5'></view>
  216 + <template is="picker_cell_normal" data="{{...loandatelongData}}" />
  217 + </view>
  218 + <view wx:if="{{title=='添加住房租金'}}">
  219 + <template is="picker_cell_normal" data="{{...contactLocateInfo}}" />
  220 + <view class='divide_line_f5f5f5'></view>
  221 + <template is="picker_cell_normal" data="{{...leasetypeData}}" />
  222 + <view class='divide_line_f5f5f5'></view>
  223 + <view style='height:90rpx'>
  224 + <text class='text_black_30 float_left'>出租方名称</text>
  225 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='lease_name'></input>
  226 + </view>
  227 + <view class='divide_line_f5f5f5'></view>
  228 + <view style='height:90rpx'>
  229 + <text class='text_black_30 float_left'>出租方纳税人识别号</text>
  230 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
  231 + </view>
  232 + <view class='divide_line_f5f5f5'></view>
  233 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
  234 + <view class='divide_line_f5f5f5'></view>
  235 + <view style='height:90rpx'>
  236 + <text class='text_black_30 float_left'>证书号码</text>
  237 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
  238 + </view>
  239 + <view class='divide_line_f5f5f5'></view>
  240 + <view style='height:90rpx'>
  241 + <text class='text_black_30 float_left'>租赁合同编号</text>
  242 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='contract_no'></input>
  243 + </view>
  244 +<view class='divide_line_f5f5f5'></view>
  245 + <template is="picker_cell_normal" data="{{...leasestartDate}}" />
  246 + <view class='divide_line_f5f5f5'></view>
  247 + <template is="picker_cell_normal" data="{{...leaseendDate}}" />
  248 + </view>
  249 +
164 </view> 250 </view>
  251 + <view class='divide_line_f5f5f5'></view>
  252 + <template is="picker_cell_normal" data="{{...reducetypeData}}" />
  253 + <view class='divide_line_f5f5f5'></view>
  254 + <view style='height:90rpx'>
  255 + <text class='text_black_30 float_left'>扣除金额</text>
  256 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input>
  257 + </view>
165 258
166 <view class='divide_line_f5f5f5'></view> 259 <view class='divide_line_f5f5f5'></view>
167 <view class='text_black_30 float_left'>上传材料</view> 260 <view class='text_black_30 float_left'>上传材料</view>
@@ -5,11 +5,11 @@ Page({ @@ -5,11 +5,11 @@ Page({
5 * Page initial data 5 * Page initial data
6 */ 6 */
7 data: { 7 data: {
8 - cur_index: 0, 8 + cur_index: -1,
9 add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"], 9 add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"],
10 title: '', 10 title: '',
11 imgpath: '', 11 imgpath: '',
12 - new_data:{}, 12 + new_data: null,
13 datas02: [] 13 datas02: []
14 }, 14 },
15 15
@@ -36,10 +36,12 @@ Page({ @@ -36,10 +36,12 @@ Page({
36 */ 36 */
37 onShow: function() { 37 onShow: function() {
38 var that = this 38 var that = this
39 - var index = this.data.cur_index 39 + var index = this.data.cur_index
  40 + console.log("onShow", index)
  41 +
40 wx.getStorage({ 42 wx.getStorage({
41 key: 'selectitems', 43 key: 'selectitems',
42 - success: function (res) { 44 + success: function(res) {
43 console.log("selectitems", res.data) 45 console.log("selectitems", res.data)
44 var new_title = res.data[index].message 46 var new_title = res.data[index].message
45 if (new_title == '住房') { 47 if (new_title == '住房') {
@@ -54,7 +56,6 @@ Page({ @@ -54,7 +56,6 @@ Page({
54 new_data: res.data[index].data, 56 new_data: res.data[index].data,
55 datas02: res.data 57 datas02: res.data
56 }) 58 })
57 - console.log('new_data', res.data[index].data)  
58 }, 59 },
59 }) 60 })
60 }, 61 },
@@ -74,8 +75,9 @@ Page({ @@ -74,8 +75,9 @@ Page({
74 }, 75 },
75 76
76 goadd: function(e) { //添加 77 goadd: function(e) { //添加
  78 + var that = this
77 wx.navigateTo({ 79 wx.navigateTo({
78 - url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index, 80 + url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index +'&title=' + that.data.title,
79 }) 81 })
80 82
81 }, 83 },
@@ -7,12 +7,12 @@ @@ -7,12 +7,12 @@
7 <view class='view_bg_wrap' style='margin-top: 48rpx;'> 7 <view class='view_bg_wrap' style='margin-top: 48rpx;'>
8 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 8 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
9 <text class='text_text_wrap'>累计使用额度</text> 9 <text class='text_text_wrap'>累计使用额度</text>
10 - <text class='text_num_wrap'>9161609.90</text> 10 + <text class='text_num_wrap'>1610899.90</text>
11 </view> 11 </view>
12 <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> 12 <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
13 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 13 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
14 <text class='text_text_wrap'>本月可使用额度</text> 14 <text class='text_text_wrap'>本月可使用额度</text>
15 - <text class='text_num_wrap'>39106.91</text> 15 + <text class='text_num_wrap'>39100.10</text>
16 </view> 16 </view>
17 </view> 17 </view>
18 </view> 18 </view>
@@ -20,13 +20,14 @@ @@ -20,13 +20,14 @@
20 20
21 <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'> 21 <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'>
22 <image class='icon_wrap' src="/images/rectangle_icon.png"></image> 22 <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
23 - <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>专项附加扣除概览</text> 23 + <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index==0}}">子女教育</text>
  24 + <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index!=0}}">专项附加扣除概览</text>
24 </view> 25 </view>
25 <view class='divide_line_f5f5f5'></view> 26 <view class='divide_line_f5f5f5'></view>
26 - <view wx:if='{{new_data&&new_data.reduce_date}}' style='margin:30rpx;' class='card_rectangle_bg_column'> 27 + <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'>
27 <!-- 子女教育 --> 28 <!-- 子女教育 -->
28 - <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>  
29 - <view style='height:40rpx'> 29 + <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
  30 + <view style='height:40rpx'>
30 <text class='text_999_28 float_left'>配偶姓名</text> 31 <text class='text_999_28 float_left'>配偶姓名</text>
31 <text class='text_333_28 float_right'>{{new_data.lover_name}}</text> 32 <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
32 </view> 33 </view>
@@ -98,7 +99,7 @@ @@ -98,7 +99,7 @@
98 </view> 99 </view>
99 100
100 <!-- 继续教育 --> 101 <!-- 继续教育 -->
101 - <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 102 + <view wx:if="{{cur_index==1}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
102 <view style='height:40rpx'> 103 <view style='height:40rpx'>
103 <text class='text_999_28 float_left'>教育类型</text> 104 <text class='text_999_28 float_left'>教育类型</text>
104 <text class='text_333_28 float_right'>{{new_data.edu_type}}</text> 105 <text class='text_333_28 float_right'>{{new_data.edu_type}}</text>
@@ -107,7 +108,7 @@ @@ -107,7 +108,7 @@
107 <text class='text_999_28 float_left'>教育阶段</text> 108 <text class='text_999_28 float_left'>教育阶段</text>
108 <text class='text_333_28 float_right'>{{new_data.degree_level}}</text> 109 <text class='text_333_28 float_right'>{{new_data.degree_level}}</text>
109 </view> 110 </view>
110 - <view style='height:40rpx'> 111 + <view style='height:40rpx'>
111 <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期起</text> 112 <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期起</text>
112 <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text> 113 <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text>
113 </view> 114 </view>
@@ -131,38 +132,71 @@ @@ -131,38 +132,71 @@
131 </view> 132 </view>
132 133
133 <!-- 赡养老人 --> 134 <!-- 赡养老人 -->
134 - <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 135 + <view wx:if="{{cur_index==2}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
135 <view style='height:40rpx'> 136 <view style='height:40rpx'>
136 <text class='text_999_28 float_left'>赡养类型</text> 137 <text class='text_999_28 float_left'>赡养类型</text>
137 - <text class='text_333_28 float_right'>{{new_data.older_name}}</text> 138 + <text class='text_333_28 float_right'>{{new_data.support_type}}</text>
138 </view> 139 </view>
139 <view style='height:40rpx'> 140 <view style='height:40rpx'>
140 - <text class='text_999_28 float_left'>老人姓名</text> 141 + <text class='text_999_28 float_left'>被赡养人姓名</text>
141 <text class='text_333_28 float_right'>{{new_data.older_name}}</text> 142 <text class='text_333_28 float_right'>{{new_data.older_name}}</text>
142 </view> 143 </view>
143 <view style='height:40rpx'> 144 <view style='height:40rpx'>
  145 + <text class='text_999_28 float_left'>被赡养人身份证类型</text>
  146 + <text class='text_333_28 float_right'>{{new_data.older_cardtype}}</text>
  147 + </view>
  148 + <view style='height:40rpx'>
144 <text class='text_999_28 float_left'>老人身份证号</text> 149 <text class='text_999_28 float_left'>老人身份证号</text>
145 <text class='text_333_28 float_right'>{{new_data.older_idno}}</text> 150 <text class='text_333_28 float_right'>{{new_data.older_idno}}</text>
146 </view> 151 </view>
147 - <view style='height:40rpx'>  
148 - <text class='text_999_28 float_left'>与老人的关系</text> 152 + <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
  153 + <text class='text_999_28 float_left'>被赡养人出生日期</text>
  154 + <text class='text_333_28 float_right'>{{new_data.older_birthday}}</text>
  155 + </view>
  156 + <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
  157 + <text class='text_999_28 float_left'>被赡养人国籍(地区)</text>
  158 + <text class='text_333_28 float_right'>中国</text>
  159 + </view>
  160 + <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
  161 + <text class='text_999_28 float_left'>与纳税人的关系</text>
149 <text class='text_333_28 float_right'>{{new_data.older_relative}}</text> 162 <text class='text_333_28 float_right'>{{new_data.older_relative}}</text>
150 </view> 163 </view>
  164 +
151 <view style='height:40rpx'> 165 <view style='height:40rpx'>
152 - <text class='text_999_28 float_left'>是否独生子女</text>  
153 - <text class='text_333_28 float_right'>{{new_data.singlechildData}}</text> 166 + <text class='text_999_28 float_left'>扣除方式</text>
  167 + <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text>
154 </view> 168 </view>
155 <view style='height:40rpx'> 169 <view style='height:40rpx'>
156 - <text class='text_999_28 float_left'>分摊比例</text>  
157 - <text class='text_333_28 float_right'>{{new_data.allocation_ratio}}</text> 170 + <text class='text_999_28 float_left'>扣除金额</text>
  171 + <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text>
158 </view> 172 </view>
159 </view> 173 </view>
160 174
161 <!-- 大病医疗 --> 175 <!-- 大病医疗 -->
162 <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 176 <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
163 <view style='height:40rpx'> 177 <view style='height:40rpx'>
164 - <text class='text_999_28 float_left'>扣除金额</text>  
165 - <text class='text_333_28 float_right'>{{new_data.reduce_money}}</text> 178 + <text class='text_999_28 float_left'>姓名</text>
  179 + <text class='text_333_28 float_right'>{{new_data.name}}</text>
  180 + </view>
  181 + <view style='height:40rpx'>
  182 + <text class='text_999_28 float_left'>身份证件类型</text>
  183 + <text class='text_333_28 float_right'>{{new_data.cardtype}}</text>
  184 + </view>
  185 + <view style='height:40rpx'>
  186 + <text class='text_999_28 float_left'>身份证号</text>
  187 + <text class='text_333_28 float_right'>{{new_data.idno}}</text>
  188 + </view>
  189 + <view style='height:40rpx'>
  190 + <text class='text_999_28 float_left'>与纳税人关系</text>
  191 + <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text>
  192 + </view>
  193 + <view style='height:40rpx'>
  194 + <text class='text_999_28 float_left'>医疗支出总金额</text>
  195 + <text class='text_333_28 float_right'>{{new_data.total_money}}元</text>
  196 + </view>
  197 + <view style='height:40rpx'>
  198 + <text class='text_999_28 float_left'>个人负担金额</text>
  199 + <text class='text_333_28 float_right'>{{new_data.personal_money}}元</text>
166 </view> 200 </view>
167 </view> 201 </view>
168 202
@@ -173,14 +207,104 @@ @@ -173,14 +207,104 @@
173 <text class='text_333_28 float_right'>{{new_data.lover_name}}</text> 207 <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
174 </view> 208 </view>
175 <view style='height:40rpx'> 209 <view style='height:40rpx'>
  210 + <text class='text_999_28 float_left'>配偶身份证件类型</text>
  211 + <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text>
  212 + </view>
  213 + <view style='height:40rpx'>
176 <text class='text_999_28 float_left'>配偶身份证号</text> 214 <text class='text_999_28 float_left'>配偶身份证号</text>
177 <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text> 215 <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text>
178 </view> 216 </view>
  217 + <view style='height:40rpx'>
  218 + <text class='text_999_28 float_left'>出生日期</text>
  219 + <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text>
  220 + </view>
  221 + <view style='height:40rpx'>
  222 + <text class='text_999_28 float_left'>国籍</text>
  223 + <text class='text_333_28 float_right'>中国</text>
  224 + </view>
  225 + <view wx:if="{{title=='住房贷款利息'}}" style='display:flex;flex-direction:column'>
  226 + <view style='height:40rpx'>
  227 + <text class='text_999_28 float_left'>房屋坐落地址</text>
  228 + <text class='text_333_28 float_right'>{{new_data.house_location}}</text>
  229 + </view>
  230 + <view style='height:40rpx'>
  231 + <text class='text_999_28 float_left'>证书类型</text>
  232 + <text class='text_333_28 float_right'>{{new_data.identify_type}}</text>
  233 + </view>
  234 + <view style='height:40rpx'>
  235 + <text class='text_999_28 float_left'>证书编号</text>
  236 + <text class='text_333_28 float_right'>{{new_data.identify_no}}</text>
  237 + </view>
  238 + <view style='height:40rpx'>
  239 + <text class='text_999_28 float_left'>贷款类型</text>
  240 + <text class='text_333_28 float_right'>{{new_data.loan_type}}</text>
  241 + </view>
  242 + <view style='height:40rpx'>
  243 + <text class='text_999_28 float_left'>贷款合同编号</text>
  244 + <text class='text_333_28 float_right'>{{new_data.contract_no}}</text>
  245 + </view>
  246 + <view style='height:40rpx'>
  247 + <text class='text_999_28 float_left'>首次还款日期</text>
  248 + <text class='text_333_28 float_right'>{{new_data.payback_date}}</text>
  249 + </view>
  250 + <view style='height:40rpx'>
  251 + <text class='text_999_28 float_left'>贷款期限(月数)</text>
  252 + <text class='text_333_28 float_right'>{{new_data.loan_datelong}}</text>
  253 + </view>
  254 + </view>
  255 + <view wx:if="{{title=='住房租金'}}" style='display:flex;flex-direction:column'>
  256 + <view style='height:40rpx'>
  257 + <text class='text_999_28 float_left'>租赁房屋坐落地址</text>
  258 + <text class='text_333_28 float_right'>{{new_data.house_location}}</text>
  259 + </view>
  260 + <view style='height:40rpx'>
  261 + <text class='text_999_28 float_left'>出租方类型</text>
  262 + <text class='text_333_28 float_right'>{{new_data.lease_type}}</text>
  263 + </view>
  264 + <view style='height:40rpx'>
  265 + <text class='text_999_28 float_left'>出租房名称</text>
  266 + <text class='text_333_28 float_right'>{{new_data.lease_name}}</text>
  267 + </view>
  268 + <view style='height:40rpx'>
  269 + <text class='text_999_28 float_left'>出租房纳税人识别号</text>
  270 + <text class='text_333_28 float_right'>{{new_data.lease_idno}}</text>
  271 + </view>
  272 + <view style='height:40rpx'>
  273 + <text class='text_999_28 float_left'>证件类型</text>
  274 + <text class='text_333_28 float_right'>{{new_data.identify_type}}</text>
  275 + </view>
  276 + <view style='height:40rpx'>
  277 + <text class='text_999_28 float_left'>证件号码</text>
  278 + <text class='text_333_28 float_right'>{{new_data.identify_no}}</text>
  279 + </view>
  280 + <view style='height:40rpx'>
  281 + <text class='text_999_28 float_left'>租赁合同编号</text>
  282 + <text class='text_333_28 float_right'>{{new_data.contract_no}}</text>
  283 + </view>
  284 + <view style='height:40rpx'>
  285 + <text class='text_999_28 float_left'>租赁期起</text>
  286 + <text class='text_333_28 float_right'>{{new_data.lease_startdate}}</text>
  287 + </view>
  288 + <view style='height:40rpx'>
  289 + <text class='text_999_28 float_left'>租赁期止</text>
  290 + <text class='text_333_28 float_right'>{{new_data.lease_enddate}}</text>
  291 + </view>
  292 + </view>
  293 +
  294 + <view style='height:40rpx'>
  295 + <text class='text_999_28 float_left'>扣除方式</text>
  296 + <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text>
  297 + </view>
  298 + <view style='height:40rpx'>
  299 + <text class='text_999_28 float_left'>扣除金额</text>
  300 + <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text>
  301 + </view>
  302 +
179 </view> 303 </view>
180 - <view style='height:40rpx;padding:0 30rpx 30rpx 30rpx;'> 304 + <!-- <view style='height:40rpx;padding:0 30rpx 30rpx 30rpx;'>
181 <text class='text_999_28 float_left'>扣除时间</text> 305 <text class='text_999_28 float_left'>扣除时间</text>
182 <text class='text_333_28 float_right'>{{new_data.reduce_date}}</text> 306 <text class='text_333_28 float_right'>{{new_data.reduce_date}}</text>
183 - </view> 307 + </view> -->
184 308
185 <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view> 309 <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view>
186 <view class='text_blue_28' style='line-height:80rpx' bindtap='lookimg'>查看材料</view> 310 <view class='text_blue_28' style='line-height:80rpx' bindtap='lookimg'>查看材料</view>
请 注册 或 登录 后发表评论