wangyu / naturalPersonTax · 提交

提交 85c8f07068acfed4e06c895b02797c4257fdf443

作者 pangy
2 个父辈 abee9852 f1ecc36b
构建： 未知

Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

内嵌 并排对比
正在显示 9 个修改的文件 包含 373 行增加 和 366 行删除
... ... @@ -15,7 +15,6 @@
15 15
16 16 "pages/main/addtionalreduce/adddupporters/adddupporters",
17 17
18   -
19 18 "pages/main/addtionalreduce/additiondetail/additiondetail",
20 19 "pages/main/advancepayment/adPayHome",
21 20 "pages/main/finalpayment/home",
... ...
... ... @@ -104,14 +104,14 @@
104 104
105 105 <!-- 赡养老人 -->
106 106 <view style='padding:0 30rpx' wx:if="{{cur_status=='support_duty'}}">
107   - <view style='height:90rpx;width:100%;clear:both;'>
  107 + <!-- <view style='height:90rpx;width:100%;clear:both;'>
108 108 <text class='text_left'>是否独生子女</text>
109 109 <text class='text_right_333'>{{datas.is_single=='n'?"否":"是"}}</text>
110 110 </view>
111 111 <view wx:if="{{datas.is_single=='y'}}" style='height:90rpx;width:100%;clear:both;'>
112 112 <text class='text_left'>分摊方式</text>
113 113 <text class='text_right_333'>{{datas.share_method}}</text>
114   - </view>
  114 + </view> -->
