wangyu / naturalPersonTax · 提交

提交 c39cc9f7632feee9dc1566d2626d32bf674b8798

作者 wangyu
2 个父辈 29cf381e 53d181ac
构建： 未知
dev_wy ... dev2.0 dev_py dev_无非居民 天津中天 机器人 机器人_py 机器人dev 海峡 海峡new 苏州英格玛

Merge branch 'dev_wy' into dev2.0

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