正在显示
2 个修改的文件
包含
13 行增加
和
13 行删除
| ... | ... | @@ -1430,7 +1430,7 @@ Page({ |
| 1430 | 1430 | // this.showToast('请填写扣除金额') |
| 1431 | 1431 | // return |
| 1432 | 1432 | // } |
| 1433 | - if (this.data.cur_index != 'medical_fund') { | |
| 1433 | + if (this.data.cur_index != 'medical_fund' && this.data.cur_index != 'continuing_education') { | |
| 1434 | 1434 | newdata.deduction_type = this.data.reducetypeData.selected == '月度' ? "month" : "year" |
| 1435 | 1435 | newdata.deduction_amount = this.data.deduction_amount //formdata.reduce_money |
| 1436 | 1436 | } |
| ... | ... | @@ -1772,20 +1772,20 @@ Page({ |
| 1772 | 1772 | edutypee_data.selected = edutypee_data.values[e.detail.value] |
| 1773 | 1773 | var reducetypeData = this.data.reducetypeData |
| 1774 | 1774 | var deduction_amount |
| 1775 | - if (e.detail.value == '1') {//非学历教育 | |
| 1776 | - reducetypeData.selected = '年度' | |
| 1777 | - // reducetypeData.disabled = true | |
| 1778 | - deduction_amount = Deduce_amounts_year['continuing_education_non'] | |
| 1779 | - }else { | |
| 1780 | - // reducetypeData.disabled = false | |
| 1781 | - reducetypeData.selected = '月度' | |
| 1782 | - deduction_amount = Deduce_amounts_month['continuing_education'] | |
| 1783 | - } | |
| 1775 | + // if (e.detail.value == '1') {//非学历教育 | |
| 1776 | + // reducetypeData.selected = '年度' | |
| 1777 | + // // reducetypeData.disabled = true | |
| 1778 | + // deduction_amount = Deduce_amounts_year['continuing_education_non'] | |
| 1779 | + // }else { | |
| 1780 | + // // reducetypeData.disabled = false | |
| 1781 | + // reducetypeData.selected = '月度' | |
| 1782 | + // deduction_amount = Deduce_amounts_month['continuing_education'] | |
| 1783 | + // } | |
| 1784 | 1784 | this.setData({ |
| 1785 | 1785 | edu_lable: e.detail.value == 0 ? 'school' : 'tech', |
| 1786 | 1786 | edutypeData: edutypee_data, |
| 1787 | - reducetypeData: reducetypeData, | |
| 1788 | - deduction_amount: deduction_amount | |
| 1787 | + // reducetypeData: reducetypeData, | |
| 1788 | + // deduction_amount: deduction_amount | |
| 1789 | 1789 | }) |
| 1790 | 1790 | break; |
| 1791 | 1791 | case 'edu_style': | ... | ... |
| ... | ... | @@ -316,7 +316,7 @@ |
| 316 | 316 | </view> |
| 317 | 317 | </view> |
| 318 | 318 | |
| 319 | -<view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund' && cur_index!='support_duty'}}"> | |
| 319 | +<view style='padding:0 30rpx;' wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}"> | |
| 320 | 320 | <view class='divide_line_30'></view> |
| 321 | 321 | <template is="picker_cell_normal" data="{{...reducetypeData}}" /> |
| 322 | 322 | <view class='divide_line_30'></view> | ... | ... |
请
注册
或
登录
后发表评论