115 115 <view style='height:90rpx;width:100%;clear:both;'>
116 116 <text class='text_left'>被赡养人姓名</text>
117 117 <text class='text_right_333'>{{datas.supported_name}}</text>
... ...
... ... @@ -8,7 +8,7 @@ Page({
8 8 * Page initial data
9 9 */
10 10 data: {
11   - additiondata:{}
  11 + additiondata: {}
12 12 },
13 13
14 14 /**
... ...
... ... @@ -4,11 +4,11 @@
4 4
5 5 <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
6 6 <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx" >
7   - <view wx:if="{{item=='children_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  7 + <view wx:if="{{item=='children_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
8 8 <view style='height:40rpx'>
9 9 <text class='text_333_32 float_left'>子女教育</text>
10 10 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
11   - <text class='text_999_28' style='float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  11 + <text class='text_999_28' style='float:right' >查看</text>
12 12 </view>
13 13 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
14 14 <view class='float_left' style='flex:1'>
... ... @@ -21,12 +21,11 @@
21 21 </view>
22 22 </view>
23 23 </view>
24   - <view class='divide_line_f5f5f5' style='margin-left: 30rpx;margin-right: 30rpx'></view>
25   - <view wx:if="{{item=='continuing_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  24 + <view wx:if="{{item=='continuing_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
26 25 <view style='height:40rpx'>
27 26 <text class='text_333_32 float_left'>继续教育</text>
28 27 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
29   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  28 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
30 29 </view>
31 30 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
32 31 <view class='float_left' style='flex:1'>
... ... @@ -67,11 +66,11 @@
67 66 </view>
68 67 </view> -->
69 68 </view>
70   - <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column'>
  69 + <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column' bindtap='lookandadd' id='{{idx}}'>
71 70 <view style='height:40rpx'>
72 71 <text class='text_333_32 float_left'>大病医疗</text>
73 72 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
74   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  73 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
75 74 </view>
76 75 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
77 76 <view class='float_left' style='flex:1'>
... ... @@ -84,11 +83,11 @@
84 83 </view>
85 84 </view>
86 85 </view>
87   - <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  86 + <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
88 87 <view style='height:40rpx'>
89 88 <text class='text_333_32 float_left'>赡养老人</text>
90 89 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
91   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  90 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
92 91 </view>
93 92 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
94 93 <view class='float_left' style='flex:1'>
... ... @@ -101,11 +100,11 @@
101 100 </view>
102 101 </view>
103 102 </view>
104   - <view wx:if="{{item=='house_fund_rent'||item=='house_fund_loan'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  103 + <view wx:if="{{item=='house_fund_rent'||item=='house_fund_loan'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
105 104 <view style='height:40rpx'>
106 105 <text class='text_333_32 float_left'>住房</text>
107 106 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
108   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  107 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
109 108 </view>
110 109 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
111 110 <view class='float_left' style='flex:1'>
... ... @@ -118,6 +117,7 @@
118 117 </view>
119 118 </view>
120 119 </view>
  120 + <view style='margin: 0 30rpx;height:1px;background:#f5f5f5'></view>
121 121 </block>
122 122 </view>
123 123
... ...
... ... @@ -14,12 +14,12 @@
14 14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
15 15 <view>
16 16 <view style='margin:0 50rpx;background:#e5e5e5;height:2rpx;'></view>
17   - <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  17 + <view style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>
18 18 <view style='height:40rpx'>
19 19 <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
20 20 <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
21 21 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
22   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>查看</text>
  22 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
23 23 </view>
24 24 <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
25 25 <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
... ...
... ... @@ -565,7 +565,7 @@ Page({
565 565 bindinput: function(e) {
566 566 console.log("bindinput", e)
567 567 var inputamount
568   - if (e.detail.value && e.detail.value.replace(/\s+/g, "").length>0){
  568 + if (e.detail.value && e.detail.value.replace(/\s|\xA0/g, "").length>0){
569 569 inputamount = parseFloat(e.detail.value)+0
570 570 }else{
571 571 inputamount = -1
... ... @@ -573,6 +573,7 @@ Page({
573 573 this.setData({
574 574 reduce_amount: inputamount
575 575 })
  576 + console.log("reduce_amount", inputamount)
576 577 },
577 578
578 579 showToast: function(data) {
... ...
1 1 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
2 2 <import src="../../../common/picker_cell" />
3 3
4   -<view style='width:100%;height:100%;background:#FCFCFC;'>
5   - <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
6   - <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
  4 + <view style='width:100%;height:100%;'>
  5 + <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
  6 + <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
7 7
8   - <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='children_education'||cur_status=='house_fund'}}">
9   - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
10   - <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text>
11   - </view>
12   - <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='medical_fund'}}">
13   - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
14   - <text class='text_999_30 float_right' style='line-height:100rpx'>年度</text>
15   - </view>
16   - <!-- 12.22 更新为不可选择(去掉点击事件) -->
17   - <!-- <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' wx:elif="{{cur_status!='continuing_education'&&cur_status!='support_duty'}}">
  8 + <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='children_education'||cur_status=='house_fund'}}">
  9 + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
  10 + <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text>
  11 + </view>
  12 + <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='medical_fund'}}">
  13 + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
  14 + <text class='text_999_30 float_right' style='line-height:100rpx'>年度</text>
  15 + </view>
  16 + <!-- 12.22 更新为不可选择(去掉点击事件) -->
  17 + <!-- <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' wx:elif="{{cur_status!='continuing_education'&&cur_status!='support_duty'}}">
18 18 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
19 19 <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
20 20 <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
21 21 </view> -->
22   - <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
23   - <template is="picker_cell_normal" data="{{...issinglechildData}}" />
  22 + <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
  23 + <template is="picker_cell_normal" data="{{...issinglechildData}}" />
24 24
25   - <view wx:if="{{issinglechildData.selected=='否'}}">
26   - <view class='divide_line_f5f5f5'></view>
27   - <template is="picker_cell_normal" data="{{...shareMethodData}}" />
28   - <view class='divide_line_f5f5f5'></view>
29   - <view style='height:90rpx'>
30   - <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
31   - <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
32   - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput' disabled='{{input_disable}}' value='{{reduce_amount>=0?reduce_amount:""}}'></input>
  25 + <view wx:if="{{issinglechildData.selected=='否'}}">
  26 + <view class='divide_line_f5f5f5'></view>
  27 + <template is="picker_cell_normal" data="{{...shareMethodData}}" />
  28 + <view class='divide_line_f5f5f5'></view>
  29 + <view wx:if="{{!input_disable}}" style='height:90rpx'>
  30 + <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
  31 + <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
  32 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' name='reduce_amount' bindblur='bindinput' value='{{reduce_amount>=0?reduce_amount:""}}'></input>
  33 + </view>
  34 + <view wx:else style='height:90rpx'>
  35 + <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
  36 + <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>{{reduce_amount}}/月</text>
  37 + </view>
33 38 </view>
34   - </view>
35   - <view wx:elif="{{issinglechildData.selected=='是'}}">
36   - <view class='divide_line_f5f5f5'></view>
37   - <view style='height:90rpx'>
38   - <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
39   - <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>2000/月</text>
  39 + <view wx:elif="{{issinglechildData.selected=='是'}}">
  40 + <view class='divide_line_f5f5f5'></view>
  41 + <view style='height:90rpx'>
  42 + <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
  43 + <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>2000/月</text>
  44 + </view>
40 45 </view>
41 46 </view>
42   - </view>
43 47
44 48
45   - <view wx:if="{{additionInfo&&additionInfo.length>0}}">
  49 + <view wx:if="{{additionInfo&&additionInfo.length>0}}">
46 50
47   - <view wx:if="{{cur_status=='children_education'}}">
48   - <view wx:for="{{additionInfo}}">
49   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
50   - <view style='height:110rpx'>
51   - <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
52   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
53   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
54   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
  51 + <view wx:if="{{cur_status=='children_education'}}">
  52 + <view wx:for="{{additionInfo}}">
  53 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  54 + <view style='height:110rpx'>
  55 + <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
  56 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  57 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  58 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
55 59
56   - </view>
57   - <view style='padding-right: 30rpx'>
58   - <view class='divide_line_f5f5f5'></view>
59   - <view style='height:70rpx'>
60   - <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
61   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
62   - </view>
63   - <view style='height:70rpx'>
64   - <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
65   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
66   - </view>
67   - <view style='height:70rpx'>
68   - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
69   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
70   - </view>
71   - <view style='height:70rpx'>
72   - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
73   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
74 60 </view>
75   - <view class='divide_line_f5f5f5'></view>
76   - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
77   - <view class='float_right' wx:if="{{item.status=='failed'}}">
78   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
79   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  61 + <view style='padding-right: 30rpx'>
  62 + <view class='divide_line_f5f5f5'></view>
  63 + <view style='height:70rpx'>
  64 + <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
  65 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
  66 + </view>
  67 + <view style='height:70rpx'>
  68 + <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
  69 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
  70 + </view>
  71 + <view style='height:70rpx'>
  72 + <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
  73 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
  74 + </view>
  75 + <view style='height:70rpx'>
  76 + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
  77 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  78 + </view>
  79 + <view class='divide_line_f5f5f5'></view>
  80 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
  81 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  82 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  83 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  84 + </view>
80 85 </view>
81 86 </view>
82 87 </view>
83 88 </view>
84   - </view>
85 89
86   - <view wx:if="{{cur_status=='continuing_education'}}">
87   - <view wx:for="{{additionInfo}}">
88   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type==''||item.education_type=='title'}}">
89   - <view style='height:110rpx'>
90   - <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
91   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
92   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
93   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
94   - </view>
95   - <view style='padding-right:right'>
96   - <view class='divide_line_f5f5f5'></view>
97   - <!-- <view style='height:70rpx'>
  90 + <view wx:if="{{cur_status=='continuing_education'}}">
  91 + <view wx:for="{{additionInfo}}">
  92 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type==''||item.education_type=='title'}}">
  93 + <view style='height:110rpx'>
  94 + <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
  95 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  96 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  97 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
  98 + </view>
  99 + <view style='padding-right:right'>
  100 + <view class='divide_line_f5f5f5'></view>
  101 + <!-- <view style='height:70rpx'>
98 102 <text class='text_999_28 ' style='line-height:70rpx'>继续教育情况：</text>
99 103 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
100 104 </view> -->
101   - <view style='height:70rpx'>
102   - <text class='text_999_28 ' style='line-height:70rpx'>教育阶段：</text>
103   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
104   - </view>
105   - <view style='height:70rpx'>
106   - <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
107   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_start}}</text>
108   - </view>
109   - <view style='height:70rpx'>
110   - <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
111   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
112   - </view>
113   - <view style='height:70rpx'>
114   - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
115   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
116   - </view>
117   - <view style='height:70rpx'>
118   - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
119   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  105 + <view style='height:70rpx'>
  106 + <text class='text_999_28 ' style='line-height:70rpx'>教育阶段：</text>
  107 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
  108 + </view>
  109 + <view style='height:70rpx'>
  110 + <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
  111 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_start}}</text>
  112 + </view>
  113 + <view style='height:70rpx'>
  114 + <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
  115 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
  116 + </view>
  117 + <view style='height:70rpx'>
  118 + <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
  119 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
  120 + </view>
  121 + <view style='height:70rpx'>
  122 + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
  123 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  124 + </view>
120 125 </view>
121   - </view>
122 126
123   - </view>
124   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type=='profession'||item.education_type=='major'}}">
125   - <view style='height:110rpx'>
126   - <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
127   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
128   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
129   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
130 127 </view>
131   - <view style='padding-right:30rpx'>
132   - <view class='divide_line_f5f5f5'></view>
133   - <!-- <view style='height:70rpx'>
  128 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type=='profession'||item.education_type=='major'}}">
  129 + <view style='height:110rpx'>
  130 + <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
  131 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  132 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  133 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
  134 + </view>
  135 + <view style='padding-right:30rpx'>
  136 + <view class='divide_line_f5f5f5'></view>
  137 + <!-- <view style='height:70rpx'>
134 138 <text class='text_999_28 ' style='line-height:70rpx'>继续教育情况：</text>
135 139 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type=='title'?"学历教育":"非学历教育"}}</text>
136 140 </view> -->
137   - <view style='height:70rpx'>
138   - <text class='text_999_28 ' style='line-height:70rpx'>继续教育类型：</text>
139   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type=='major'?"专业技术人员职业资格":"技能人员职业资格"}}</text>
140   - </view>
141   - <view style='height:70rpx'>
142   - <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
143   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
144   - </view>
145   - <view style='height:70rpx'>
146   - <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
147   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
148   - </view>
149   - <view style='height:70rpx'>
150   - <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
151   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
152   - </view>
153   - <view style='height:70rpx'>
154   - <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
155   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_authority}}</text>
156   - </view>
157   - <view style='height:70rpx'>
158   - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
159   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
160   - </view>
161   - <view style='height:70rpx'>
162   - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
163   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  141 + <view style='height:70rpx'>
  142 + <text class='text_999_28 ' style='line-height:70rpx'>继续教育类型：</text>
  143 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type=='major'?"专业技术人员职业资格":"技能人员职业资格"}}</text>
  144 + </view>
  145 + <view style='height:70rpx'>
  146 + <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
  147 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
  148 + </view>
  149 + <view style='height:70rpx'>
  150 + <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
  151 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
  152 + </view>
  153 + <view style='height:70rpx'>
  154 + <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
  155 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
  156 + </view>
  157 + <view style='height:70rpx'>
  158 + <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
  159 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_authority}}</text>
  160 + </view>
  161 + <view style='height:70rpx'>
  162 + <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
  163 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
  164 + </view>
  165 + <view style='height:70rpx'>
  166 + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
  167 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  168 + </view>
164 169 </view>
165 170 </view>
166   - </view>
167 171
168   - <view class='float_right' wx:if="{{item.status=='failed'}}">
169   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
170   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  172 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  173 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  174 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  175 + </view>
171 176 </view>
172 177 </view>
173   - </view>
174 178
175   - <view wx:if="{{cur_status=='support_duty'}}">
176   - <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}">
177   - <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
178   - <view style='height:110rpx'>
179   - <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
180   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
181   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
182   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
183   - </view>
184   - <view style='padding-right:30rpx'>
185   - <view class='divide_line_f5f5f5'></view>
186   - <view style='height:70rpx'>
187   - <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
188   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.supported_name}}</text>
189   - </view>
190   - <view style='height:70rpx'>
191   - <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
192   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
  179 + <view wx:if="{{cur_status=='support_duty'}}">
  180 + <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}">
  181 + <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
  182 + <view style='height:110rpx'>
  183 + <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
  184 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  185 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  186 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
193 187 </view>
194   - <!-- <view style='height:70rpx'>
  188 + <view style='padding-right:30rpx'>
  189 + <view class='divide_line_f5f5f5'></view>
  190 + <view style='height:70rpx'>
  191 + <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
  192 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.supported_name}}</text>
  193 + </view>
  194 + <view style='height:70rpx'>
  195 + <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
  196 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
  197 + </view>
  198 + <!-- <view style='height:70rpx'>
195 199 <text class='text_999_28 ' style='line-height:70rpx'>分摊比例：</text>
196 200 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
197 201 </view>
... ... @@ -203,249 +207,248 @@
203 207 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
204 208 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
205 209 </view> -->
206   - <view class='divide_line_f5f5f5'></view>
207   - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
208   - <view class='float_right' wx:if="{{item.status=='failed'}}">
209   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
210   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  210 + <view class='divide_line_f5f5f5'></view>
  211 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
  212 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  213 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  214 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  215 + </view>
  216 + </view>
  217 +
  218 + </view>
  219 + <view wx:if="{{item.co_supporters&&item.co_supporters.length>0}}">
  220 + <view wx:for="{{item.co_supporters}}" style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column' wx:for-item="itemdetail">
  221 + <view style='height:110rpx'>
  222 + <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
  223 + </view>
  224 + <view style='padding-right:30rpx'>
  225 + <view class='divide_line_f5f5f5'></view>
  226 + <view style='height:70rpx'>
  227 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人姓名：</text>
  228 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.co_supporter}}</text>
  229 + </view>
  230 + <view style='height:70rpx'>
  231 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
  232 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
  233 + </view>
  234 + <view style='height:70rpx'>
  235 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
  236 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_no}}</text>
  237 + </view>
  238 + <view style='height:70rpx'>
  239 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人出生日期：</text>
  240 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.birthday}}</text>
  241 + </view>
  242 + <view style='height:70rpx'>
  243 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人国籍：</text>
  244 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
  245 + </view>
  246 + <view style='height:70rpx'>
  247 + <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
  248 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
  249 + </view>
  250 + </view>
  251 + </view>
  252 + </view>
  253 + <view>
  254 + <!-- <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
  255 + <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
  256 + 添加
  257 + </view>
  258 + </view> -->
  259 + <view style='margin-left:30rpx' wx:if="{{!item.co_supporters||item.co_supporters.length<1}}">
  260 + <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
  261 + <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
211 262 </view>
212 263 </view>
  264 + </view>
  265 + </view>
213 266
  267 + <view wx:if="{{cur_status=='medical_fund'}}">
  268 + <view class='divide_line_f5f5f5'></view>
  269 + <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
  270 + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
  271 + <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{person_total_amount}}</text>
214 272 </view>
215   - <view wx:if="{{item.co_supporters&&item.co_supporters.length>0}}">
216   - <view wx:for="{{item.co_supporters}}" style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column' wx:for-item="itemdetail">
  273 + <view class='divide_line_f5f5f5'></view>
  274 + <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
  275 + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
  276 + <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
  277 + </view>
  278 + <view class='divide_line_f5f5f5'></view>
  279 + <view wx:for="{{additionInfo}}">
  280 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
217 281 <view style='height:110rpx'>
218   - <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
  282 + <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
  283 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  284 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  285 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
219 286 </view>
220 287 <view style='padding-right:30rpx'>
221 288 <view class='divide_line_f5f5f5'></view>
222 289 <view style='height:70rpx'>
223   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人姓名：</text>
224   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.co_supporter}}</text>
  290 + <text class='text_999_28 ' style='line-height:70rpx'>病人姓名：</text>
  291 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.name}}</text>
225 292 </view>
226 293 <view style='height:70rpx'>
227   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
  294 + <text class='text_999_28 ' style='line-height:70rpx'>病人证照类型：</text>
228 295 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
229 296 </view>
230 297 <view style='height:70rpx'>
231   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
232   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_no}}</text>
  298 + <text class='text_999_28 ' style='line-height:70rpx'>病人证照号码：</text>
  299 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.id_card_no}}</text>
233 300 </view>
234 301 <view style='height:70rpx'>
235   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人出生日期：</text>
236   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.birthday}}</text>
  302 + <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>
  303 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.patient_birthday}}</text>
237 304 </view>
238 305 <view style='height:70rpx'>
239   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人国籍：</text>
  306 + <text class='text_999_28 ' style='line-height:70rpx'>病人国籍：</text>
240 307 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
241 308 </view>
242 309 <view style='height:70rpx'>
243 310 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
244   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
  311 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
  312 + </view>
  313 + <view style='height:70rpx'>
  314 + <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额：</text>
  315 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.total_amount}}元</text>
  316 + </view>
  317 + <view style='height:70rpx'>
  318 + <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
  319 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
  320 + </view>
  321 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  322 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  323 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
245 324 </view>
246 325 </view>
247 326 </view>
248 327 </view>
249   - <view>
250   - <!-- <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
251   - <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
252   - 添加
253   - </view>
254   - </view> -->
255   - <view style='margin-left:30rpx' wx:if="{{!item.co_supporters||item.co_supporters.length<1}}">
256   - <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
257   - <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
258   - </view>
259   - </view>
260 328 </view>
261   - </view>
262 329
263   - <view wx:if="{{cur_status=='medical_fund'}}">
264   - <view class='divide_line_f5f5f5'></view>
265   - <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
266   - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
267   - <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{person_total_amount}}</text>
268   - </view>
269   - <view class='divide_line_f5f5f5'></view>
270   - <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
271   - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
272   - <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
273   - </view>
274   - <view class='divide_line_f5f5f5'></view>
275   - <view wx:for="{{additionInfo}}">
276   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
277   - <view style='height:110rpx'>
278   - <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
279   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
280   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
281   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
282   - </view>
283   - <view style='padding-right:30rpx'>
284   - <view class='divide_line_f5f5f5'></view>
285   - <view style='height:70rpx'>
286   - <text class='text_999_28 ' style='line-height:70rpx'>病人姓名：</text>
287   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.name}}</text>
288   - </view>
289   - <view style='height:70rpx'>
290   - <text class='text_999_28 ' style='line-height:70rpx'>病人证照类型：</text>
291   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
292   - </view>
293   - <view style='height:70rpx'>
294   - <text class='text_999_28 ' style='line-height:70rpx'>病人证照号码：</text>
295   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.id_card_no}}</text>
296   - </view>
297   - <view style='height:70rpx'>
298   - <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>
299   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.patient_birthday}}</text>
300   - </view>
301   - <view style='height:70rpx'>
302   - <text class='text_999_28 ' style='line-height:70rpx'>病人国籍：</text>
303   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
304   - </view>
305   - <view style='height:70rpx'>
306   - <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
307   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
308   - </view>
309   - <view style='height:70rpx'>
310   - <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额：</text>
311   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.total_amount}}元</text>
312   - </view>
313   - <view style='height:70rpx'>
314   - <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
315   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
316   - </view>
317   - <view class='float_right' wx:if="{{item.status=='failed'}}">
318   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
319   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  330 + <view wx:if="{{cur_status=='house_fund'}}">
  331 + <view wx:for="{{additionInfo}}">
  332 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  333 + <view style='height:110rpx'>
  334 + <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
  335 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  336 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  337 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
320 338 </view>
321   - </view>
322   - </view>
323   - </view>
324   - </view>
325   -
326   - <view wx:if="{{cur_status=='house_fund'}}">
327   - <view wx:for="{{additionInfo}}">
328   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
329   - <view style='height:110rpx'>
330   - <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
331   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
332   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
333   - <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
334   - </view>
335   - <view style='padding-right: 30rpx'>
336   - <view class='divide_line_f5f5f5'></view>
337   - <view style='display:flex;flex-direction:row'>
338   - <view wx:if="{{house_type=='house_fund_rent'}}">
339   - <view class='text_999_28 float_left' style='line-height:70rpx;width:248rpx;text-align:left;white-space:nowrap;'>租赁房屋坐落地址：</view>
340   - <view style='display:flex;flex-direction:column;max-width:392rpx;'>
341   - <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
342   - <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
  339 + <view style='padding-right: 30rpx'>
  340 + <view class='divide_line_f5f5f5'></view>
  341 + <view style='display:flex;flex-direction:row'>
  342 + <view wx:if="{{house_type=='house_fund_rent'}}">
  343 + <view class='text_999_28 float_left' style='line-height:70rpx;width:248rpx;text-align:left;white-space:nowrap;'>租赁房屋坐落地址：</view>
  344 + <view style='display:flex;flex-direction:column;max-width:392rpx;'>
  345 + <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
  346 + <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
  347 + </view>
343 348 </view>
344   - </view>
345   - <view wx:if="{{house_type=='house_fund_loan'}}">
346   - <text class='text_999_28 float_left' style='line-height:70rpx;width:192rpx;text-align:left;white-space:nowrap;'>房屋坐落地址：</text>
347   - <view style='display:flex;flex-direction:column;max-width:450rpx;'>
348   - <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
349   - <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
  349 + <view wx:if="{{house_type=='house_fund_loan'}}">
  350 + <text class='text_999_28 float_left' style='line-height:70rpx;width:192rpx;text-align:left;white-space:nowrap;'>房屋坐落地址：</text>
  351 + <view style='display:flex;flex-direction:column;max-width:450rpx;'>
  352 + <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
  353 + <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
  354 + </view>
350 355 </view>
351 356 </view>
352   - </view>
353   - <!-- <view wx:if="{{house_type=='house_fund_loan'}}">
  357 + <!-- <view wx:if="{{house_type=='house_fund_loan'}}">
354 358 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
355 359 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
356 360 <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
357 361 </view> -->
358   - <view style='height:70rpx'>
359   - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
360   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
361   - </view>
362   - <view style='height:70rpx'>
363   - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
364   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
365   - </view>
366   - <view class='divide_line_f5f5f5'></view>
367   - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
368   - <view class='float_right' wx:if="{{item.status=='failed'}}">
369   - <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
370   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  362 + <view style='height:70rpx'>
  363 + <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
  364 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
  365 + </view>
  366 + <view style='height:70rpx'>
  367 + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
  368 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
  369 + </view>
  370 + <view class='divide_line_f5f5f5'></view>
  371 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
  372 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  373 + <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  374 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  375 + </view>
371 376 </view>
372 377 </view>
373 378 </view>
374 379 </view>
  380 +
  381 + </view>
  382 + <view wx:if="{{!additionInfo||additionInfo.length<1}}">
  383 + <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
375 384 </view>
376 385
377 386 </view>
378   - <view wx:if="{{!additionInfo||additionInfo.length<1}}">
379   - <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
380   - </view>
381   -
382   - </view>
383 387
384   - <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
385   - <view class='btn_blue_radius' bindtap="goadd">
386   - <view class='text_white_34'>添加</view>
  388 + <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
  389 + <view class='btn_blue_radius' bindtap="goadd">
  390 + <view class='text_white_34'>添加</view>
  391 + </view>
387 392 </view>
388   - </view>
389   -
390   -</view>
391 393
  394 + </view>
392 395
393 396
394   -<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
395   -<!-- 申报说明 -->
396   -<view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
397   - <image class='modal_img' src="{{modal_images[cur_status]}}"></image>
398   - <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
399   - <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;'>
400   - <image style='width:30rpx;height:30rpx;' src='/images/close.png' bindtap='closeModalImg'></image>
  397 + <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
  398 + <!-- 申报说明 -->
  399 + <view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
  400 + <image class='modal_img' src="{{modal_images[cur_status]}}"></image>
  401 + <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
  402 + <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;'>
  403 + <image style='width:30rpx;height:30rpx;' src='/images/close.png' bindtap='closeModalImg'></image>
  404 + </view>
401 405 </view>
402   -</view>
403 406
404   -<!-- 扣除类型 -->
405   -<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
406   - <text class='text_modal_title'>请选择扣除方式</text>
407   - <view class='divide_line_f5f5f5'></view>
408   - <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
409   - <view wx:for="{{reducetypeData}}" wx:for-index="idx">
410   - <view wx:if="{{selected_reduceindex==idx}}">
411   - <text class='text_item_blue float_left'>{{item}}</text>
412   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
413   - </view>
414   - <view wx:else bindtap='goselect' id='{{idx}}'>
415   - <text class='text_item_black float_left'>{{item}}</text>
  407 + <!-- 扣除类型 -->
  408 + <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
  409 + <text class='text_modal_title'>请选择扣除方式</text>
  410 + <view class='divide_line_f5f5f5'></view>
  411 + <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  412 + <view wx:for="{{reducetypeData}}" wx:for-index="idx">
  413 + <view wx:if="{{selected_reduceindex==idx}}">
  414 + <text class='text_item_blue float_left'>{{item}}</text>
  415 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  416 + </view>
  417 + <view wx:else bindtap='goselect' id='{{idx}}'>
  418 + <text class='text_item_black float_left'>{{item}}</text>
  419 + </view>
  420 + <view class='divide_line_f5f5f5'></view>
416 421 </view>
417   - <view class='divide_line_f5f5f5'></view>
418 422 </view>
419   - </view>
420   - <view class='divide_line_f5f5f5'></view>
  423 + <view class='divide_line_f5f5f5'></view>
421 424
422   - <view style='width:100%;display: flex;'>
423   - <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
424   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
425   - <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  425 + <view style='width:100%;display: flex;'>
  426 + <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
  427 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  428 + <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  429 + </view>
426 430 </view>
427   -</view>
428 431
429   -<!-- 添加子女 老人 大病-->
430   -<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
431   - <text class='text_modal_title'>{{modalData.title}}</text>
432   - <view class='divide_line_f5f5f5'></view>
433   - <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
434   - <block wx:for="{{modalData.datas}}" wx:for-index="idx">
435   - <view wx:if="{{idx==selected_addindex}}">
436   - <text class='text_item_blue float_left'>{{item.name}}</text>
437   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
438   - </view>
439   - <view wx:else bindtap='goselect' id='{{idx}}'>
440   - <text class='text_item_black float_left'>{{item.name}}</text>
441   - </view>
442   - <view class='divide_line_f5f5f5'></view>
443   - </block>
444   - </view>
445   - <view class='divide_line_f5f5f5'></view>
446   - <view style='width:100%;display: flex;'>
447   - <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
448   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
449   - <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
450   - </view>
451   -</view>
\ No newline at end of file
  432 + <!-- 添加子女 老人 大病-->
  433 + <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
  434 + <text class='text_modal_title'>{{modalData.title}}</text>
  435 + <view class='divide_line_f5f5f5'></view>
  436 + <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  437 + <block wx:for="{{modalData.datas}}" wx:for-index="idx">
  438 + <view wx:if="{{idx==selected_addindex}}">
  439 + <text class='text_item_blue float_left'>{{item.name}}</text>
  440 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  441 + </view>
  442 + <view wx:else bindtap='goselect' id='{{idx}}'>
  443 + <text class='text_item_black float_left'>{{item.name}}</text>
  444 + </view>
  445 + <view class='divide_line_f5f5f5'></view>
  446 + </block>
  447 + </view>
  448 + <view class='divide_line_f5f5f5'></view>
  449 + <view style='width:100%;display: flex;'>
  450 + <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
  451 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  452 + <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
  453 + </view>
  454 + </view>
\ No newline at end of file
... ...
1 1 /* pages/main/addtionalreduce/childreneducate/childreneducate.wxss */
2 2
  3 +page {
  4 + background-color: #fcfcfc;
  5 +}
  6 +
3 7 .view_bg_wrap {
4 8 position: absolute;
5 9 display: flex;
... ...
... ... @@ -21,7 +21,7 @@
21 21 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
22 22 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
23 23 <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
24   - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>申报转向附加扣除，提交详细信息</text>
  24 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>申报专项附加扣除，提交详细信息</text>
25 25 </view>
26 26 <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
27 27 </view>
... ...
请 注册 或 登录 后发表评论