正在显示
1 个修改的文件
包含
32 行增加
和
5 行删除
@@ -16,7 +16,8 @@ const Deduce_amounts_month = { | @@ -16,7 +16,8 @@ const Deduce_amounts_month = { | ||
16 | 'continuing_education': 400, | 16 | 'continuing_education': 400, |
17 | 'support_duty': 2000, | 17 | 'support_duty': 2000, |
18 | 'medical_fund': 0, | 18 | 'medical_fund': 0, |
19 | - 'house_fund': 0 | 19 | + 'house_fund_rent': 1000, |
20 | + "house_fund_loan":1200 | ||
20 | } | 21 | } |
21 | const Deduce_amounts_year = { | 22 | const Deduce_amounts_year = { |
22 | 'children_education': 12000, | 23 | 'children_education': 12000, |
@@ -24,13 +25,15 @@ const Deduce_amounts_year = { | @@ -24,13 +25,15 @@ const Deduce_amounts_year = { | ||
24 | 'continuing_education_non': 3600, | 25 | 'continuing_education_non': 3600, |
25 | 'support_duty': 24000, | 26 | 'support_duty': 24000, |
26 | 'medical_fund': 0, | 27 | 'medical_fund': 0, |
27 | - 'house_fund': 0 | 28 | + 'house_fund_rent': 12000, |
29 | + "house_fund_loan":14400 | ||
28 | } | 30 | } |
29 | 31 | ||
30 | Page({ | 32 | Page({ |
31 | idcard_belong: null, //照片信息获取返回时判断所属 | 33 | idcard_belong: null, //照片信息获取返回时判断所属 |
32 | legal_entity_id: "", | 34 | legal_entity_id: "", |
33 | legal_entity: "", | 35 | legal_entity: "", |
36 | + fund_type:"", | ||
34 | data: { | 37 | data: { |
35 | house_type: "", | 38 | house_type: "", |
36 | deduction_amount: '', | 39 | deduction_amount: '', |
@@ -484,8 +487,26 @@ Page({ | @@ -484,8 +487,26 @@ Page({ | ||
484 | cardtypeData: cardtype_data, | 487 | cardtypeData: cardtype_data, |
485 | commonbirthDate: commonbirth_date | 488 | commonbirthDate: commonbirth_date |
486 | }) | 489 | }) |
487 | - } else if (frontPage.data.house_type == "house_fund_rent" || frontPage.data.house_type == "house_fund_loan") { | 490 | + } else if (frontPage.data.house_type == "rent") { |
488 | this.getbanklist() | 491 | this.getbanklist() |
492 | + this.fund_type = "rent" | ||
493 | + if (options.reducetype == '月度') { | ||
494 | + reduce_typeData.selected = '月度' | ||
495 | + deduction_amount = Deduce_amounts_month["house_fund_rent"] | ||
496 | + } else { | ||
497 | + deduction_amount = Deduce_amounts_year["house_fund_rent"] | ||
498 | + reduce_typeData.selected = '年度' | ||
499 | + } | ||
500 | + } else if (frontPage.data.house_type == "house_fund_loan") { | ||
501 | + this.getbanklist() | ||
502 | + this.fund_type = "loan" | ||
503 | + if (options.reducetype == '月度') { | ||
504 | + reduce_typeData.selected = '月度' | ||
505 | + deduction_amount = Deduce_amounts_month["house_fund_loan"] | ||
506 | + } else { | ||
507 | + deduction_amount = Deduce_amounts_year["house_fund_loan"] | ||
508 | + reduce_typeData.selected = '年度' | ||
509 | + } | ||
489 | } | 510 | } |
490 | var title = '添加' + AddTypeNames[nameKey] | 511 | var title = '添加' + AddTypeNames[nameKey] |
491 | 512 | ||
@@ -1470,10 +1491,16 @@ Page({ | @@ -1470,10 +1491,16 @@ Page({ | ||
1470 | case 'reduce_type': | 1491 | case 'reduce_type': |
1471 | var reduce_typeData = this.data.reducetypeData | 1492 | var reduce_typeData = this.data.reducetypeData |
1472 | var deduction_amount | 1493 | var deduction_amount |
1494 | + var key = this.data.cur_index | ||
1495 | + if (this.fund_type == 'rent') { | ||
1496 | + key = 'house_fund_rent' | ||
1497 | + } else if (this.fund_type == 'loan') { | ||
1498 | + key = 'house_fund_loan' | ||
1499 | + } | ||
1473 | if (e.detail.value == '0') { | 1500 | if (e.detail.value == '0') { |
1474 | - deduction_amount = Deduce_amounts_month[this.data.cur_index] | 1501 | + deduction_amount = Deduce_amounts_month[key] |
1475 | } else { | 1502 | } else { |
1476 | - deduction_amount = Deduce_amounts_year[this.data.cur_index] | 1503 | + deduction_amount = Deduce_amounts_year[key] |
1477 | } | 1504 | } |
1478 | reduce_typeData.selected = reduce_typeData.values[e.detail.value] | 1505 | reduce_typeData.selected = reduce_typeData.values[e.detail.value] |
1479 | this.setData({ | 1506 | this.setData({ |
请
注册
或
登录
后发表评论