wangyu / naturalPersonTax · 提交

提交 2a45f2616caae39f60ca1cee655b1d6fd5ebbaae

作者 wangyu
1 个父辈 365ce229
构建： 未知

优化

内嵌 并排对比
正在显示 7 个修改的文件 包含 204 行增加 和 134 行删除
@@ -83,13 +83,13 @@ Page({ @@ -83,13 +83,13 @@ Page({
83 onChange: 'onPickerSelect' 83 onChange: 'onPickerSelect'
84 }, 84 },
85 childrencardtypeData: { 85 childrencardtypeData: {
86 - label: '子女身份证件类型', 86 + label: '子女证照类型',
87 isrequre: true, 87 isrequre: true,
88 bindtype: 'childrencardtype', 88 bindtype: 'childrencardtype',
89 selected: '居民身份证', 89 selected: '居民身份证',
90 disabled: true, 90 disabled: true,
91 isblack: 'true', 91 isblack: 'true',
92 - placeholder: '请选择身份证件类型', 92 + placeholder: '请选择证照类型',
93 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照', 93 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
94 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证' 94 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
95 ], 95 ],
@@ -168,26 +168,26 @@ Page({ @@ -168,26 +168,26 @@ Page({
168 onChange: 'onPickerSelect' 168 onChange: 'onPickerSelect'
169 }, 169 },
170 oldercardtypeData: { 170 oldercardtypeData: {
171 - label: '被赡养人证件类型', 171 + label: '被赡养人证照类型',
172 isrequre: true, 172 isrequre: true,
173 disabled: true, 173 disabled: true,
174 bindtype: 'oldercardtype', 174 bindtype: 'oldercardtype',
175 selected: '居民身份证', 175 selected: '居民身份证',
176 isblack: 'true', 176 isblack: 'true',
177 - placeholder: '请选择被赡养人证件类型', 177 + placeholder: '请选择被赡养人证照类型',
178 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照', 178 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
179 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证' 179 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
180 ], 180 ],
181 onChange: 'onPickerSelect' 181 onChange: 'onPickerSelect'
182 }, 182 },
183 cardtypeData: { 183 cardtypeData: {
184 - label: '身份证件类型', 184 + label: '证照类型',
185 isrequre: true, 185 isrequre: true,
186 bindtype: 'cardtype', 186 bindtype: 'cardtype',
187 selected: '居民身份证', 187 selected: '居民身份证',
188 disabled: true, 188 disabled: true,
189 isblack: 'true', 189 isblack: 'true',
190 - placeholder: '请选择证件类型', 190 + placeholder: '证照类型',
191 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照', 191 values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
192 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证' 192 '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
193 ], 193 ],
@@ -206,19 +206,20 @@ Page({ @@ -206,19 +206,20 @@ 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 - }, 209 + // singlechildData: {
  210 + // label: '是否独生子女',
  211 + // bindtype: 'single_child',
  212 + // selected: '',
  213 + // isblack: 'true',
  214 + // values: ["是", "否"],
  215 + // placeholder: '请选择是否独生子女',
  216 + // onChange: 'onPickerSelect'
  217 + // },
218 beforemarryData: { 218 beforemarryData: {
219 label: '是否首套婚前贷款且婚后各自扣除', 219 label: '是否首套婚前贷款且婚后各自扣除',
220 bindtype: 'before_marry', 220 bindtype: 'before_marry',
221 selected: '', 221 selected: '',
  222 + isrequre: true,
222 isblack: 'true', 223 isblack: 'true',
223 values: ["是", "否"], 224 values: ["是", "否"],
224 placeholder: '请选择', 225 placeholder: '请选择',
@@ -228,6 +229,7 @@ Page({ @@ -228,6 +229,7 @@ Page({
228 label: '是否本人借款', 229 label: '是否本人借款',
229 bindtype: 'is_self_loan', 230 bindtype: 'is_self_loan',
230 selected: '', 231 selected: '',
  232 + isrequre: true,
231 isblack: 'true', 233 isblack: 'true',
232 values: ["是", "否"], 234 values: ["是", "否"],
233 placeholder: '请选择', 235 placeholder: '请选择',
@@ -235,7 +237,7 @@ Page({ @@ -235,7 +237,7 @@ Page({
235 }, 237 },
236 reducetypeData: { 238 reducetypeData: {
237 label: '扣除方式', 239 label: '扣除方式',
238 - isrequre: true, 240 + isrequre: false,
239 bindtype: 'reduce_type', 241 bindtype: 'reduce_type',
240 selected: '', 242 selected: '',
241 isblack: 'true', 243 isblack: 'true',
@@ -289,6 +291,7 @@ Page({ @@ -289,6 +291,7 @@ Page({
289 label: '证书类型', 291 label: '证书类型',
290 bindtype: 'identify_type', 292 bindtype: 'identify_type',
291 selected: '', 293 selected: '',
  294 + isrequre: true,
292 isblack: 'true', 295 isblack: 'true',
293 values: ["产权证", "不动产权登记证", "出售合同号", "预售合同号"], 296 values: ["产权证", "不动产权登记证", "出售合同号", "预售合同号"],
294 placeholder: '请选择证书类型', 297 placeholder: '请选择证书类型',
@@ -298,6 +301,7 @@ Page({ @@ -298,6 +301,7 @@ Page({
298 label: '贷款类型', 301 label: '贷款类型',
299 bindtype: 'loan_type', 302 bindtype: 'loan_type',
300 selected: '', 303 selected: '',
  304 + isrequre: true,
301 isblack: 'true', 305 isblack: 'true',
302 values: ["公积金贷款", "商业贷款"], 306 values: ["公积金贷款", "商业贷款"],
303 placeholder: '请选择贷款类型', 307 placeholder: '请选择贷款类型',
@@ -307,6 +311,7 @@ Page({ @@ -307,6 +311,7 @@ Page({
307 label: '出租方类型', 311 label: '出租方类型',
308 bindtype: 'lease_type', 312 bindtype: 'lease_type',
309 selected: '', 313 selected: '',
  314 + isrequre: true,
310 isblack: 'true', 315 isblack: 'true',
311 values: ["组织", "自然人"], 316 values: ["组织", "自然人"],
312 placeholder: '请选择出租方类型', 317 placeholder: '请选择出租方类型',
@@ -315,6 +320,7 @@ Page({ @@ -315,6 +320,7 @@ Page({
315 workingcityInfo: { 320 workingcityInfo: {
316 label: '主要工作城市', 321 label: '主要工作城市',
317 mode: 'region', 322 mode: 'region',
  323 + isrequre: true,
318 bindtype: 'working_city', 324 bindtype: 'working_city',
319 isblack: 'true', 325 isblack: 'true',
320 address_code: ['', ''], 326 address_code: ['', ''],
@@ -326,6 +332,8 @@ Page({ @@ -326,6 +332,8 @@ Page({
326 houseLocateInfo: { 332 houseLocateInfo: {
327 label: '房屋坐落地址', 333 label: '房屋坐落地址',
328 mode: 'region', 334 mode: 'region',
  335 + isrequre: true,
  336 + isrequre: true,
329 bindtype: 'house_locate', 337 bindtype: 'house_locate',
330 isblack: 'true', 338 isblack: 'true',
331 address_code: ['', '', ''], 339 address_code: ['', '', ''],
@@ -334,10 +342,24 @@ Page({ @@ -334,10 +342,24 @@ Page({
334 placeholder: '请选择地址', 342 placeholder: '请选择地址',
335 onChange: 'onPickerSelect' 343 onChange: 'onPickerSelect'
336 }, 344 },
  345 + rentLocateInfo: {
  346 + label: '租赁房屋坐落地址',
  347 + mode: 'region',
  348 + isrequre: true,
  349 + isrequre: true,
  350 + bindtype: 'rent_house_locate',
  351 + isblack: 'true',
  352 + address_code: ['', '', ''],
  353 + address_value: ['', '', ''],
  354 + selected: '',
  355 + placeholder: '请选择地址',
  356 + onChange: 'onPickerSelect'
  357 + },
337 firstpaybackDate: { 358 firstpaybackDate: {
338 label: '首次还款日期', 359 label: '首次还款日期',
339 bindtype: 'payback_date', 360 bindtype: 'payback_date',
340 selected: '', 361 selected: '',
  362 + isrequre: true,
341 isblack: 'true', 363 isblack: 'true',
342 values: ["是", "否"], 364 values: ["是", "否"],
343 placeholder: '请选择日期', 365 placeholder: '请选择日期',
@@ -351,6 +373,7 @@ Page({ @@ -351,6 +373,7 @@ Page({
351 label: '租赁期起', 373 label: '租赁期起',
352 bindtype: 'lease_start_date', 374 bindtype: 'lease_start_date',
353 selected: '', 375 selected: '',
  376 + isrequre: true,
354 isblack: 'true', 377 isblack: 'true',
355 values: ["是", "否"], 378 values: ["是", "否"],
356 placeholder: '请选择日期', 379 placeholder: '请选择日期',
@@ -362,8 +385,9 @@ Page({ @@ -362,8 +385,9 @@ Page({
362 }, 385 },
363 leaseendDate: { 386 leaseendDate: {
364 label: '租赁期止', 387 label: '租赁期止',
365 - bindtype: 'lease_start_date', 388 + bindtype: 'lease_end_date',
366 selected: '', 389 selected: '',
  390 + isrequre: true,
367 isblack: 'true', 391 isblack: 'true',
368 values: ["是", "否"], 392 values: ["是", "否"],
369 placeholder: '请选择日期', 393 placeholder: '请选择日期',
@@ -377,32 +401,20 @@ Page({ @@ -377,32 +401,20 @@ Page({
377 label: '贷款期限(月数)', 401 label: '贷款期限(月数)',
378 bindtype: 'loan_datelong', 402 bindtype: 'loan_datelong',
379 selected: '', 403 selected: '',
  404 + isrequre: true,
380 isblack: 'true', 405 isblack: 'true',
381 values: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], 406 values: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
382 placeholder: '请选择贷款期限', 407 placeholder: '请选择贷款期限',
383 onChange: 'onPickerSelect' 408 onChange: 'onPickerSelect'
384 }, 409 },
385 - reducedateData: {  
386 - label: '扣除时间',  
387 - bindtype: 'reduce_date',  
388 - selected: '',  
389 - isblack: 'true',  
390 - values: ["是", "否"],  
391 - placeholder: '请选择扣除时间',  
392 - onChange: 'onPickerSelect',  
393 - mode: "date",  
394 - fields: "month",  
395 - start: '1970-01',  
396 - datelong: 0,  
397 - },  
398 - eduCountryData: { 410 + schoolCountryData: {
399 label: '就读国家', 411 label: '就读国家',
400 - bindtype: 'edu_country', 412 + bindtype: 'school_country',
401 isrequre: true, 413 isrequre: true,
402 - selected: '', 414 + selected: '中国(大陆)',
403 isblack: 'true', 415 isblack: 'true',
404 values: [], 416 values: [],
405 - placeholder: '中国', 417 + placeholder: '中国(大陆)',
406 onChange: 'onPickerSelect', 418 onChange: 'onPickerSelect',
407 }, 419 },
408 edu_lable: "school", 420 edu_lable: "school",
@@ -455,14 +467,12 @@ Page({ @@ -455,14 +467,12 @@ Page({
455 commonbirthDate: commonbirth_date 467 commonbirthDate: commonbirth_date
456 }) 468 })
457 } 469 }
458 -  
459 -  
460 - var title = '添加' + AddTypeNames[nameKey] 470 + var title = '添加' + AddTypeNames[nameKey]
461 471
462 this.setData({ 472 this.setData({
463 title: title, 473 title: title,
464 cur_index: nameKey, 474 cur_index: nameKey,
465 - house_type : frontPage.data.house_type, 475 + house_type: frontPage.data.house_type,
466 reducetypeData: reduce_typeData, 476 reducetypeData: reduce_typeData,
467 deduction_amount: deduction_amount 477 deduction_amount: deduction_amount
468 }) 478 })
@@ -479,13 +489,13 @@ Page({ @@ -479,13 +489,13 @@ Page({
479 loadCountry: function() { 489 loadCountry: function() {
480 countryInfo.init(this) 490 countryInfo.init(this)
481 var countrylist = this.data.country 491 var countrylist = this.data.country
482 - var country_data = this.data.eduCountryData 492 + var country_data = this.data.schoolCountryData
483 for (var i = 0; i < countrylist.length; i++) { 493 for (var i = 0; i < countrylist.length; i++) {
484 country_data.values.push(countrylist[i].name) 494 country_data.values.push(countrylist[i].name)
485 } 495 }
486 console.log("countrydata", country_data) 496 console.log("countrydata", country_data)
487 this.setData({ 497 this.setData({
488 - eduCountryData: country_data 498 + schoolCountryData: country_data
489 }) 499 })
490 500
491 }, 501 },
@@ -541,9 +551,9 @@ Page({ @@ -541,9 +551,9 @@ Page({
541 // } 551 // }
542 this.setData(setData) 552 this.setData(setData)
543 break; 553 break;
544 - // case 'continuing_education':  
545 - // var setData = {}  
546 - // break; 554 + // case 'continuing_education':
  555 + // var setData = {}
  556 + // break;
547 case 'medical_fund': 557 case 'medical_fund':
548 var setData = {} 558 var setData = {}
549 if (data.name && data.name.length) { 559 if (data.name && data.name.length) {
@@ -686,7 +696,7 @@ Page({ @@ -686,7 +696,7 @@ Page({
686 case 'children_education': 696 case 'children_education':
687 subUrl = 'persontax/v1/children-educations' 697 subUrl = 'persontax/v1/children-educations'
688 if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) { 698 if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
689 - this.showToast('请填写子女证件号码') 699 + this.showToast('请填写子女证照号码')
690 return 700 return
691 } 701 }
692 if (!formdata.children_name || formdata.children_name.length < 1) { 702 if (!formdata.children_name || formdata.children_name.length < 1) {
@@ -719,8 +729,8 @@ Page({ @@ -719,8 +729,8 @@ Page({
719 this.showToast('请选择受教育终止日期') 729 this.showToast('请选择受教育终止日期')
720 return 730 return
721 } 731 }
722 - if (this.data.eduCountryData.selected.length < 1) {  
723 - this.showToast('请选择就读地区') 732 + if (!formdata.school_name || formdata.school_name.length < 1) {
  733 + this.showToast('请选择就读学校')
724 return 734 return
725 } 735 }
726 736
@@ -729,17 +739,12 @@ Page({ @@ -729,17 +739,12 @@ Page({
729 this.showToast('请填写配偶姓名') 739 this.showToast('请填写配偶姓名')
730 return 740 return
731 } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) { 741 } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
732 - this.showToast('请填写配偶证件号码') 742 + this.showToast('请填写配偶证照号码')
733 return 743 return
734 } else if (this.data.loverbirthDate.selected.length < 1) { 744 } else if (this.data.loverbirthDate.selected.length < 1) {
735 this.showToast('请选择配偶出生日期') 745 this.showToast('请选择配偶出生日期')
736 return 746 return
737 } 747 }
738 - // if (this.data.taxperson_relativeData.selected.length < 1) {  
739 - // this.showToast('请选择与纳税人关系')  
740 - // return  
741 - // }  
742 -  
743 } 748 }
744 newdata.relationship = this.data.taxperson_relativeData.selected 749 newdata.relationship = this.data.taxperson_relativeData.selected
745 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected 750 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
@@ -747,6 +752,7 @@ Page({ @@ -747,6 +752,7 @@ Page({
747 newdata.education_end = this.data.studystartdate.datelong 752 newdata.education_end = this.data.studystartdate.datelong
748 newdata.education_start = this.data.studyenddate.datelong 753 newdata.education_start = this.data.studyenddate.datelong
749 newdata.education_period = this.data.childedudegreeData.selected 754 newdata.education_period = this.data.childedudegreeData.selected
  755 + newdata.school_name = this.data.schoolCountryData.selected
750 newdata.children_nation = "中国" 756 newdata.children_nation = "中国"
751 newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected 757 newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
752 newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0 758 newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
@@ -764,11 +770,11 @@ Page({ @@ -764,11 +770,11 @@ Page({
764 return 770 return
765 } 771 }
766 if (this.data.studystartdate.selected.length < 1) { 772 if (this.data.studystartdate.selected.length < 1) {
767 - this.showToast('请选择受入学日期') 773 + this.showToast('请选择受入学时间')
768 return 774 return
769 } 775 }
770 if (this.data.studyenddate.selected.length < 1) { 776 if (this.data.studyenddate.selected.length < 1) {
771 - this.showToast('请选择受预计毕业日期') 777 + this.showToast('请选择受毕业时间')
772 return 778 return
773 } 779 }
774 newdata.education_start = this.data.studystartdate.datelong 780 newdata.education_start = this.data.studystartdate.datelong
@@ -810,10 +816,10 @@ Page({ @@ -810,10 +816,10 @@ Page({
810 this.showToast('请填写赡养人姓名') 816 this.showToast('请填写赡养人姓名')
811 return 817 return
812 } else if (this.data.oldercardtypeData.selected.length < 1) { 818 } else if (this.data.oldercardtypeData.selected.length < 1) {
813 - this.showToast('请选择赡养人证件类型') 819 + this.showToast('请选择赡养人证照类型')
814 return 820 return
815 } else if (!formdata.older_idno || formdata.older_idno.length < 1) { 821 } else if (!formdata.older_idno || formdata.older_idno.length < 1) {
816 - this.showToast('请填写赡养人证件号') 822 + this.showToast('请填写赡养人证照号')
817 return 823 return
818 } 824 }
819 if (this.data.olderbirthDate.selected.length < 1) { 825 if (this.data.olderbirthDate.selected.length < 1) {
@@ -824,6 +830,12 @@ Page({ @@ -824,6 +830,12 @@ Page({
824 this.showToast('请选择与纳税人关系') 830 this.showToast('请选择与纳税人关系')
825 return 831 return
826 } 832 }
  833 + if (!formdata.percent || formdata.percent.length < 1) {
  834 + this.showToast('请填写扣除分摊比例')
  835 + return
  836 + } else {
  837 + newdata.percentage = parseFloat(formdata.percent)
  838 + }
827 newdata.older_birthday = this.data.olderbirthDate.datelong 839 newdata.older_birthday = this.data.olderbirthDate.datelong
828 newdata.older_relative = this.data.older_relativeData.selected 840 newdata.older_relative = this.data.older_relativeData.selected
829 newdata.support_type = this.data.supporttypeData.selected 841 newdata.support_type = this.data.supporttypeData.selected
@@ -835,15 +847,15 @@ Page({ @@ -835,15 +847,15 @@ Page({
835 this.showToast('请填写姓名') 847 this.showToast('请填写姓名')
836 return 848 return
837 } else if (this.data.cardtypeData.selected.length < 1) { 849 } else if (this.data.cardtypeData.selected.length < 1) {
838 - this.showToast('请选择证件类型') 850 + this.showToast('请选择证照类型')
839 return 851 return
840 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) { 852 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
841 - this.showToast('请填写证件号码') 853 + this.showToast('请填写证照号码')
842 return 854 return
843 } else if (this.data.commonbirthDate.selected.length < 1) { 855 } else if (this.data.commonbirthDate.selected.length < 1) {
844 this.showToast('请选择病人出生日期') 856 this.showToast('请选择病人出生日期')
845 return 857 return
846 - }else if (this.data.taxperson_relativeData.selected.length < 1) { 858 + } else if (this.data.taxperson_relativeData.selected.length < 1) {
847 this.showToast('请选择与纳税人关系') 859 this.showToast('请选择与纳税人关系')
848 return 860 return
849 } else if (!formdata.total_amount || formdata.total_amount < 0) { 861 } else if (!formdata.total_amount || formdata.total_amount < 0) {
@@ -862,24 +874,10 @@ Page({ @@ -862,24 +874,10 @@ Page({
862 newdata.patient_birthday = "中国" 874 newdata.patient_birthday = "中国"
863 break; 875 break;
864 case 'house_fund': 876 case 'house_fund':
865 - // subUrl = 'persontax/v1/medical-funds' 877 + subUrl = 'persontax/v1/house-funds'
866 console.log('TITLE', this.data.title) 878 console.log('TITLE', this.data.title)
867 - if (!formdata.lover_name || formdata.lover_name.length < 1) {  
868 - this.showToast('请填写配偶姓名')  
869 - return  
870 - } else if (!formdata.lover_idno || formdata.lover_idno.length < 1) {  
871 - this.showToast('请填写配偶证件号码')  
872 - return  
873 - }  
874 - if (this.data.lovercardtypeData.selected.length < 1) {  
875 - this.showToast('请选择配偶证件类型')  
876 - return  
877 - }  
878 - if (this.data.loverbirthDate.selected.length < 1) {  
879 - this.showToast('请选择配偶出生日期')  
880 - return  
881 - }  
882 - if (this.data.title == "添加住房贷款利息") { 879 +
  880 + if (this.data.house_type == "house_fund_loan") {
883 if (this.data.houseLocateInfo.address_value.length < 1) { 881 if (this.data.houseLocateInfo.address_value.length < 1) {
884 this.showToast('请选择住房地址') 882 this.showToast('请选择住房地址')
885 return 883 return
@@ -889,6 +887,12 @@ Page({ @@ -889,6 +887,12 @@ Page({
889 } else if (!formdata.identify_no || formdata.identify_no.length < 1) { 887 } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
890 this.showToast('请填写证书号码') 888 this.showToast('请填写证书号码')
891 return 889 return
  890 + } else if (this.data.beforemarryData.selected.length < 1) {
  891 + this.showToast('请选择是否首套贷款')
  892 + return
  893 + } else if (this.data.isselfData.selected.length < 1) {
  894 + this.showToast('请选择是否本人借款')
  895 + return
892 } else if (this.data.loantypeData.selected.length < 1) { 896 } else if (this.data.loantypeData.selected.length < 1) {
893 this.showToast('请选择贷款类型') 897 this.showToast('请选择贷款类型')
894 return 898 return
@@ -903,23 +907,36 @@ Page({ @@ -903,23 +907,36 @@ Page({
903 return 907 return
904 } 908 }
905 newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 909 newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
  910 + newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
  911 + newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
  912 + newdata.identify_type = this.data.identifytypeData.selected
  913 +
906 newdata.identify_type = this.data.identifytypeData.selected 914 newdata.identify_type = this.data.identifytypeData.selected
907 newdata.loan_type = this.data.loantypeData.selected 915 newdata.loan_type = this.data.loantypeData.selected
908 newdata.payback_date = this.data.firstpaybackDate.selected 916 newdata.payback_date = this.data.firstpaybackDate.selected
909 newdata.loan_datelong = this.data.loandatelongData.selected 917 newdata.loan_datelong = this.data.loandatelongData.selected
910 - } else if (this.data.title == "添加住房租金") {  
911 - if (this.data.houseLocateInfo.address_value.length < 1) {  
912 - this.showToast('请选择住房地址') 918 + } else if (this.data.house_type == "house_fund_rent") {
  919 + if (this.data.workingcityInfo.address_value.length < 1) {
  920 + this.showToast('请选择工作城市')
913 return 921 return
914 } else if (this.data.leasetypeData.selected.length < 1) { 922 } else if (this.data.leasetypeData.selected.length < 1) {
915 this.showToast('请选择出租方类型') 923 this.showToast('请选择出租方类型')
916 return 924 return
  925 + } else if (!formdata.lease_name || formdata.lease_name.length < 1) {
  926 + this.showToast('请填写出租方名称')
  927 + return
  928 + } else if (!formdata.lease_idno || formdata.lease_idno.length < 1) {
  929 + this.showToast('请填写纳税人识别号')
  930 + return
917 } else if (!formdata.identify_no || formdata.identify_no.length < 1) { 931 } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
918 this.showToast('请填写出租方号码') 932 this.showToast('请填写出租方号码')
919 return 933 return
920 } else if (this.data.identifytypeData.selected.length < 1) { 934 } else if (this.data.identifytypeData.selected.length < 1) {
921 this.showToast('请选择证件类型') 935 this.showToast('请选择证件类型')
922 return 936 return
  937 + } else if (this.data.rentLocateInfo.address_value.length < 1) {
  938 + this.showToast('请选择房屋地址')
  939 + return
923 } else if (!formdata.identify_no || formdata.identify_no.length < 1) { 940 } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
924 this.showToast('请填写证件号码') 941 this.showToast('请填写证件号码')
925 return 942 return
@@ -930,12 +947,25 @@ Page({ @@ -930,12 +947,25 @@ Page({
930 this.showToast('请选择日期') 947 this.showToast('请选择日期')
931 return 948 return
932 } 949 }
933 - newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 950 + 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]
934 newdata.lease_type = this.data.leasetypeData.selected 952 newdata.lease_type = this.data.leasetypeData.selected
935 newdata.identify_type = this.data.identifytypeData.selected 953 newdata.identify_type = this.data.identifytypeData.selected
936 newdata.lease_startdate = this.data.leasestartDate.selected 954 newdata.lease_startdate = this.data.leasestartDate.selected
937 newdata.lease_enddate = this.data.leaseendDate.selected 955 newdata.lease_enddate = this.data.leaseendDate.selected
938 - Console.log('houseLocateInfo', this.data.houseLocateInfo) 956 + console.log('houseLocateInfo', this.data.houseLocateInfo)
  957 + }
  958 + if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
  959 + if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
  960 + this.showToast('请填写配偶姓名')
  961 + return
  962 + } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
  963 + this.showToast('请填写配偶证照号码')
  964 + return
  965 + } else if (this.data.loverbirthDate.selected.length < 1) {
  966 + this.showToast('请选择配偶出生日期')
  967 + return
  968 + }
939 } 969 }
940 newdata.lover_cardtype = this.data.lovercardtypeData.selected 970 newdata.lover_cardtype = this.data.lovercardtypeData.selected
941 newdata.lover_birthdate = this.data.loverbirthDate.selected 971 newdata.lover_birthdate = this.data.loverbirthDate.selected
@@ -1079,11 +1109,11 @@ Page({ @@ -1079,11 +1109,11 @@ Page({
1079 // edudegreeData: edudegree_data 1109 // edudegreeData: edudegree_data
1080 // }) 1110 // })
1081 // break; 1111 // break;
1082 - case 'edu_country':  
1083 - var eduCountry_data = this.data.eduCountryData 1112 + case 'school_country':
  1113 + var eduCountry_data = this.data.schoolCountryData
1084 eduCountry_data.selected = eduCountry_data.values[e.detail.value] 1114 eduCountry_data.selected = eduCountry_data.values[e.detail.value]
1085 this.setData({ 1115 this.setData({
1086 - eduCountryData: eduCountry_data 1116 + schoolCountryData: eduCountry_data
1087 }) 1117 })
1088 break; 1118 break;
1089 case 'support_type': 1119 case 'support_type':
@@ -1168,6 +1198,21 @@ Page({ @@ -1168,6 +1198,21 @@ Page({
1168 identifytypeData: identifytype_Data 1198 identifytypeData: identifytype_Data
1169 }) 1199 })
1170 break; 1200 break;
  1201 + case 'before_marry':
  1202 + var beforemarry_Data = this.data.beforemarryData
  1203 + beforemarry_Data.selected = beforemarry_Data.values[e.detail.value]
  1204 + this.setData({
  1205 + beforemarryData: beforemarry_Data
  1206 + })
  1207 + break;
  1208 + case 'is_self_loan':
  1209 + var isself_Data = this.data.isselfData
  1210 + isself_Data.selected = isself_Data.values[e.detail.value]
  1211 + this.setData({
  1212 + isselfData: isself_Data
  1213 + })
  1214 + break;
  1215 +
1171 case 'loan_type': 1216 case 'loan_type':
1172 var loantype_Data = this.data.loantypeData 1217 var loantype_Data = this.data.loantypeData
1173 loantype_Data.selected = loantype_Data.values[e.detail.value] 1218 loantype_Data.selected = loantype_Data.values[e.detail.value]
@@ -1178,7 +1223,7 @@ Page({ @@ -1178,7 +1223,7 @@ Page({
1178 case 'payback_date': 1223 case 'payback_date':
1179 var firstpayback_Date = this.data.firstpaybackDate 1224 var firstpayback_Date = this.data.firstpaybackDate
1180 firstpayback_Date.selected = e.detail.value 1225 firstpayback_Date.selected = e.detail.value
1181 - console.log('reduce_date', Date.parse(new Date(e.detail.value))) 1226 + console.log('payback_date', Date.parse(new Date(e.detail.value)))
1182 this.setData({ 1227 this.setData({
1183 firstpaybackDate: firstpayback_Date 1228 firstpaybackDate: firstpayback_Date
1184 }) 1229 })
@@ -1200,7 +1245,7 @@ Page({ @@ -1200,7 +1245,7 @@ Page({
1200 case 'lease_start_date': 1245 case 'lease_start_date':
1201 var leasestart_Date = this.data.leasestartDate 1246 var leasestart_Date = this.data.leasestartDate
1202 leasestart_Date.selected = e.detail.value 1247 leasestart_Date.selected = e.detail.value
1203 - console.log('reduce_date', Date.parse(new Date(e.detail.value))) 1248 + console.log('lease_start_date', Date.parse(new Date(e.detail.value)))
1204 this.setData({ 1249 this.setData({
1205 leasestartDate: leasestart_Date 1250 leasestartDate: leasestart_Date
1206 }) 1251 })
@@ -1208,7 +1253,7 @@ Page({ @@ -1208,7 +1253,7 @@ Page({
1208 case 'lease_end_date': 1253 case 'lease_end_date':
1209 var leaseend_Date = this.data.leaseendDate 1254 var leaseend_Date = this.data.leaseendDate
1210 leaseend_Date.selected = e.detail.value 1255 leaseend_Date.selected = e.detail.value
1211 - console.log('reduce_date', Date.parse(new Date(e.detail.value))) 1256 + console.log('lease_end_date', Date.parse(new Date(e.detail.value)))
1212 this.setData({ 1257 this.setData({
1213 leaseendDate: leaseend_Date 1258 leaseendDate: leaseend_Date
1214 }) 1259 })
@@ -1227,13 +1272,32 @@ Page({ @@ -1227,13 +1272,32 @@ Page({
1227 houseLocateInfo: house_address 1272 houseLocateInfo: house_address
1228 }) 1273 })
1229 break; 1274 break;
1230 - case 'reduce_date':  
1231 - var reducedate_data = this.data.reducedateData  
1232 - reducedate_data.selected = e.detail.value  
1233 - reducedate_data.datelong = Date.parse(new Date(e.detail.value)) / 1000,  
1234 - console.log('reduce_date', Date.parse(new Date(e.detail.value))) 1275 + case 'working_city':
  1276 + console.log('working_city', e)
  1277 + var work_address = this.data.workingcityInfo;
  1278 + work_address.address_value = e.detail.value
  1279 + if (e.detail.value[0] == e.detail.value[1]) {
  1280 + work_address.selected = e.detail.value[1] + e.detail.value[2]
  1281 + } else {
  1282 + work_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
  1283 +
  1284 + }
  1285 + this.setData({
  1286 + workingcityInfo: work_address
  1287 + })
  1288 + break;
  1289 + case 'rent_house_locate':
  1290 + console.log('rent_house_locate', e)
  1291 + var rent_address = this.data.rentLocateInfo;
  1292 + rent_address.address_value = e.detail.value
  1293 + if (e.detail.value[0] == e.detail.value[1]) {
  1294 + rent_address.selected = e.detail.value[1] + e.detail.value[2]
  1295 + } else {
  1296 + rent_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
  1297 +
  1298 + }
1235 this.setData({ 1299 this.setData({
1236 - reducedateData: reducedate_data 1300 + rentLocateInfo: rent_address
1237 }) 1301 })
1238 break; 1302 break;
1239 } 1303 }
@@ -61,12 +61,12 @@ @@ -61,12 +61,12 @@
61 <template is="picker_cell_normal" data="{{...studyenddate}}" /> 61 <template is="picker_cell_normal" data="{{...studyenddate}}" />
62 62
63 <view class='divide_line_f5f5f5'></view> 63 <view class='divide_line_f5f5f5'></view>
64 - <template is="picker_cell_normal" data="{{...eduCountryData}}" /> 64 + <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
65 <view class='divide_line_f5f5f5'></view> 65 <view class='divide_line_f5f5f5'></view>
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='educate_school'></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'></input>
70 </view> 70 </view>
71 <view class='divide_line_f5f5f5'></view> 71 <view class='divide_line_f5f5f5'></view>
72 </view> 72 </view>
@@ -173,12 +173,12 @@ @@ -173,12 +173,12 @@
173 </view> 173 </view>
174 <view class='divide_line_f5f5f5'></view> 174 <view class='divide_line_f5f5f5'></view>
175 <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> 175 <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
176 - <view class='divide_line_f5f5f5'></view>  
177 - <view style='height:90rpx'>  
178 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
179 - <text class='text_black_30 float_left'>病人国籍</text>  
180 - <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>  
181 - </view> 176 + <view class='divide_line_f5f5f5'></view>
  177 + <view style='height:90rpx'>
  178 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  179 + <text class='text_black_30 float_left'>病人国籍</text>
  180 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
  181 + </view>
182 <view class='divide_line_f5f5f5'></view> 182 <view class='divide_line_f5f5f5'></view>
183 <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> 183 <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
184 <view class='divide_line_f5f5f5'></view> 184 <view class='divide_line_f5f5f5'></view>
@@ -204,6 +204,7 @@ @@ -204,6 +204,7 @@
204 <template is="picker_cell_normal" data="{{...identifytypeData}}" /> 204 <template is="picker_cell_normal" data="{{...identifytypeData}}" />
205 <view class='divide_line_f5f5f5'></view> 205 <view class='divide_line_f5f5f5'></view>
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 class='text_black_30 float_left'>证书号码</text> 208 <text class='text_black_30 float_left'>证书号码</text>
208 <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='identify_no'></input>
209 </view> 210 </view>
@@ -220,6 +221,7 @@ @@ -220,6 +221,7 @@
220 <template is="picker_cell_normal" data="{{...loantypeData}}" /> 221 <template is="picker_cell_normal" data="{{...loantypeData}}" />
221 <view class='divide_line_f5f5f5'></view> 222 <view class='divide_line_f5f5f5'></view>
222 <view style='height:90rpx'> 223 <view style='height:90rpx'>
  224 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
223 <text class='text_black_30 float_left'>贷款合同编号</text> 225 <text class='text_black_30 float_left'>贷款合同编号</text>
224 <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='contract_no'></input>
225 </view> 227 </view>
@@ -238,28 +240,35 @@ @@ -238,28 +240,35 @@
238 <template is="picker_cell_normal" data="{{...leasetypeData}}" /> 240 <template is="picker_cell_normal" data="{{...leasetypeData}}" />
239 <view class='divide_line_f5f5f5'></view> 241 <view class='divide_line_f5f5f5'></view>
240 <view style='height:90rpx'> 242 <view style='height:90rpx'>
  243 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
241 <text class='text_black_30 float_left'>出租方名称</text> 244 <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='lease_name'></input> 245 <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>
243 </view> 246 </view>
244 <view class='divide_line_f5f5f5'></view> 247 <view class='divide_line_f5f5f5'></view>
245 <view style='height:90rpx'> 248 <view style='height:90rpx'>
  249 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
246 <text class='text_black_30 float_left'>出租方纳税人识别号</text> 250 <text class='text_black_30 float_left'>出租方纳税人识别号</text>
247 - <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> 251 + <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
248 </view> 252 </view>
249 <view class='divide_line_f5f5f5'></view> 253 <view class='divide_line_f5f5f5'></view>
250 <template is="picker_cell_normal" data="{{...identifytypeData}}" /> 254 <template is="picker_cell_normal" data="{{...identifytypeData}}" />
251 <view class='divide_line_f5f5f5'></view> 255 <view class='divide_line_f5f5f5'></view>
252 <view style='height:90rpx'> 256 <view style='height:90rpx'>
  257 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
253 <text class='text_black_30 float_left'>证书号码</text> 258 <text class='text_black_30 float_left'>证书号码</text>
254 <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> 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>
255 </view> 260 </view>
256 </view> 261 </view>
257 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view> 262 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
258 <view style='padding:0 30rpx;'> 263 <view style='padding:0 30rpx;'>
259 - <template is="picker_cell_normal" data="{{...contactLocateInfo}}" /> 264 + <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
260 <view class='divide_line_f5f5f5'></view> 265 <view class='divide_line_f5f5f5'></view>
261 -  
262 <view style='height:90rpx'> 266 <view style='height:90rpx'>
  267 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='detail_address'></input>
  268 + </view>
  269 + <view class='divide_line_f5f5f5'></view>
  270 + <view style='height:90rpx'>
  271 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
263 <text class='text_black_30 float_left'>租赁合同编号</text> 272 <text class='text_black_30 float_left'>租赁合同编号</text>
264 <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> 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>
265 </view> 274 </view>
@@ -280,7 +289,7 @@ @@ -280,7 +289,7 @@
280 <text class='text_black_30 float_left'>扣除金额</text> 289 <text class='text_black_30 float_left'>扣除金额</text>
281 <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text> 290 <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
282 <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text> 291 <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
283 - <!-- <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> --> 292 + <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
284 </view> 293 </view>
285 <view class='divide_line_f5f5f5'></view> 294 <view class='divide_line_f5f5f5'></view>
286 295
@@ -305,19 +314,12 @@ @@ -305,19 +314,12 @@
305 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image> 314 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
306 <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input> 315 <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input>
307 </view> 316 </view>
308 - <!-- <view wx:else>  
309 - <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='24' value='{{spouse_id_card_no}}'></input>  
310 - </view> -->  
311 - <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='spouse_id_card_no'></input> -->  
312 </view> 317 </view>
313 -  
314 -  
315 <view class='divide_line_f5f5f5'></view> 318 <view class='divide_line_f5f5f5'></view>
316 <template is="picker_cell_normal" data="{{...loverbirthDate}}" /> 319 <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
317 <view class='divide_line_f5f5f5'></view> 320 <view class='divide_line_f5f5f5'></view>
318 <view style='height:90rpx'> 321 <view style='height:90rpx'>
319 <text class='text_black_30 float_left'>国籍</text> 322 <text class='text_black_30 float_left'>国籍</text>
320 - <!-- <image class='arrow_wrap' src='/images/arrow_right.png'></image> -->  
321 <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text> 323 <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
322 </view> 324 </view>
323 </view> 325 </view>
@@ -337,19 +339,12 @@ @@ -337,19 +339,12 @@
337 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image> 339 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
338 <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input> 340 <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input>
339 </view> 341 </view>
340 - <!-- <view wx:else>  
341 - <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='24' value='{{lover_idno}}'></input>  
342 - </view> -->  
343 - <!-- <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> -->  
344 </view> 342 </view>
345 -  
346 -  
347 <view class='divide_line_f5f5f5'></view> 343 <view class='divide_line_f5f5f5'></view>
348 <template is="picker_cell_normal" data="{{...loverbirthDate}}" /> 344 <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
349 <view class='divide_line_f5f5f5'></view> 345 <view class='divide_line_f5f5f5'></view>
350 <view style='height:90rpx'> 346 <view style='height:90rpx'>
351 <text class='text_black_30 float_left'>国籍</text> 347 <text class='text_black_30 float_left'>国籍</text>
352 - <!-- <image class='arrow_wrap' src='/images/arrow_right.png'></image> -->  
353 <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text> 348 <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
354 </view> 349 </view>
355 </view> 350 </view>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 } 19 }
20 20
21 .input_wrap01 { 21 .input_wrap01 {
22 - width: 420rpx; 22 + width: 400rpx;
23 height: 90rpx; 23 height: 90rpx;
24 font-size: 30rpx; 24 font-size: 30rpx;
25 color: #333; 25 color: #333;
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <text class='text_right_333'>{{datas.school_country}}</text> 49 <text class='text_right_333'>{{datas.school_country}}</text>
50 </view> 50 </view>
51 <view style='height:90rpx;width:100%'> 51 <view style='height:90rpx;width:100%'>
52 - <text class='text_left'>就读学校</text> 52 + <text class='text_left'>就读学校名称</text>
53 <text class='text_right_333'>{{datas.school_name}}</text> 53 <text class='text_right_333'>{{datas.school_name}}</text>
54 </view> 54 </view>
55 <!-- <view style='height:90rpx;width:100%'> 55 <!-- <view style='height:90rpx;width:100%'>
@@ -70,11 +70,11 @@ @@ -70,11 +70,11 @@
70 <text class='text_right_333'>{{datas.spouse_name}}</text> 70 <text class='text_right_333'>{{datas.spouse_name}}</text>
71 </view> 71 </view>
72 <view style='height:90rpx;width:100%'> 72 <view style='height:90rpx;width:100%'>
73 - <text class='text_left'>配偶证件类型</text> 73 + <text class='text_left'>配偶证照类型</text>
74 <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text> 74 <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
75 </view> 75 </view>
76 <view style='height:90rpx;width:100%'> 76 <view style='height:90rpx;width:100%'>
77 - <text class='text_left'>配偶身份证件号码</text> 77 + <text class='text_left'>配偶身份证照号码</text>
78 <text class='text_right_333'>{{datas.spouse_id_card_no}}</text> 78 <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
79 </view> 79 </view>
80 <view style='height:90rpx;width:100%'> 80 <view style='height:90rpx;width:100%'>
@@ -247,11 +247,11 @@ @@ -247,11 +247,11 @@
247 <text class='text_right_333'>{{datas.spouse_name}}</text> 247 <text class='text_right_333'>{{datas.spouse_name}}</text>
248 </view> 248 </view>
249 <view style='height:90rpx;width:100%'> 249 <view style='height:90rpx;width:100%'>
250 - <text class='text_left'>配偶证件类型</text> 250 + <text class='text_left'>配偶证照类型</text>
251 <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text> 251 <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
252 </view> 252 </view>
253 <view style='height:90rpx;width:100%'> 253 <view style='height:90rpx;width:100%'>
254 - <text class='text_left'>配偶身份证件号码</text> 254 + <text class='text_left'>配偶身份证照号码</text>
255 <text class='text_right_333'>{{datas.spouse_id_card_no}}</text> 255 <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
256 </view> 256 </view>
257 <view style='height:90rpx;width:100%'> 257 <view style='height:90rpx;width:100%'>
@@ -39,9 +39,9 @@ Page({ @@ -39,9 +39,9 @@ Page({
39 console.log("lookandadd", e); 39 console.log("lookandadd", e);
40 if (this.data.additiondata.options && this.data.additiondata.options.length>0){ 40 if (this.data.additiondata.options && this.data.additiondata.options.length>0){
41 var newstatus = this.data.additiondata.options[e.currentTarget.id] 41 var newstatus = this.data.additiondata.options[e.currentTarget.id]
42 - if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){  
43 - newstatus = "house_fund"  
44 - } 42 + // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
  43 + // newstatus = "house_fund"
  44 + // }
45 wx.navigateTo({ 45 wx.navigateTo({
46 url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity, 46 url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
47 }) 47 })
@@ -79,15 +79,28 @@ Page({ @@ -79,15 +79,28 @@ Page({
79 */ 79 */
80 onLoad: function(options) { 80 onLoad: function(options) {
81 var that = this 81 var that = this
  82 + var housetype, housestatus
82 console.log("options", options); 83 console.log("options", options);
  84 + if (options.status == 'house_fund_rent') {
  85 + housetype = 'house_fund_rent'
  86 + housestatus = 'house_fund'
  87 + } else if (options.status == 'house_fund_loan') {
  88 + housetype = 'house_fund_loan'
  89 + housestatus = 'house_fund'
  90 + } else {
  91 + housetype = ''
  92 + housestatus = options.status
  93 + }
83 this.setData({ 94 this.setData({
84 - cur_status: options.status, 95 + cur_status: housestatus,
  96 + house_type: housetype,
85 legal_entity_id: options.legal_entity_id, 97 legal_entity_id: options.legal_entity_id,
86 legal_entity: options.legal_entity 98 legal_entity: options.legal_entity
87 }) 99 })
88 wx.setNavigationBarTitle({ 100 wx.setNavigationBarTitle({
89 - "title": that.data.additiontitle[options.status], 101 + "title": that.data.additiontitle[this.data.cur_status],
90 }) 102 })
  103 +
91 }, 104 },
92 105
93 /** 106 /**
@@ -126,7 +139,6 @@ Page({ @@ -126,7 +139,6 @@ Page({
126 139
127 handleAddition: function(data) { 140 handleAddition: function(data) {
128 var newdata = data.items 141 var newdata = data.items
129 - var housetype = ""  
130 for (var i = 0; i < newdata.length; i++) { 142 for (var i = 0; i < newdata.length; i++) {
131 if (newdata[i].education_start && newdata[i].education_start > 0) { 143 if (newdata[i].education_start && newdata[i].education_start > 0) {
132 newdata[i].education_start = format.formatTime_date(newdata[i].education_start) 144 newdata[i].education_start = format.formatTime_date(newdata[i].education_start)
@@ -137,7 +149,6 @@ Page({ @@ -137,7 +149,6 @@ Page({
137 } 149 }
138 150
139 this.setData({ 151 this.setData({
140 - house_type: "house_fund" == this.data.cur_status ? newdata[0].type:"",  
141 additionInfo: newdata 152 additionInfo: newdata
142 }) 153 })
143 }, 154 },
@@ -263,12 +263,12 @@ @@ -263,12 +263,12 @@
263 </view> 263 </view>
264 <view style='padding-right: 30rpx'> 264 <view style='padding-right: 30rpx'>
265 <view class='divide_line_f5f5f5'></view> 265 <view class='divide_line_f5f5f5'></view>
266 - <view wx:if="{{item.type=='house_fund_rent'}}"> 266 + <view wx:if="{{house_type=='house_fund_rent'}}">
267 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text> 267 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
268 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text> 268 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
269 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text> 269 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
270 </view> 270 </view>
271 - <view wx:if="{{item.type=='house_fund_loan'}}"> 271 + <view wx:if="{{house_type=='house_fund_loan'}}">
272 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text> 272 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
273 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text> 273 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
274 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text> 274 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
请 注册 或 登录 后发表评论