wangyu / naturalPersonTax · 提交

提交 fbd3de4c9e8fa85c2468fa9bfcf5f9ff284a5332

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

优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 207 行增加 和 125 行删除
... ... @@ -8,11 +8,13 @@ Page({
8 8 * Page initial data
9 9 */
10 10 data: {
11   - support_duty_id: "",
  11 + legal_entity_id: "",
  12 + supporter_id:"",
12 13 name: "",
13 14 nation: "",
14 15 id_card_no: "",
15 16 birthday:"",
  17 + datas:"",
16 18 birthday_datelong: -1,
17 19 },
18 20
... ... @@ -21,9 +23,24 @@ Page({
21 23 */
22 24 onLoad: function(options) {
23 25 console.log("onLoad", options)
24   - this.setData({
25   - support_duty_id: options.id
26   - })
  26 + if (options.id){
  27 + this.setData({
  28 + legal_entity_id: options.id,
  29 + })
  30 + }
  31 +
  32 + if (options.datas && JSON.parse(options.datas)){
  33 + var curdata = JSON.parse(options.datas)
  34 + this.setData({
  35 + datas: curdata,
  36 + supporter_id: curdata.id,
  37 + name: curdata.co_supporter,
  38 + id_card_no: curdata.id_card_no,
  39 + birthday: curdata.birthday,
  40 + birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000
  41 + })
  42 + }
  43 +
27 44 },
28 45
29 46 /**
... ... @@ -109,7 +126,8 @@ Page({
109 126 wx.request({
110 127 url: baseUrl + 'persontax/v1/co-supporters',
111 128 data: {
112   - "support_duty_id": that.data.support_duty_id,
  129 + "id": that.data.supporter_id,
  130 + "legal_entity_id": that.data.legal_entity_id,
113 131 "co_supporter": formdata.name,
114 132 "id_card_type": "1",
115 133 "id_card_no": formdata.id_card_no,
... ...
... ... @@ -36,12 +36,14 @@ Page({
36 36 var pages = getCurrentPages();
37 37 //获取上一个页面的所有的方法和data中的数据
38 38 var lastpage = pages[pages.length - 2]
  39 + var info = options.datas ? JSON.parse(options.datas) : {}
  40 +
39 41 console.log("lastpage", lastpage.data);
40 42 // this.handleData(options.datas)
41 43 this.setData({
42 44 cur_status: options.status,
43 45 house_type: lastpage.data.house_type,
44   - datas: options.datas?JSON.parse(options.datas):{}
  46 + datas: info
45 47 })
46 48 wx.setNavigationBarTitle({
47 49 title: that.data.additiontitle[options.status],
... ...
... ... @@ -199,7 +199,7 @@
199 199 <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
200 200 <text class='text_right_333' style='line-height:40rpx;'>{{datas.house_detail_address}}</text>
201 201 </view>
202   - <view style='height:90rpx;width:100%;clear:both;'>
  202 + <view wx:if="{{datas.rent_contract_no&&datas.rent_contract_no.length>0}}" style='height:90rpx;width:100%;clear:both;'>
203 203 <text class='text_left'>租赁合同编号</text>
204 204 <text class='text_right_333'>{{datas.rent_contract_no}}</text>
205 205 </view>
... ... @@ -225,7 +225,7 @@
225 225 <!-- //贷款 -->
226 226 <view wx:if="{{house_type=='house_fund_loan'}}">
227 227 <view style='padding:0 30rpx'>
228   - <view style='height:90rpx;width:100%;clear:both;'>
  228 + <view wx:if="{{datas.house_address_new&&datas.house_address_new.length>0}}" style='height:90rpx;width:100%;clear:both;'>
229 229 <text class='text_left'>房屋坐落地址</text>
230 230 <text class='text_right_333'>{{datas.house_address_new}}</text>
231 231 </view>
... ... @@ -241,7 +241,7 @@
241 241 <text class='text_right_333'>{{datas.certification_no}}</text>
242 242 </view>
243 243 <view style='height:90rpx;width:100%;clear:both;'>
244   - <text class='text_left'>是否首套婚前贷款且婚后各自扣除</text>
  244 + <text class='text_left'>是否首套婚前贷款且婚后分别扣除50%</text>
245 245 <text class='text_right_333'>{{datas.loan_before_marry=='y'?"是":"否"}}</text>
246 246 </view>
247 247 <view style='height:90rpx;width:100%;clear:both;'>
... ...
... ... @@ -25,7 +25,7 @@
25 25 <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
26 26 <view wx:if="{{index==0}}">
27 27 <text wx:if='{{itemData.majors.length>1}}' style='font-size:28rpx;color:#666'>学历(学位)继续教育 ({{itemData.majors.length}})</text>
28   - <text wx:else style='font-size:28rpx;color:#666'>学历教育</text>
  28 + <text wx:else style='font-size:28rpx;color:#666'>学历(学位)继续教育</text>
29 29 <view style='width:100%;display:flex;flex-direction:row '>
30 30 <view class='float_left' style='flex:1'>
31 31 <text class='text_999_24 '>扣除方式</text>
... ... @@ -41,7 +41,7 @@
41 41 <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">
42 42 <view wx:if="{{index==0}}">
43 43 <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>职业资格继续教育 ({{itemData.professions.length}})</text>
44   - <text wx:else style='font-size:28rpx;color:#666'>非学历教育</text>
  44 + <text wx:else style='font-size:28rpx;color:#666'>职业资格继续教育</text>
45 45 <text style='font-size:28rpx;color:#666' hidden='{{profession.detail_count<2}}'>（{{profession.detail_count}}）</text>
46 46 <view style='width:100%;display:flex;flex-direction:row '>
47 47 <view class='float_left' style='flex:1'>
... ...
... ... @@ -185,17 +185,17 @@ Page({
185 185 var titlelist = newdata[0].title_items
186 186 for (var i = 0; i < titlelist.length > 0; i++) {
187 187 if (titlelist[i].education_start) {
188   - titlelist[i].education_start = this.formatDate(titlelist[i].education_start)
  188 + titlelist[i].education_start = this.formatDate(titlelist[i].education_start).substring(0, 7)
189 189 }
190 190 if (titlelist[i].education_end) {
191   - titlelist[i].education_end = this.formatDate(titlelist[i].education_end)
  191 + titlelist[i].education_end = this.formatDate(titlelist[i].education_end).substring(0, 7)
192 192 }
193 193 }
194 194 // this.setData({
195 195 // issinglechildData: issinglechild_Data,
196 196 // shareMethodData: shareMethod_Data
197 197 // })
198   - } else {
  198 + } else if (that.data.cur_status == "support_duty") {
199 199 var issinglechild_Data = this.data.issinglechildData;
200 200 issinglechild_Data.disabled = true;
201 201 issinglechild_Data.selected = data.is_single == 'y' ? "是" : "否";
... ... @@ -204,12 +204,33 @@ Page({
204 204 shareMethod_Data.disabled = true;
205 205 shareMethod_Data.selected = data.share_method ? data.share_method : "";
206 206
  207 + var supportlist = newdata[0].support_duties
  208 + if (supportlist && supportlist.length > 0) {
  209 + for (var i = 0; i < supportlist.length; i++) {
  210 + if (supportlist[i].birthday) {
  211 + supportlist[i].birthday = this.formatDate(supportlist[i].birthday)
  212 + }
  213 + }
  214 + }
  215 + var cosupportlist = newdata[0].co_supporters
  216 + if (cosupportlist && cosupportlist.length > 0) {
  217 + for (var i = 0; i < cosupportlist.length; i++) {
  218 + if (cosupportlist[i].birthday) {
  219 + cosupportlist[i].birthday = this.formatDate(cosupportlist[i].birthday)
  220 + }
  221 + }
  222 + }
  223 + this.setData({
  224 + issinglechildData: issinglechild_Data,
  225 + shareMethodData: shareMethod_Data,
  226 + })
  227 + } else {
207 228 for (var i = 0; i < newdata.length; i++) {
208 229 if (newdata[i].education_start) {
209   - newdata[i].education_start = this.formatDate(newdata[i].education_start)
  230 + newdata[i].education_start = this.formatDate(newdata[i].education_start).substring(0, 7)
210 231 }
211 232 if (newdata[i].education_end) {
212   - newdata[i].education_end = this.formatDate(newdata[i].education_end)
  233 + newdata[i].education_end = this.formatDate(newdata[i].education_end).substring(0, 7)
213 234 }
214 235 if (newdata[i].patient_birthday) {
215 236 newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday)
... ... @@ -274,15 +295,11 @@ Page({
274 295 housetype_new = newdata[0].type == 'loan' ? "house_fund_loan" : "house_fund_rent"
275 296 }
276 297 console.log("housetype_new", housetype_new)
277   -
  298 +
278 299 this.setData({
279   - issinglechildData: issinglechild_Data,
280   - shareMethodData: shareMethod_Data,
281 300 house_type: housetype_new,
282 301 })
283 302 }
284   -
285   -
286 303 this.setData({
287 304 reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
288 305 input_disable: true,
... ... @@ -294,12 +311,16 @@ Page({
294 311 })
295 312 console.log("newdata", newdata)
296 313 wx.hideLoading()
  314 + }else{
  315 + this.setData({
  316 + additionInfo: newdata
  317 + })
297 318 }
298 319 },
299 320
300 321 goaddSupporter: function() {
301 322 wx.navigateTo({
302   - url: '../adddupporters/adddupporters?id=' + this.data.additionInfo[0].id,
  323 + url: '../adddupporters/adddupporters?id='+this.data.legal_entity_id,
303 324 })
304 325
305 326 },
... ... @@ -319,22 +340,49 @@ Page({
319 340
320 341 showdetail: function(e) {
321 342 if (this.data.additionInfo && this.data.additionInfo.length > 0) {
322   - console.log("showdetail", JSON.stringify(this.data.additionInfo[e.currentTarget.id]))
  343 + var info
  344 + if (this.data.cur_status == "support_duty") {
  345 + info = JSON.stringify(this.data.additionInfo[0].support_duties[e.currentTarget.id])
  346 + } else {
  347 + info = JSON.stringify(this.data.additionInfo[e.currentTarget.id])
  348 + }
  349 + console.log("showdetail", info)
  350 +
323 351 wx.navigateTo({
324   - url: '../additiondetail/additiondetail?datas=' +
325   - JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + "&status=" + this.data.cur_status,
  352 + url: '../additiondetail/additiondetail?datas=' + info + "&status=" + this.data.cur_status,
326 353 })
327 354 }
328 355 },
329 356
330 357 godelete: function(e) { //删除
331 358 var that = this;
  359 + console.log("godelete", e)
  360 + var new_id
  361 + var statustype = this.data.cur_status
  362 + if (this.data.cur_status == "continuing_education") {
  363 + if (e.currentTarget.id.indexOf('title') != -1) {
  364 + new_id = this.data.additionInfo[0].title_items[e.currentTarget.id.replace('title', '')].id
  365 + }
  366 + if (e.currentTarget.id.indexOf('profession') != -1) {
  367 + new_id = this.data.additionInfo[0].profession_items[e.currentTarget.id.replace('profession', '')].id
  368 + }
  369 + } else if (this.data.cur_status == "support_duty") {
  370 + if (e.currentTarget.id.indexOf('support_duty') != -1) {
  371 + new_id = this.data.additionInfo[0].support_duties[e.currentTarget.id.replace('support_duty', '')].id
  372 + }
  373 + if (e.currentTarget.id.indexOf('co_supporter') != -1) {
  374 + statustype = "co_supporter"
  375 + new_id = this.data.additionInfo[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')].id
  376 + }
  377 + } else {
  378 + new_id = this.data.additionInfo[e.currentTarget.id].id
  379 + }
332 380 var Authorization = getApp().globalData.Authorization;
333 381 wx.request({
334 382 url: baseUrl + 'persontax/v1/op/delete',
335 383 data: {
336   - item_type: that.data.cur_status,
337   - id: that.data.legal_entity_id
  384 + item_type: statustype,
  385 + id: new_id
338 386 },
339 387 header: {
340 388 'content-type': 'application/json',
... ... @@ -342,19 +390,38 @@ Page({
342 390 },
343 391 method: "POST",
344 392 success: function(res) {
345   - if (res && res.data) {
346   - console.log("res", res)
347   -
348   - }
  393 + that.getAdditionInfo()
349 394 }
350 395 })
351 396 },
352 397
353 398 goedit: function(e) { //编辑
354 399 console.log("goedit", e)
  400 + var new_info
  401 + if (this.data.cur_status == "continuing_education") {
  402 + if (e.currentTarget.id.indexOf('title') != -1) {
  403 + new_info = this.data.additionInfo[0].title_items[e.currentTarget.id.replace('title', '')]
  404 + }
  405 + if (e.currentTarget.id.indexOf('profession') != -1) {
  406 + new_info = this.data.additionInfo[0].profession_items[e.currentTarget.id.replace('profession', '')]
  407 + }
  408 + } else if (this.data.cur_status == "support_duty") {
  409 + if (e.currentTarget.id.indexOf('support_duty') != -1) {
  410 + new_info = this.data.additionInfo[0].support_duties[e.currentTarget.id.replace('support_duty', '')]
  411 + }
  412 + if (e.currentTarget.id.indexOf('co_supporter') != -1) {
  413 + new_info = this.data.additionInfo[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')]
  414 + wx.navigateTo({
  415 + url: '../adddupporters/adddupporters?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + "&id="+this.data.legal_entity_id ,
  416 + })
  417 + return;
  418 + }
  419 + } else {
  420 + new_info = this.data.additionInfo[e.currentTarget.id]
  421 + }
355 422 if (this.data.additionInfo && this.data.additionInfo.length > 0) {
356 423 wx.navigateTo({
357   - url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
  424 + url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
358 425 })
359 426 }
360 427 },
... ... @@ -503,7 +570,7 @@ Page({
503 570 this.setData({
504 571 showModal_img: false,
505 572 showModal_reducetype: false,
506   - showModal_addtype:false
  573 + showModal_addtype: false
507 574 })
508 575 },
509 576
... ...
... ... @@ -77,8 +77,8 @@
77 77 </view>
78 78 <view class='divide_line_f5f5f5'></view>
79 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>
  80 + <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  81 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{index}}" bindtap='godelete'>删除</text>
82 82 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
83 83 </view>
84 84 </view>
... ... @@ -92,15 +92,16 @@
92 92 <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
93 93 <view style='height:110rpx'>
94 94 <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
  95 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  96 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  97 + <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
95 98 </view>
96 99 <view wx:for="{{additionInfo[0].title_items}}">
97 100 <view style='padding-right:right'>
98 101 <view style="background:#f5f5f5;height:2rpx;width:94%"></view>
99 102 <view>
100 103 <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>
  104 +
104 105 </view>
105 106 <view style='height:70rpx'>
106 107 <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
... ... @@ -110,6 +111,10 @@
110 111 <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
111 112 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
112 113 </view>
  114 + <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  115 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='goedit'>编辑</text>
  116 + <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='godelete'>删除</text>
  117 + </view>
113 118 </view>
114 119 </view>
115 120 <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
... ... @@ -121,10 +126,6 @@
121 126 <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
122 127 <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 128 </view>
124   - <view wx:if="{{item.status=='failed'}}">
125   - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
126   - <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
127   - </view>
128 129 </view>
129 130 </view>
130 131 <!-- 非学历 -->
... ... @@ -132,6 +133,9 @@
132 133 <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
133 134 <view style='height:110rpx'>
134 135 <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
  136 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  137 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  138 + <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
135 139 </view>
136 140 <view wx:for="{{additionInfo[0].profession_items}}">
137 141 <view style='padding-right:right'>
... ... @@ -139,11 +143,9 @@
139 143 <view>
140 144 <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
141 145 <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>
  146 +
145 147 </view>
146   - <view >
  148 + <view>
147 149 <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期：</text>
148 150 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
149 151 </view>
... ... @@ -159,6 +161,10 @@
159 161 <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
160 162 <view class='float_right' style='font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:70rpx;max-width:500rpx'>{{item.certification_authority}}</view>
161 163 </view>
  164 + <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  165 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text>
  166 + <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='godelete'>删除</text>
  167 + </view>
162 168 </view>
163 169 </view>
164 170 <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
... ... @@ -170,97 +176,92 @@
170 176 <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
171 177 <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 178 </view>
173   - <view wx:if="{{item.status=='failed'}}">
174   - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
175   - <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
176   - </view>
  179 +
177 180 </view>
178 181 </view>
179 182 </view>
180 183
181 184 <view wx:if="{{cur_status=='support_duty'}}">
182   - <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}">
  185 + <view wx:if="{{additionInfo[0].support_duties&&additionInfo[0].support_duties.length>0}}">
183 186 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
184 187 <view style='height:110rpx'>
185 188 <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>
195   - </view>
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'>
201   - <text class='text_999_28 ' style='line-height:70rpx'>分摊比例：</text>
202   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
203   - </view>
204   - <view style='height:70rpx'>
205   - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
206   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
207   - </view>
208   - <view style='height:70rpx'>
209   - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
210   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
211   - </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>
217   - </view>
  189 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  190 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  191 + <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
218 192 </view>
  193 + <view wx:for="{{additionInfo[0].support_duties}}">
219 194
220   - </view>
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">
223   - <view style='height:110rpx'>
224   - <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
225   - </view>
226 195 <view style='padding-right:30rpx'>
227 196 <view class='divide_line_f5f5f5'></view>
228 197 <view style='height:70rpx'>
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>
231   - </view>
232   - <view style='height:70rpx'>
233   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
234   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
235   - </view>
236   - <view style='height:70rpx'>
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>
  198 + <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
  199 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.supported_name}}</text>
239 200 </view>
240 201 <view style='height:70rpx'>
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>
  202 + <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
  203 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
243 204 </view>
244   - <view style='height:70rpx'>
245   - <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人国籍：</text>
246   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
  205 + <view class='divide_line_f5f5f5'></view>
  206 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
  207 + <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  208 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'support_duty'+index}}" bindtap='godelete'>删除</text>
  209 + <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'support_duty'+index}}" bindtap='goedit'>编辑</text>
247 210 </view>
248   - <view style='height:70rpx'>
249   - <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
250   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
  211 + </view>
  212 + </view>
  213 + </view>
  214 + <view style='background:#FFF;padding:30rpx'>
  215 + <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id="{{index}}" bindtap='goadd'>
  216 + 添加
  217 + </view>
  218 + </view>
  219 + <view wx:if="{{additionInfo[0].co_supporters&&additionInfo[0].co_supporters.length>0}}">
  220 + <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
  221 + <view style='height:110rpx'>
  222 + <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
  223 + </view>
  224 + <view wx:for="{{additionInfo[0].co_supporters}}" wx:for-item="itemdetail">
  225 +
  226 + <view style='padding-right:30rpx'>
  227 + <view class='divide_line_f5f5f5'></view>
  228 + <view style='height:70rpx'>
  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>
  231 + </view>
  232 + <view style='height:70rpx'>
  233 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
  234 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
  235 + </view>
  236 + <view style='height:70rpx'>
  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>
  239 + </view>
  240 + <view style='height:70rpx'>
  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>
  243 + </view>
  244 + <view style='height:70rpx'>
  245 + <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人国籍：</text>
  246 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
  247 + </view>
  248 + <view style='height:70rpx'>
  249 + <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
  250 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
  251 + </view>
  252 + <view class='float_right'>
  253 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
  254 + <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
  255 + </view>
251 256 </view>
252 257 </view>
253 258 </view>
  259 +
254 260 </view>
255 261 <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>
  262 + <view style='margin-left:30rpx' wx:if="{{issinglechildData.selected!='是'}}">
  263 + <!-- <text class='text_999_28'>您还没有添加继续共同赡养人，</text> -->
  264 + <text class='text_blue_28' bindtap='goaddSupporter'>添加共同赡养人</text>
264 265 </view>
265 266 </view>
266 267 </view>
... ... @@ -320,7 +321,7 @@
320 321 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
321 322 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
322 323 </view>
323   - <view class='float_right' wx:if="{{item.status=='failed'}}">
  324 + <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
324 325 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
325 326 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
326 327 </view>
... ... @@ -356,11 +357,6 @@
356 357 </view>
357 358 </view>
358 359 </view>
359   - <!-- <view wx:if="{{house_type=='house_fund_loan'}}">
360   - <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
361   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
362   - <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
363   - </view> -->
364 360 <view style='height:70rpx'>
365 361 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
366 362 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
... ... @@ -371,7 +367,7 @@
371 367 </view>
372 368 <view class='divide_line_f5f5f5'></view>
373 369 <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'}}">
  370 + <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
375 371 <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
376 372 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
377 373 </view>
... ... @@ -379,14 +375,13 @@
379 375 </view>
380 376 </view>
381 377 </view>
382   -
383 378 </view>
384 379 <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}">
385 380 <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
386 381 </view>
387 382 </view>
388 383
389   - <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
  384 + <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}">
390 385 <view class='btn_blue_radius' bindtap="goadd">
391 386 <view class='text_white_34'>添加</view>
392 387 </view>
... ... @@ -398,7 +393,7 @@
398 393 <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
399 394 <!-- 申报说明 -->
400 395 <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]}}" ></image>
  396 + <image class='modal_img' src="{{modal_images[cur_status]}}"></image>
402 397 <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
403 398 <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 399 <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
... ...
请 注册 或 登录 后发表评论