提交 291e2f45454d15ca12e33534023d5c548df90ba0

作者 wangyu
1 个父辈 2a45f261

调整添加专项附加扣除页面的逻辑

@@ -206,15 +206,6 @@ Page({ @@ -206,15 +206,6 @@ Page({
206 end: '2018-01-01', 206 end: '2018-01-01',
207 onChange: 'onPickerSelect', 207 onChange: 'onPickerSelect',
208 }, 208 },
209 - // singlechildData: {  
210 - // label: '是否独生子女',  
211 - // bindtype: 'single_child',  
212 - // selected: '',  
213 - // isblack: 'true',  
214 - // values: ["是", "否"],  
215 - // placeholder: '请选择是否独生子女',  
216 - // onChange: 'onPickerSelect'  
217 - // },  
218 beforemarryData: { 209 beforemarryData: {
219 label: '是否首套婚前贷款且婚后各自扣除', 210 label: '是否首套婚前贷款且婚后各自扣除',
220 bindtype: 'before_marry', 211 bindtype: 'before_marry',
@@ -408,7 +399,7 @@ Page({ @@ -408,7 +399,7 @@ Page({
408 onChange: 'onPickerSelect' 399 onChange: 'onPickerSelect'
409 }, 400 },
410 schoolCountryData: { 401 schoolCountryData: {
411 - label: '就读国家', 402 + label: '就读国家(地区)',
412 bindtype: 'school_country', 403 bindtype: 'school_country',
413 isrequre: true, 404 isrequre: true,
414 selected: '中国(大陆)', 405 selected: '中国(大陆)',
@@ -417,6 +408,15 @@ Page({ @@ -417,6 +408,15 @@ Page({
417 placeholder: '中国(大陆)', 408 placeholder: '中国(大陆)',
418 onChange: 'onPickerSelect', 409 onChange: 'onPickerSelect',
419 }, 410 },
  411 + bankInfo: {
  412 + label: '贷款银行',
  413 + bindtype: 'bank',
  414 + isrequre: true,
  415 + placeholder: '请选择贷款银行',
  416 + selected: '',
  417 + values: [],
  418 + onChange: 'onPickerSelect'
  419 + },
420 edu_lable: "school", 420 edu_lable: "school",
421 oldersupport_lable: "", 421 oldersupport_lable: "",
422 img_path: "/images/upload_img.png" 422 img_path: "/images/upload_img.png"
@@ -445,7 +445,9 @@ Page({ @@ -445,7 +445,9 @@ Page({
445 deduction_amount = Deduce_amounts_year[nameKey] 445 deduction_amount = Deduce_amounts_year[nameKey]
446 reduce_typeData.selected = '年度' 446 reduce_typeData.selected = '年度'
447 } 447 }
448 - if ("continuing_education" == options.status) { 448 + if ("children_education" == options.status) {
  449 + this.loadCountry()
  450 + } else if ("continuing_education" == options.status) {
449 var studystart_date = this.data.studystartdate 451 var studystart_date = this.data.studystartdate
450 studystart_date.label = "入学时间起" 452 studystart_date.label = "入学时间起"
451 var studyend_date = this.data.studyenddate 453 var studyend_date = this.data.studyenddate
@@ -455,8 +457,7 @@ Page({ @@ -455,8 +457,7 @@ Page({
455 studystartdate: studystart_date, 457 studystartdate: studystart_date,
456 studyenddate: studyend_date 458 studyenddate: studyend_date
457 }) 459 })
458 - }  
459 - if ("medical_fund" == options.status) { 460 + } else if ("medical_fund" == options.status) {
460 var cardtype_data = this.data.cardtypeData 461 var cardtype_data = this.data.cardtypeData
461 cardtype_data.label = "病人证照类型" 462 cardtype_data.label = "病人证照类型"
462 var commonbirth_date = this.data.commonbirthDate 463 var commonbirth_date = this.data.commonbirthDate
@@ -466,6 +467,8 @@ Page({ @@ -466,6 +467,8 @@ Page({
466 cardtypeData: cardtype_data, 467 cardtypeData: cardtype_data,
467 commonbirthDate: commonbirth_date 468 commonbirthDate: commonbirth_date
468 }) 469 })
  470 + } else if (frontPage.data.house_type == "house_fund_rent" || frontPage.data.house_type == "house_fund_loan") {
  471 + this.getbanklist()
469 } 472 }
470 var title = '添加' + AddTypeNames[nameKey] 473 var title = '添加' + AddTypeNames[nameKey]
471 474
@@ -483,7 +486,6 @@ Page({ @@ -483,7 +486,6 @@ Page({
483 if (options.datas && options.datas.length) { 486 if (options.datas && options.datas.length) {
484 this.handleTransData(JSON.parse(options.datas)) 487 this.handleTransData(JSON.parse(options.datas))
485 } 488 }
486 - this.loadCountry()  
487 }, 489 },
488 490
489 loadCountry: function() { 491 loadCountry: function() {
@@ -498,6 +500,16 @@ Page({ @@ -498,6 +500,16 @@ Page({
498 schoolCountryData: country_data 500 schoolCountryData: country_data
499 }) 501 })
500 502
  503 + var montharr = []
  504 + var month_data = this.data.loandatelongData
  505 + for (var i = 1; i < 100; i++) {
  506 + montharr.push(i)
  507 + }
  508 + month_data.values = montharr
  509 + this.setData({
  510 + loandatelongData: month_data
  511 + })
  512 +
501 }, 513 },
502 514
503 handleTransData: function(data) { 515 handleTransData: function(data) {
@@ -520,7 +532,7 @@ Page({ @@ -520,7 +532,7 @@ Page({
520 setData.percent = data.percent 532 setData.percent = data.percent
521 } 533 }
522 if (data.student_no && data.student_no.length) { 534 if (data.student_no && data.student_no.length) {
523 - setData.percent = data.children_student_no 535 + setData.children_student_no = data.student_no
524 } 536 }
525 if (data.education_period && data.education_period.length) { 537 if (data.education_period && data.education_period.length) {
526 var childedudegreeData = this.data.childedudegreeData 538 var childedudegreeData = this.data.childedudegreeData
@@ -539,21 +551,108 @@ Page({ @@ -539,21 +551,108 @@ Page({
539 studyenddate.datelong = data.education_end 551 studyenddate.datelong = data.education_end
540 setData.studyenddate = studyenddate 552 setData.studyenddate = studyenddate
541 } 553 }
542 - // if (data.spouse_name && data.spouse_name.length) {  
543 - // }  
544 - // if (data.spouse_id_card_no && data.spouse_id_card_no.length) {  
545 - // }  
546 - // if (this.data.loverbirthDate.selected.length) {  
547 - // }  
548 - // if (this.data.taxperson_relativeData.selected.length) {  
549 - // }  
550 - // if (data.relationship && data.relationship.length) {  
551 - // } 554 + if (data.school_country && data.school_country.length) {
  555 + var schoolCountryData = this.data.schoolCountryData
  556 + schoolCountryData.selected = data.school_country
  557 + setData.schoolCountryData = schoolCountryData
  558 + }
  559 + if (data.school_name && data.school_name.length) {
  560 + setData.school_name = data.school_name
  561 + }
  562 + if (data.spouse_name && data.spouse_name.length) {
  563 + setData.spouse_name = data.spouse_name
  564 + }
  565 + if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
  566 + setData.spouse_id_card_no = data.spouse_id_card_no
  567 + }
  568 + if (this.data.loverbirthDate.selected.length) {
  569 + var loverbirthDate = this.data.loverbirthDate
  570 + loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
  571 + loverbirthDate.datelong = data.spouse_birthday
  572 + setData.loverbirthDate = loverbirthDate
  573 + }
  574 +
  575 + this.setData(setData)
  576 + break;
  577 + case 'continuing_education':
  578 + var setData = {}
  579 + if (data.education_type && data.education_type.length) {
  580 + if ('title' == data.education_type){
  581 + var edutypeData = this.data.edutypeData
  582 + edutypeData.selected = "学历继续教育"
  583 + setData.edutypeData = edutypeData
  584 + }else{
  585 + var edutypeData = this.data.edutypeData
  586 + edutypeData.selected = data.education_type =='major'?"专业技术人员职业资格":"技能人员职业资格"
  587 + setData.edutypeData = edutypeData
  588 + }
  589 + }
  590 + if (data.education_period && data.education_period.length) {
  591 + var edulevelData = this.data.edulevelData
  592 + edulevelData.selected = data.education_period
  593 + setData.edulevelData = edulevelData
  594 + }
  595 + if (data.education_start && data.education_start.length) {
  596 + var studystartdate = this.data.studystartdate
  597 + studystartdate.selected = format.formatTime_date(data.education_start)
  598 + studystartdate.datelong = data.education_start
  599 + setData.studystartdate = studystartdate
  600 + }
  601 + if (data.education_end && data.education_end.length) {
  602 + var studyenddate = this.data.studyenddate
  603 + studyenddate.selected = format.formatTime_date(data.education_end)
  604 + studyenddate.datelong = data.education_end
  605 + setData.studyenddate = studyenddate
  606 + }
  607 + if (data.approval_date && data.approval_date.length) {
  608 + var applydate = this.data.applydate
  609 + applydate.selected = format.formatTime_date(data.approval_date)
  610 + applydate.datelong = data.approval_date
  611 + setData.applydate = applydate
  612 + }
  613 + if (data.certification_name && data.certification_name.length) {
  614 + setData.certification_name = data.certification_name
  615 + }
  616 + if (data.certification_no && data.certification_no.length) {
  617 + setData.certification_no = data.certification_no
  618 + }
  619 + if (data.certification_autority && data.certification_autority.length) {
  620 + setData.certification_autority = data.certification_autority
  621 + }
  622 + this.setData(setData)
  623 + break;
  624 + case 'support_duty':
  625 + var setData = {}
  626 + if (data.supported_name && data.supported_name.length) {
  627 + setData.supported_name = data.supported_name
  628 + }
  629 + if (data.percentage && data.percentage.length) {
  630 + setData.percentage = data.percentage
  631 + }
  632 + if (data.id_card_no && data.id_card_no.length) {
  633 + setData.id_card_no = data.id_card_no
  634 + }
  635 + if (data.support_type && data.support_type.length) {
  636 + var supporttypeData = this.data.supporttypeData
  637 + supporttypeData.selected = data.support_type
  638 + setData.supporttypeData = supporttypeData
  639 + }
  640 + if (data.birthday && data.birthday.length) {
  641 + var olderbirthDate = this.data.olderbirthDate
  642 + olderbirthDate.selected = format.formatTime_date(data.birthday)
  643 + olderbirthDate.datelong = data.birthday
  644 + setData.olderbirthDate = olderbirthDate
  645 + }
  646 + if (data.relationship && data.relationship.length) {
  647 + var older_relativeData = this.data.older_relativeData
  648 + older_relativeData.selected = data.relationship
  649 + setData.older_relativeData = older_relativeData
  650 + }
  651 + if (data.percentage && data.percentage.length) {
  652 + setData.percentage = data.percentage
  653 + }
552 this.setData(setData) 654 this.setData(setData)
553 break; 655 break;
554 - // case 'continuing_education':  
555 - // var setData = {}  
556 - // break;  
557 case 'medical_fund': 656 case 'medical_fund':
558 var setData = {} 657 var setData = {}
559 if (data.name && data.name.length) { 658 if (data.name && data.name.length) {
@@ -567,14 +666,84 @@ Page({ @@ -567,14 +666,84 @@ Page({
567 taxperson_relativeData.selected = data.family_ties 666 taxperson_relativeData.selected = data.family_ties
568 setData.taxperson_relativeData = taxperson_relativeData 667 setData.taxperson_relativeData = taxperson_relativeData
569 } 668 }
570 - if (data.birth_date && data.birth_date > 0) { 669 + if (data.patient_birthday && data.patient_birthday > 0) {
571 var commonbirthDate = this.data.commonbirthDate 670 var commonbirthDate = this.data.commonbirthDate
572 - commonbirthDate.selected = format.formatTime_date(data.birth_date) 671 + commonbirthDate.selected = format.formatTime_date(data.patient_birthday)
573 commonbirthDate.datelong = data.birth_date 672 commonbirthDate.datelong = data.birth_date
574 setData.commonbirthDate = commonbirthDate 673 setData.commonbirthDate = commonbirthDate
575 } 674 }
576 this.setData(setData) 675 this.setData(setData)
577 break; 676 break;
  677 + case "house_fund":
  678 + var setData = {}
  679 + if (data.spouse_name && data.spouse_name.length) {
  680 + setData.spouse_name = data.spouse_name
  681 + }
  682 + if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
  683 + setData.spouse_id_card_no = data.spouse_id_card_no
  684 + }
  685 + if (this.data.loverbirthDate.selected.length) {
  686 + var loverbirthDate = this.data.loverbirthDate
  687 + loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
  688 + loverbirthDate.datelong = data.spouse_birthday
  689 + setData.loverbirthDate = loverbirthDate
  690 + }
  691 + if (data.loan_type && data.loan_type.length) {
  692 + var loantypeData = this.data.loantypeData
  693 + loantypeData.selected = data.loan_type
  694 + setData.loantypeData = loantypeData
  695 + }
  696 + if (data.house_address && data.house_address.length) {
  697 + var houseLocateInfo = this.data.houseLocateInfo
  698 + houseLocateInfo.selected = data.house_address
  699 + setData.houseLocateInfo = houseLocateInfo
  700 + }
  701 + if (data.house_detail_address && data.house_detail_address.length) {
  702 + setData.house_detail_address = data.house_detail_address
  703 + }
  704 + if (data.certification_no && data.certification_no.length) {
  705 + setData.certification_no = data.certification_no
  706 + }
  707 + if (data.certification_type && data.certification_type.length) {
  708 + var identifytypeData = this.data.identifytypeData
  709 + identifytypeData.selected = data.certification_type
  710 + setData.identifytypeData = identifytypeData
  711 + }
  712 + if (data.loan_before_marry && data.loan_before_marry.length) {
  713 + var beforemarryData = this.data.beforemarryData
  714 + beforemarryData.selected = data.loan_before_marry
  715 + setData.beforemarryData = beforemarryData
  716 + }
  717 + if (data.loan_by_self && data.loan_by_self.length) {
  718 + var isselfData = this.data.isselfData
  719 + isselfData.selected = data.loan_by_self
  720 + setData.isselfData = isselfData
  721 + }
  722 + if (data.loan_contract_no && data.loan_contract_no.length) {
  723 + setData.loan_contract_no = data.loan_contract_no
  724 + }
  725 + if (data.rent_contract_no && data.rent_contract_no.length) {
  726 + setData.rent_contract_no = data.rent_contract_no
  727 + }
  728 + if (data.rent_start && data.rent_start.length) {
  729 + var leasestartDate = this.data.leasestartDate
  730 + leasestartDate.selected = format.formatTime_date(data.rent_start)
  731 + leasestartDate.datelong = data.rent_start
  732 + setData.leasestartDate = leasestartDate
  733 + }
  734 + if (data.rent_end && data.rent_end.length) {
  735 + var leaseendDate = this.data.leaseendDate
  736 + leaseendDate.selected = format.formatTime_date(data.rent_end)
  737 + leaseendDate.datelong = data.rent_end
  738 + setData.leaseendDate = leaseendDate
  739 + }
  740 + if (data.work_city && data.work_city.length) {
  741 + var workingcityInfo = this.data.workingcityInfo
  742 + workingcityInfo.selected = data.work_city
  743 + setData.workingcityInfo = workingcityInfo
  744 + }
  745 + this.setData(setData)
  746 + break;
578 } 747 }
579 748
580 }, 749 },
@@ -687,6 +856,43 @@ Page({ @@ -687,6 +856,43 @@ Page({
687 }) 856 })
688 }, 857 },
689 858
  859 + getbanklist: function() {
  860 + var that = this
  861 + var Authorization = app.globalData.Authorization;
  862 + var bank_info = that.data.bankInfo
  863 + wx.request({
  864 + url: baseUrl + 'walletmgm/v1/bankinfos',
  865 + method: "GET",
  866 + header: {
  867 + 'content-type': 'application/json', // 默认值
  868 + "Authorization": Authorization
  869 + },
  870 + success: function(res) {
  871 + console.log(res)
  872 + bank_info.values = that.handleBankinfo(res.data.items)
  873 +
  874 + that.setData({
  875 + bankInfo: bank_info
  876 + })
  877 + console.log("bankInfo", that.data.bankInfo)
  878 + },
  879 + fail(res) {
  880 + console.log(res)
  881 + },
  882 + complete() {
  883 + wx.hideLoading()
  884 + }
  885 + })
  886 + },
  887 +
  888 + handleBankinfo: function(data) {
  889 + var bank_name = []
  890 + for (var i = 0; i < data.length; i++) {
  891 + bank_name.push(data[i].bank_name)
  892 + }
  893 + return bank_name
  894 + },
  895 +
690 formSubmit: function(e) { 896 formSubmit: function(e) {
691 console.log("formSubmit", e); 897 console.log("formSubmit", e);
692 var formdata = e.detail.value 898 var formdata = e.detail.value
@@ -752,7 +958,7 @@ Page({ @@ -752,7 +958,7 @@ Page({
752 newdata.education_end = this.data.studystartdate.datelong 958 newdata.education_end = this.data.studystartdate.datelong
753 newdata.education_start = this.data.studyenddate.datelong 959 newdata.education_start = this.data.studyenddate.datelong
754 newdata.education_period = this.data.childedudegreeData.selected 960 newdata.education_period = this.data.childedudegreeData.selected
755 - newdata.school_name = this.data.schoolCountryData.selected 961 + newdata.school_country = this.data.schoolCountryData.selected
756 newdata.children_nation = "中国" 962 newdata.children_nation = "中国"
757 newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected 963 newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
758 newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0 964 newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
@@ -790,7 +996,7 @@ Page({ @@ -790,7 +996,7 @@ Page({
790 this.showToast('请选择发证日期') 996 this.showToast('请选择发证日期')
791 return 997 return
792 } 998 }
793 - if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) { 999 + if (!formdata.certification_name || formdata.certification_name.length < 1) {
794 this.showToast('请填写证书名称') 1000 this.showToast('请填写证书名称')
795 return 1001 return
796 } 1002 }
@@ -804,6 +1010,7 @@ Page({ @@ -804,6 +1010,7 @@ Page({
804 } 1010 }
805 //新增教育类型(区别教育类别) 1011 //新增教育类型(区别教育类别)
806 // newdata.edu_type_lable = '1' 1012 // newdata.edu_type_lable = '1'
  1013 + newdata.approval_date = this.data.applydate.selected
807 newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major' 1014 newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major'
808 } 1015 }
809 break; 1016 break;
@@ -812,13 +1019,13 @@ Page({ @@ -812,13 +1019,13 @@ Page({
812 if (this.data.supporttypeData.selected.length < 1) { 1019 if (this.data.supporttypeData.selected.length < 1) {
813 this.showToast('请选择赡养类型') 1020 this.showToast('请选择赡养类型')
814 return 1021 return
815 - } else if (!formdata.older_name || formdata.older_name.length < 1) { 1022 + } else if (!formdata.supported_name || formdata.supported_name.length < 1) {
816 this.showToast('请填写赡养人姓名') 1023 this.showToast('请填写赡养人姓名')
817 return 1024 return
818 } else if (this.data.oldercardtypeData.selected.length < 1) { 1025 } else if (this.data.oldercardtypeData.selected.length < 1) {
819 this.showToast('请选择赡养人证照类型') 1026 this.showToast('请选择赡养人证照类型')
820 return 1027 return
821 - } else if (!formdata.older_idno || formdata.older_idno.length < 1) { 1028 + } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
822 this.showToast('请填写赡养人证照号') 1029 this.showToast('请填写赡养人证照号')
823 return 1030 return
824 } 1031 }
@@ -830,11 +1037,11 @@ Page({ @@ -830,11 +1037,11 @@ Page({
830 this.showToast('请选择与纳税人关系') 1037 this.showToast('请选择与纳税人关系')
831 return 1038 return
832 } 1039 }
833 - if (!formdata.percent || formdata.percent.length < 1) {  
834 - this.showToast('请填写扣除分摊比例') 1040 + if (!formdata.percentage || formdata.percentage.length < 1) {
  1041 + this.showToast('请填写分摊比例')
835 return 1042 return
836 } else { 1043 } else {
837 - newdata.percentage = parseFloat(formdata.percent) 1044 + newdata.percentage = parseFloat(formdata.percentage)
838 } 1045 }
839 newdata.older_birthday = this.data.olderbirthDate.datelong 1046 newdata.older_birthday = this.data.olderbirthDate.datelong
840 newdata.older_relative = this.data.older_relativeData.selected 1047 newdata.older_relative = this.data.older_relativeData.selected
@@ -871,7 +1078,7 @@ Page({ @@ -871,7 +1078,7 @@ Page({
871 newdata.id_card_type = this.data.cardtypeData.selected 1078 newdata.id_card_type = this.data.cardtypeData.selected
872 newdata.relationship = this.data.taxperson_relativeData.selected 1079 newdata.relationship = this.data.taxperson_relativeData.selected
873 newdata.patient_birthday = this.data.commonbirthDate.datelong 1080 newdata.patient_birthday = this.data.commonbirthDate.datelong
874 - newdata.patient_birthday = "中国" 1081 + newdata.patient_nation = "中国"
875 break; 1082 break;
876 case 'house_fund': 1083 case 'house_fund':
877 subUrl = 'persontax/v1/house-funds' 1084 subUrl = 'persontax/v1/house-funds'
@@ -884,7 +1091,7 @@ Page({ @@ -884,7 +1091,7 @@ Page({
884 } else if (this.data.identifytypeData.selected.length < 1) { 1091 } else if (this.data.identifytypeData.selected.length < 1) {
885 this.showToast('请选择证书类型') 1092 this.showToast('请选择证书类型')
886 return 1093 return
887 - } else if (!formdata.identify_no || formdata.identify_no.length < 1) { 1094 + } else if (!formdata.certification_no || formdata.certification_no.length < 1) {
888 this.showToast('请填写证书号码') 1095 this.showToast('请填写证书号码')
889 return 1096 return
890 } else if (this.data.beforemarryData.selected.length < 1) { 1097 } else if (this.data.beforemarryData.selected.length < 1) {
@@ -896,9 +1103,12 @@ Page({ @@ -896,9 +1103,12 @@ Page({
896 } else if (this.data.loantypeData.selected.length < 1) { 1103 } else if (this.data.loantypeData.selected.length < 1) {
897 this.showToast('请选择贷款类型') 1104 this.showToast('请选择贷款类型')
898 return 1105 return
899 - } else if (!formdata.contract_no || formdata.contract_no.length < 1) { 1106 + } else if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
900 this.showToast('请填写贷款合同编号') 1107 this.showToast('请填写贷款合同编号')
901 return 1108 return
  1109 + } else if (this.data.bankInfo.selected.length < 1) {
  1110 + this.showToast('请选择贷款银行')
  1111 + return
902 } else if (this.data.firstpaybackDate.selected.length < 1) { 1112 } else if (this.data.firstpaybackDate.selected.length < 1) {
903 this.showToast('请选择首次还款日期') 1113 this.showToast('请选择首次还款日期')
904 return 1114 return
@@ -911,8 +1121,8 @@ Page({ @@ -911,8 +1121,8 @@ Page({
911 newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n' 1121 newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
912 newdata.identify_type = this.data.identifytypeData.selected 1122 newdata.identify_type = this.data.identifytypeData.selected
913 1123
914 - newdata.identify_type = this.data.identifytypeData.selected  
915 newdata.loan_type = this.data.loantypeData.selected 1124 newdata.loan_type = this.data.loantypeData.selected
  1125 + newdata.loan_bank = this.data.bankInfo.selected
916 newdata.payback_date = this.data.firstpaybackDate.selected 1126 newdata.payback_date = this.data.firstpaybackDate.selected
917 newdata.loan_datelong = this.data.loandatelongData.selected 1127 newdata.loan_datelong = this.data.loandatelongData.selected
918 } else if (this.data.house_type == "house_fund_rent") { 1128 } else if (this.data.house_type == "house_fund_rent") {
@@ -937,10 +1147,13 @@ Page({ @@ -937,10 +1147,13 @@ Page({
937 } else if (this.data.rentLocateInfo.address_value.length < 1) { 1147 } else if (this.data.rentLocateInfo.address_value.length < 1) {
938 this.showToast('请选择房屋地址') 1148 this.showToast('请选择房屋地址')
939 return 1149 return
940 - } else if (!formdata.identify_no || formdata.identify_no.length < 1) { 1150 + } else if (!formdata.owner_id_cartd_no || formdata.owner_id_cartd_no.length < 1) {
941 this.showToast('请填写证件号码') 1151 this.showToast('请填写证件号码')
942 return 1152 return
943 - } else if (this.data.leasestartDate.selected.length < 1) { 1153 + } else if (!formdata.rent_contract_no || formdata.rent_contract_no.length < 1) {
  1154 + this.showToast('请填写租赁合同编号')
  1155 + return
  1156 + }else if (this.data.leasestartDate.selected.length < 1) {
944 this.showToast('请选择日期') 1157 this.showToast('请选择日期')
945 return 1158 return
946 } else if (this.data.leaseendDate.selected.length < 1) { 1159 } else if (this.data.leaseendDate.selected.length < 1) {
@@ -950,9 +1163,9 @@ Page({ @@ -950,9 +1163,9 @@ Page({
950 newdata.house_address = this.data.rentLocateInfo.address_value[0] + this.data.rentLocateInfo.address_value[1] + this.data.rentLocateInfo.address_value[2] 1163 newdata.house_address = this.data.rentLocateInfo.address_value[0] + this.data.rentLocateInfo.address_value[1] + this.data.rentLocateInfo.address_value[2]
951 newdata.work_city = this.data.workingcityInfo.address_value[0] + this.data.workingcityInfo.address_value[1] + this.data.workingcityInfo.address_value[2] 1164 newdata.work_city = this.data.workingcityInfo.address_value[0] + this.data.workingcityInfo.address_value[1] + this.data.workingcityInfo.address_value[2]
952 newdata.lease_type = this.data.leasetypeData.selected 1165 newdata.lease_type = this.data.leasetypeData.selected
953 - newdata.identify_type = this.data.identifytypeData.selected  
954 - newdata.lease_startdate = this.data.leasestartDate.selected  
955 - newdata.lease_enddate = this.data.leaseendDate.selected 1166 + newdata.certification_type = this.data.identifytypeData.selected
  1167 + newdata.rent_start = this.data.leasestartDate.selected
  1168 + newdata.rent_end = this.data.leaseendDate.selected
956 console.log('houseLocateInfo', this.data.houseLocateInfo) 1169 console.log('houseLocateInfo', this.data.houseLocateInfo)
957 } 1170 }
958 if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) { 1171 if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
@@ -1110,10 +1323,10 @@ Page({ @@ -1110,10 +1323,10 @@ Page({
1110 // }) 1323 // })
1111 // break; 1324 // break;
1112 case 'school_country': 1325 case 'school_country':
1113 - var eduCountry_data = this.data.schoolCountryData  
1114 - eduCountry_data.selected = eduCountry_data.values[e.detail.value] 1326 + var schoolCountry_data = this.data.schoolCountryData
  1327 + schoolCountry_data.selected = schoolCountry_data.values[e.detail.value]
1115 this.setData({ 1328 this.setData({
1116 - schoolCountryData: eduCountry_data 1329 + schoolCountryData: schoolCountry_data
1117 }) 1330 })
1118 break; 1331 break;
1119 case 'support_type': 1332 case 'support_type':
@@ -1258,6 +1471,13 @@ Page({ @@ -1258,6 +1471,13 @@ Page({
1258 leaseendDate: leaseend_Date 1471 leaseendDate: leaseend_Date
1259 }) 1472 })
1260 break; 1473 break;
  1474 + case 'bank':
  1475 + var bank_data = this.data.bankInfo
  1476 + bank_data.selected = bank_data.values[e.detail.value]
  1477 + this.setData({
  1478 + bankInfo: bank_data
  1479 + })
  1480 + break;
1261 case 'house_locate': 1481 case 'house_locate':
1262 console.log('house_locate', e) 1482 console.log('house_locate', e)
1263 var house_address = this.data.houseLocateInfo; 1483 var house_address = this.data.houseLocateInfo;
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <view style='height:90rpx'> 66 <view style='height:90rpx'>
67 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 67 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
68 <text class='text_black_30 float_left'>就读学校名称</text> 68 <text class='text_black_30 float_left'>就读学校名称</text>
69 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name'></input> 69 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>
70 </view> 70 </view>
71 <view class='divide_line_f5f5f5'></view> 71 <view class='divide_line_f5f5f5'></view>
72 </view> 72 </view>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <view style='height:90rpx'> 96 <view style='height:90rpx'>
97 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 97 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
98 <text class='text_black_30 float_left'>证书名称</text> 98 <text class='text_black_30 float_left'>证书名称</text>
99 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='occupational_qualifiy_name'></input> 99 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='certification_name'></input>
100 </view> 100 </view>
101 <view class='divide_line_f5f5f5'></view> 101 <view class='divide_line_f5f5f5'></view>
102 <view style='height:90rpx'> 102 <view style='height:90rpx'>
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <view style='height:90rpx'> 120 <view style='height:90rpx'>
121 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 121 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
122 <text class='text_black_30 float_left'>被赡养人姓名</text> 122 <text class='text_black_30 float_left'>被赡养人姓名</text>
123 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='older_name'></input> 123 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='supported_name'></input>
124 </view> 124 </view>
125 <view class='divide_line_f5f5f5'></view> 125 <view class='divide_line_f5f5f5'></view>
126 <template is="picker_cell_normal" data="{{...oldercardtypeData}}" /> 126 <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 <view style='height:90rpx'> 128 <view style='height:90rpx'>
129 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 129 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
130 <text class='text_black_30 float_left'>被赡养人证照号码</text> 130 <text class='text_black_30 float_left'>被赡养人证照号码</text>
131 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='older_idno' value='{{older_idno}}'></input> 131 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='id_card_no' value='{{id_card_no}}'></input>
132 </view> 132 </view>
133 <view class='divide_line_f5f5f5'></view> 133 <view class='divide_line_f5f5f5'></view>
134 <template is="picker_cell_normal" data="{{...olderbirthDate}}" /> 134 <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 147 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
148 <text class='text_black_30 float_left'>分摊比例</text> 148 <text class='text_black_30 float_left'>分摊比例</text>
149 <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text> 149 <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
150 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percent' value='{{percent}}'></input> 150 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percentage' value='{{percentage}}'></input>
151 </view> 151 </view>
152 <!-- <view class='divide_line_f5f5f5'></view> 152 <!-- <view class='divide_line_f5f5f5'></view>
153 <view style='height:90rpx'> 153 <view style='height:90rpx'>
@@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
206 <view style='height:90rpx'> 206 <view style='height:90rpx'>
207 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 207 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
208 <text class='text_black_30 float_left'>证书号码</text> 208 <text class='text_black_30 float_left'>证书号码</text>
209 - <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> 209 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='certification_no'></input>
210 </view> 210 </view>
211 <view class='divide_line_f5f5f5'></view> 211 <view class='divide_line_f5f5f5'></view>
212 212
@@ -223,9 +223,11 @@ @@ -223,9 +223,11 @@
223 <view style='height:90rpx'> 223 <view style='height:90rpx'>
224 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 224 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
225 <text class='text_black_30 float_left'>贷款合同编号</text> 225 <text class='text_black_30 float_left'>贷款合同编号</text>
226 - <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> 226 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='loan_contract_no'></input>
227 </view> 227 </view>
228 <view class='divide_line_f5f5f5'></view> 228 <view class='divide_line_f5f5f5'></view>
  229 + <template is="picker_cell_normal" data="{{...bankInfo}}" />
  230 + <view class='divide_line_f5f5f5'></view>
229 <template is="picker_cell_normal" data="{{...firstpaybackDate}}" /> 231 <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
230 <view class='divide_line_f5f5f5'></view> 232 <view class='divide_line_f5f5f5'></view>
231 <template is="picker_cell_normal" data="{{...loandatelongData}}" /> 233 <template is="picker_cell_normal" data="{{...loandatelongData}}" />
@@ -255,8 +257,8 @@ @@ -255,8 +257,8 @@
255 <view class='divide_line_f5f5f5'></view> 257 <view class='divide_line_f5f5f5'></view>
256 <view style='height:90rpx'> 258 <view style='height:90rpx'>
257 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 259 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
258 - <text class='text_black_30 float_left'>证书号码</text>  
259 - <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> 260 + <text class='text_black_30 float_left'>证件号码</text>
  261 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='owner_id_cartd_no'></input>
260 </view> 262 </view>
261 </view> 263 </view>
262 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view> 264 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
@@ -270,7 +272,7 @@ @@ -270,7 +272,7 @@
270 <view style='height:90rpx'> 272 <view style='height:90rpx'>
271 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 273 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
272 <text class='text_black_30 float_left'>租赁合同编号</text> 274 <text class='text_black_30 float_left'>租赁合同编号</text>
273 - <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> 275 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='rent_contract_no'></input>
274 </view> 276 </view>
275 <view class='divide_line_f5f5f5'></view> 277 <view class='divide_line_f5f5f5'></view>
276 <template is="picker_cell_normal" data="{{...leasestartDate}}" /> 278 <template is="picker_cell_normal" data="{{...leasestartDate}}" />
注册登录 后发表评论