wangyu / naturalPersonTax · 提交

提交 3ad80b6e9a4ed4e1f361e3d74eb96a007df80dbe

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

优化

内嵌 并排对比
正在显示 11 个修改的文件 包含 171 行增加 和 154 行删除
... ... @@ -11,19 +11,8 @@ Page({
11 11 name: "",
12 12 nation: "",
13 13 id_card_no: "",
14   - commonbirthDate: {
15   - label: '共同赡养人出生日期',
16   - isrequre: true,
17   - bindtype: 'birthday',
18   - selected: '',
19   - isblack: 'true',
20   - placeholder: '请选择出生日期',
21   - mode: "date",
22   - fields: "day",
23   - start: '1970-01-01',
24   - end: '2018-01-01',
25   - onChange: 'onBirthdaySelect',
26   - },
  14 + birthday:"",
  15 + birthday_datelong: 0,
27 16 },
28 17
29 18 /**
... ... @@ -58,12 +47,22 @@ Page({
58 47 that.showtoast("姓名冲突")
59 48 return
60 49 }
61   - var commonbirthDate = that.data.commonbirthDate
62   - commonbirthDate.selected = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day
63   - commonbirthDate.datelong = Date.parse(new Date(commonbirthDate.selected)) / 1000
  50 + var birth_day
  51 + if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
  52 + birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
  53 + } else if (id_info.birthday.month > 9 && id_info.birthday.day < 10) {
  54 + birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-0' + id_info.birthday.day;
  55 + } else if (id_info.birthday.month < 10 && id_info.birthday.day > 9) {
  56 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
  57 + } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
  58 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  59 + }
  60 +
64 61 that.setData({
65 62 name: id_info.name,
66   - id_card_no: id_info.id_card_number
  63 + id_card_no: id_info.id_card_number,
  64 + birthday: birth_day,
  65 + birthday_datelong: Date.parse(new Date(birth_day)) / 1000
67 66 })
68 67 }
69 68 },
... ... @@ -106,7 +105,7 @@ Page({
106 105 "co_supporter": formdata.name,
107 106 "id_card_type": "1",
108 107 "id_card_no": formdata.id_card_no,
109   - "birthday": that.data.commonbirthDate.datelong,
  108 + "birthday": that.data.birthday_datelong,
110 109 "nation": "中国",
111 110 "relation_ship": "兄、弟、姐、妹"
112 111 },
... ... @@ -128,13 +127,11 @@ Page({
128 127 })
129 128 },
130 129
131   - onBirthdaySelect: function(e) {
  130 + bindDateChange:function(e){
132 131 console.log('picker发送选择改变，携带值为', e)
133   - var commonbirthDate = this.data.commonbirthDate
134   - commonbirthDate.selected = e.detail.value
135   - commonbirthDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
136 132 this.setData({
137   - commonbirthDate: commonbirthDate
  133 + birthday: e.detail.value,
  134 + birthday_datelong : Date.parse(new Date(e.detail.value)) / 1000
138 135 })
139 136 },
140 137
... ...
... ... @@ -12,37 +12,40 @@
12 12 <view class="divide_line"></view>
13 13 <view style='height:90rpx;padding:0 30rpx'>
14 14 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
15   - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证照类型</text>
  15 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照类型</text>
16 16 <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
17 17 </view>
18 18 <view class='divide_line'></view>
19 19 <view style='height:90rpx;padding:0 30rpx'>
20 20 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
21   - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证件号码</text>
  21 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证件号码</text>
22 22 <view>
23 23 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
24 24 <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}'></input>
25 25 </view>
26 26 </view>
27 27 <view class="divide_line"></view>
28   - <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
29   - <!-- <view style='height:90rpx;padding:0 30rpx'>
30   - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
31   - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人出生日期</text>
32   - <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>1949-09-19</text>
33   - </view> -->
34   - <view class="divide_line"></view>
35   - <view style='height:90rpx;padding:0 30rpx'>
36   - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
37   - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
38   - <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>中国</text>
39   - </view>
40   - <view class="divide_line"></view>
  28 + <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
41 29 <view style='height:90rpx;padding:0 30rpx'>
42 30 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
43   - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>与纳税人关系</text>
44   - <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>兄、弟、姐、妹</text>
  31 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人出生日期</text>
  32 + <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
  33 + <text class="text_777_30 float_right" style='line-height: 90rpx;'>{{birthday}}</text>
45 34 </view>
  35 + </picker>
  36 + <!-- <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> -->
  37 + <view class="divide_line"></view>
  38 + <view style='height:90rpx;padding:0 30rpx'>
  39 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  40 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
  41 + <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>中国</text>
  42 + </view>
  43 + <view class="divide_line"></view>
  44 + <view style='height:90rpx;padding:0 30rpx'>
  45 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  46 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>与纳税人关系</text>
  47 + <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>兄、弟、姐、妹</text>
  48 + </view>
46 49 <view class="divide_line"></view>
47 50 <view class="btn_bottom">
48 51 <button class="btn_bottom" formType="submit"> 保存</button>
... ...
... ... @@ -17,7 +17,7 @@
17 17 }
18 18
19 19 .input_wrap01 {
20   - width: 380rpx;
  20 + width: 350rpx;
21 21 height: 90rpx;
22 22 font-size: 30rpx;
23 23 color: #333;
... ...
... ... @@ -489,7 +489,7 @@ Page({
489 489 title: title,
490 490 })
491 491 this.initOSS()
492   - if (options.datas && options.datas.length) {
  492 + if (options.datas && options.datas.length>0) {
493 493 this.handleTransData(JSON.parse(options.datas))
494 494 }
495 495 },
... ... @@ -505,17 +505,6 @@ Page({
505 505 this.setData({
506 506 schoolCountryData: country_data
507 507 })
508   -
509   - var montharr = []
510   - var month_data = this.data.loandatelongData
511   - for (var i = 1; i < 100; i++) {
512   - montharr.push(i)
513   - }
514   - month_data.values = montharr
515   - this.setData({
516   - loandatelongData: month_data
517   - })
518   -
519 508 },
520 509
521 510 handleTransData: function(data) {
... ... @@ -556,6 +545,7 @@ Page({
556 545 studyenddate.selected = format.formatTime_date(data.education_end)
557 546 studyenddate.datelong = data.education_end
558 547 setData.studyenddate = studyenddate
  548 + console.log("studyenddate", studyenddate)
559 549 }
560 550 if (data.school_country && data.school_country.length) {
561 551 var schoolCountryData = this.data.schoolCountryData
... ... @@ -928,8 +918,8 @@ Page({
928 918 this.showToast('请选择子女出生日期')
929 919 return
930 920 }
931   - if (!formdata.percent || formdata.percent.length < 1) {
932   - this.showToast('请填写扣除分配比例')
  921 + if (!formdata.percent || formdata.percent < 1 || formdata.percent > 100) {
  922 + this.showToast('请填写合理分配比例')
933 923 return
934 924 } else {
935 925 newdata.percent = parseFloat(formdata.percent)
... ... @@ -1025,7 +1015,7 @@ Page({
1025 1015 }
1026 1016 //新增教育类型(区别教育类别)
1027 1017 // newdata.edu_type_lable = '1'
1028   - newdata.approval_date = this.data.applydate.selected
  1018 + newdata.approval_date = this.data.applydate.datelong
1029 1019 newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major'
1030 1020 }
1031 1021 break;
... ... @@ -1052,8 +1042,8 @@ Page({
1052 1042 this.showToast('请选择与纳税人关系')
1053 1043 return
1054 1044 }
1055   - if (!formdata.percentage || formdata.percentage.length < 1) {
1056   - this.showToast('请填写分摊比例')
  1045 + if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
  1046 + this.showToast('请填写合理分摊比例')
1057 1047 return
1058 1048 } else {
1059 1049 newdata.percentage = parseFloat(formdata.percentage)
... ... @@ -1127,7 +1117,7 @@ Page({
1127 1117 } else if (this.data.firstpaybackDate.selected.length < 1) {
1128 1118 this.showToast('请选择首次还款日期')
1129 1119 return
1130   - } else if (this.data.loandatelongData.selected.length < 1) {
  1120 + } else if (!formdata.loan_datelong || formdata.loan_datelong.length < 1) {
1131 1121 this.showToast('请选择贷款期限')
1132 1122 return
1133 1123 }
... ... @@ -1138,8 +1128,8 @@ Page({
1138 1128 newdata.loan_type = this.data.loantypeData.selected
1139 1129 newdata.loan_bank = this.data.bankInfo.selected
1140 1130 newdata.payback_date = this.data.firstpaybackDate.selected
1141   - newdata.loan_datelong = this.data.loandatelongData.selected
1142   - var request_loan_address = that.getLoanAddressRequest()
  1131 + // newdata.loan_datelong = this.data.loandatelongData.selected
  1132 + var request_loan_address = this.getLoanAddressRequest()
1143 1133 newdata.house_location = request_loan_address
1144 1134
1145 1135 } else if (this.data.house_type == "house_fund_rent") {
... ... @@ -1182,14 +1172,14 @@ Page({
1182 1172 }
1183 1173 newdata.lease_type = this.data.leasetypeData.selected
1184 1174 newdata.certification_type = this.data.identifytypeData.selected
1185   - newdata.rent_start = this.data.leasestartDate.selected
1186   - newdata.rent_end = this.data.leaseendDate.selected
  1175 + newdata.rent_start = this.data.leasestartDate.datelong
  1176 + newdata.rent_end = this.data.leaseendDate.datelong
1187 1177
1188   - var request_working_address = that.getWorkingAddressRequest()
  1178 + var request_working_address = this.getWorkingAddressRequest()
1189 1179 newdata.work_city = request_working_address
1190   - var request_rent_address = that.getRentAddressRequest()
  1180 + var request_rent_address = this.getRentAddressRequest()
1191 1181 newdata.house_address = request_rent_address
1192   - console.log('request_working_address', this.data.request_working_address)
  1182 + console.log('request_working_address', request_working_address)
1193 1183
1194 1184 }
1195 1185 if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
... ... @@ -1415,6 +1405,7 @@ Page({
1415 1405 case 'apply_date':
1416 1406 var apply_date = this.data.applydate
1417 1407 apply_date.selected = e.detail.value
  1408 + apply_date.datelong = Date.parse(new Date(e.detail.value)) / 1000,
1418 1409 console.log('apply_date', Date.parse(new Date(e.detail.value)))
1419 1410 this.setData({
1420 1411 applydate: apply_date
... ... @@ -1639,7 +1630,9 @@ Page({
1639 1630 "province_code": that.data.workingcityInfo.address_code[0],
1640 1631 "province": that.data.workingcityInfo.address_value[0],
1641 1632 "city_code": that.data.workingcityInfo.address_code[1],
1642   - "city": that.data.workingcityInfo.address_value[1]
  1633 + "city": that.data.workingcityInfo.address_value[1],
  1634 + "district_code": "",
  1635 + "district": ""
1643 1636 }
1644 1637 } else {
1645 1638 return that.data.workingcityInfo.requestdata
... ...
... ... @@ -230,7 +230,12 @@
230 230 <view class='divide_line_f5f5f5'></view>
231 231 <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
232 232 <view class='divide_line_f5f5f5'></view>
233   - <template is="picker_cell_normal" data="{{...loandatelongData}}" />
  233 + <!-- <template is="picker_cell_normal" data="{{...loandatelongData}}" /> -->
  234 + <view style='height:90rpx'>
  235 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  236 + <text class='text_black_30 float_left'>贷款期限(月数)</text>
  237 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款月数' name='loan_datelong' type='number'></input>
  238 + </view>
234 239 </view>
235 240
236 241 </view>
... ...
... ... @@ -47,29 +47,25 @@ Page({
47 47 var newdata = JSON.parse(data);
48 48 if (newdata ){
49 49 if (newdata.children_birthday && newdata.children_birthday > 0) {
50   - newdata.children_birthday_new = format.formatTime_date(newdata.children_birthday)
  50 + newdata.children_birthday = format.formatTime_date(newdata.children_birthday)
51 51 }
52 52 if (newdata.spouse_birthday && newdata.spouse_birthday > 0) {
53   - newdata.spouse_birthday_new = format.formatTime_date(newdata.spouse_birthday)
  53 + newdata.spouse_birthday = format.formatTime_date(newdata.spouse_birthday)
54 54 }
55 55 if (newdata.education_start && newdata.education_start > 0) {
56   - newdata.education_start_new = format.formatTime_date(newdata.education_start)
  56 + newdata.education_start = format.formatTime_date(newdata.education_start)
57 57 }
58 58 if (newdata.education_end && newdata.education_end > 0) {
59   - newdata.education_end_new = format.formatTime_date(newdata.education_end)
60   - }
61   -
62   - if (newdata.birthday && newdata.birthday > 0) {
63   - newdata.birthday_new = format.formatTime_date(newdata.birthday)
  59 + newdata.education_end = format.formatTime_date(newdata.education_end)
64 60 }
65 61 if (newdata.birthday && newdata.birthday > 0) {
66   - newdata.birthday_new = format.formatTime_date(newdata.birthday)
  62 + newdata.birthday = format.formatTime_date(newdata.birthday)
67 63 }
68 64 if (newdata.rent_start && newdata.rent_start > 0) {
69   - newdata.rent_start_new = format.formatTime_date(newdata.rent_start)
  65 + newdata.rent_start = format.formatTime_date(newdata.rent_start)
70 66 }
71 67 if (newdata.rent_end && newdata.rent_end > 0) {
72   - newdata.rent_end_new = format.formatTime_date(newdata.rent_end)
  68 + newdata.rent_end = format.formatTime_date(newdata.rent_end)
73 69 }
74 70 this.setData({
75 71 datas: newdata
... ...
... ... @@ -17,7 +17,7 @@
17 17 </view>
18 18 <view style='height:90rpx;width:100%'>
19 19 <text class='text_left'>出生日期</text>
20   - <text class='text_right_333'>{{datas.children_birthday_new}}</text>
  20 + <text class='text_right_333'>{{datas.children_birthday}}</text>
21 21 </view>
22 22 <view style='height:90rpx;width:100%'>
23 23 <text class='text_left'>国籍</text>
... ... @@ -38,15 +38,15 @@
38 38 </view>
39 39 <view style='height:90rpx;width:100%'>
40 40 <text class='text_left'>受教育期间起</text>
41   - <text class='text_right_333'>{{datas.education_start_new}}</text>
  41 + <text class='text_right_333'>{{datas.education_start}}</text>
42 42 </view>
43 43 <view style='height:90rpx;width:100%'>
44 44 <text class='text_left'>教育终止时间</text>
45   - <text class='text_right_333'>{{datas.education_end_new}}</text>
  45 + <text class='text_right_333'>{{datas.education_end}}</text>
46 46 </view>
47 47 <view style='height:90rpx;width:100%'>
48 48 <text class='text_left'>就读国家(地区)</text>
49   - <text class='text_right_333'>{{datas.school_country}}</text>
  49 + <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国(大陆)'}}</text>
50 50 </view>
51 51 <view style='height:90rpx;width:100%'>
52 52 <text class='text_left'>就读学校名称</text>
... ... @@ -79,7 +79,7 @@
79 79 </view>
80 80 <view style='height:90rpx;width:100%'>
81 81 <text class='text_left'>出生日期</text>
82   - <text class='text_right_333'>{{datas.spouse_birthday_new}}</text>
  82 + <text class='text_right_333'>{{datas.spouse_birthday}}</text>
83 83 </view>
84 84 <view style='height:90rpx;width:100%'>
85 85 <text class='text_left'>国籍</text>
... ... @@ -107,7 +107,7 @@
107 107 </view>
108 108 <view style='height:90rpx;width:100%'>
109 109 <text class='text_left'>被赡养人出生日期</text>
110   - <text class='text_right_333'>{{datas.birthday_new}}</text>
  110 + <text class='text_right_333'>{{datas.birthday}}</text>
111 111 </view>
112 112 <view style='height:90rpx;width:100%'>
113 113 <text class='text_left'>被赡养人国籍(地区)</text>
... ... @@ -179,11 +179,11 @@
179 179 </view>
180 180 <view style='height:90rpx;width:100%'>
181 181 <text class='text_left'>租赁期起</text>
182   - <text class='text_right_333'>{{datas.rent_start_new}}</text>
  182 + <text class='text_right_333'>{{datas.rent_start}}</text>
183 183 </view>
184 184 <view style='height:90rpx;width:100%'>
185 185 <text class='text_left'>租赁期止</text>
186   - <text class='text_right_333'>{{datas.rent_end_new}}</text>
  186 + <text class='text_right_333'>{{datas.rent_end}}</text>
187 187 </view>
188 188 </view>
189 189 <!-- //贷款 -->
... ... @@ -256,7 +256,7 @@
256 256 </view>
257 257 <view style='height:90rpx;width:100%'>
258 258 <text class='text_left'>出生日期</text>
259   - <text class='text_right_333'>{{datas.birthday_new}}</text>
  259 + <text class='text_right_333'>{{datas.birthday}}</text>
260 260 </view>
261 261 <view style='height:90rpx;width:100%'>
262 262 <text class='text_left'>国籍</text>
... ...
... ... @@ -5,8 +5,8 @@
5 5 <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01">
6 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
8   - <!-- <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}' > -->
9   - <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
  8 + <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
  9 + <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
10 10 立即申报
11 11 </view>
12 12 </view>
... ... @@ -21,34 +21,37 @@
21 21 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
22 22 <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>查看</text>
23 23 </view>
24   - <view wx:if="{{itemData.addition_category=='continuing_education'}}" style='padding:20rpx'>
25   - <view>
26   - <text style='font-size:28rpx;color:#666'>学历教育</text>
27   - <view style='width:100%;display:flex;flex-direction:row '>
28   - <view class='float_left' style='flex:1'>
29   - <text class='text_999_24 '>扣除方式</text>
30   - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
31   - </view>
32   - <view class='float_right' style='flex:1'>
33   - <text class='text_999_24 '>可扣除金额</text>
34   - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
  24 + <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items&&itemData.detail_items.length>0}}" style='padding:20rpx'>
  25 + <view wx:for="{{itemData.detail_items}}" wx:for-item="itemtypedetail">
  26 + <view wx:if="{{itemdetail.continue_education_type=='title'}}">
  27 + <text style='font-size:28rpx;color:#666'>学历教育</text>
  28 + <view style='width:100%;display:flex;flex-direction:row '>
  29 + <view class='float_left' style='flex:1'>
  30 + <text class='text_999_24 '>扣除方式</text>
  31 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemtypedetail.deduction_type]}}度</text>
  32 + </view>
  33 + <view class='float_right' style='flex:1'>
  34 + <text class='text_999_24 '>可扣除金额</text>
  35 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemtypedetail.deduction_amount}}/{{reducetype[itemtypedetail.deduction_type]}}</text>
  36 + </view>
35 37 </view>
36 38 </view>
37   - </view>
38   - <view>
39   - <text style='font-size:28rpx;color:#666'>非学历教育</text>
40   - <text style='font-size:28rpx;color:#666' hidden='{{itemData.count<2}}'>（{{itemData.count}}）</text>
41   - <view style='width:100%;display:flex;flex-direction:row '>
42   - <view class='float_left' style='flex:1'>
43   - <text class='text_999_24 '>扣除方式</text>
44   - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
45   - </view>
46   - <view class='float_right' style='flex:1'>
47   - <text class='text_999_24 '>可扣除金额</text>
48   - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
  39 + <view wx:if="{{itemdetail.continue_education_type=='major'||itemdetail.continue_education_type=='profession'}}">
  40 + <text style='font-size:28rpx;color:#666'>非学历教育</text>
  41 + <text style='font-size:28rpx;color:#666' hidden='{{itemtypedetail.detail_count<2}}'>（{{itemtypedetail.detail_count}}）</text>
  42 + <view style='width:100%;display:flex;flex-direction:row '>
  43 + <view class='float_left' style='flex:1'>
  44 + <text class='text_999_24 '>扣除方式</text>
  45 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemtypedetail.deduction_type]}}度</text>
  46 + </view>
  47 + <view class='float_right' style='flex:1'>
  48 + <text class='text_999_24 '>可扣除金额</text>
  49 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemtypedetail.deduction_amount}}/{{reducetype[itemtypedetail.deduction_type]}}</text>
  50 + </view>
49 51 </view>
50 52 </view>
51 53 </view>
  54 +
52 55 </view>
53 56 <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
54 57 <view class='float_left' style='flex:1'>
... ...
... ... @@ -81,7 +81,7 @@ Page({
81 81 var that = this
82 82 var housetype, housestatus
83 83 console.log("options", options);
84   - if (options.status == 'house_fund_rent') {
  84 + if (options.status == 'house_fund_rent') {
85 85 housetype = 'house_fund_rent'
86 86 housestatus = 'house_fund'
87 87 } else if (options.status == 'house_fund_loan') {
... ... @@ -146,6 +146,21 @@ Page({
146 146 if (newdata[i].education_end && newdata[i].education_end > 0) {
147 147 newdata[i].education_end = format.formatTime_date(newdata[i].education_end)
148 148 }
  149 + if (newdata[i].patient_birthday && newdata[i].patient_birthday > 0) {
  150 + newdata[i].patient_birthday = format.formatTime_date(newdata[i].patient_birthday)
  151 + }
  152 + if (newdata[i].house_address){
  153 + if (newdata[i].house_address.province == newdata[i].house_address.city){
  154 + newdata[i].house_address_new = newdata[i].house_address.city + newdata[i].house_address.district
  155 + }else{
  156 + newdata[i].house_address_new = newdata[i].house_address.province + newdata[i].house_address.city + newdata[i].house_address.district
  157 + }
  158 + }
  159 + }
  160 + if(this.data.house_type==''){
  161 + this.setData({
  162 + house_type: newdata[0].type ? newdata[0].type:""
  163 + })
149 164 }
150 165
151 166 this.setData({
... ... @@ -209,7 +224,7 @@ Page({
209 224 console.log("goedit", e)
210 225 if (this.data.additionInfo && this.data.additionInfo.length > 0) {
211 226 wx.navigateTo({
212   - url: '../addextrainfo/addextrainfo?datas=' + '' + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
  227 + 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',
213 228 })
214 229 }
215 230 },
... ... @@ -351,12 +366,16 @@ Page({
351 366 })
352 367 },
353 368
354   - modalLeft: function() { //modal(添加)
  369 + modalLeft: function(e) { //modal(添加)
355 370 this.setData({
356 371 showModal_addtype: false
357 372 })
  373 + var senddata = ""
  374 + if (this.data.cur_status == 'support_duty' ){
  375 + senddata = JSON.stringify(this.data.additionInfo[0]);
  376 + }
358 377 wx.navigateTo({
359   - url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + "" + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
  378 + url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
360 379 })
361 380 },
362 381
... ...
... ... @@ -52,38 +52,30 @@
52 52
53 53 <view wx:if="{{cur_status=='continuing_education'}}">
54 54 <view wx:for="{{additionInfo}}">
55   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  55 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type==''||item.education_type=='title'}}">
56 56 <view style='height:110rpx'>
57   - <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
  57 + <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
58 58 <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
59 59 <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
60 60 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
61 61 </view>
62   - <view style='padding-right:30rpx'>
  62 + <view style='padding-right:right'>
63 63 <view class='divide_line_f5f5f5'></view>
64 64 <view style='height:70rpx'>
65 65 <text class='text_999_28 ' style='line-height:70rpx'>继续教育情况：</text>
66   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
67   - </view>
68   - <view style='height:70rpx'>
69   - <text class='text_999_28 ' style='line-height:70rpx'>继续教育类型：</text>
70 66 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
71 67 </view>
72 68 <view style='height:70rpx'>
73   - <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
74   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{2018-09-09}}</text>
75   - </view>
76   - <view style='height:70rpx'>
77   - <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
78   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
  69 + <text class='text_999_28 ' style='line-height:70rpx'>教育阶段：</text>
  70 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
79 71 </view>
80 72 <view style='height:70rpx'>
81   - <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
82   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
  73 + <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
  74 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
83 75 </view>
84 76 <view style='height:70rpx'>
85   - <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
86   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
  77 + <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
  78 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
87 79 </view>
88 80 <view style='height:70rpx'>
89 81 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
... ... @@ -94,31 +86,40 @@
94 86 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
95 87 </view>
96 88 </view>
  89 +
97 90 </view>
98   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  91 + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column' wx:if="{{item.education_type=='profession'||item.education_type=='major'}}">
99 92 <view style='height:110rpx'>
100   - <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
  93 + <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
101 94 <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
102 95 <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
103 96 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
104 97 </view>
105   - <view style='padding-right:right'>
  98 + <view style='padding-right:30rpx'>
106 99 <view class='divide_line_f5f5f5'></view>
107 100 <view style='height:70rpx'>
108 101 <text class='text_999_28 ' style='line-height:70rpx'>继续教育情况：</text>
  102 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
  103 + </view>
  104 + <view style='height:70rpx'>
  105 + <text class='text_999_28 ' style='line-height:70rpx'>继续教育类型：</text>
109 106 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
110 107 </view>
111 108 <view style='height:70rpx'>
112   - <text class='text_999_28 ' style='line-height:70rpx'>教育阶段：</text>
113   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
  109 + <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
  110 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{2018-09-09}}</text>
114 111 </view>
115 112 <view style='height:70rpx'>
116   - <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
117   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
  113 + <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
  114 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
118 115 </view>
119 116 <view style='height:70rpx'>
120   - <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
121   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  117 + <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
  118 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
  119 + </view>
  120 + <view style='height:70rpx'>
  121 + <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
  122 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
122 123 </view>
123 124 <view style='height:70rpx'>
124 125 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
... ... @@ -129,8 +130,8 @@
129 130 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
130 131 </view>
131 132 </view>
132   -
133 133 </view>
  134 +
134 135 <view class='float_right' wx:if="{{item.status=='failed'}}">
135 136 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
136 137 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
... ... @@ -213,19 +214,19 @@
213 214 <view class='divide_line_f5f5f5'></view>
214 215 <view style='height:70rpx'>
215 216 <text class='text_999_28 ' style='line-height:70rpx'>病人姓名：</text>
216   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  217 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.name}}</text>
217 218 </view>
218 219 <view style='height:70rpx'>
219 220 <text class='text_999_28 ' style='line-height:70rpx'>病人证照类型：</text>
220   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
  221 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text>
221 222 </view>
222 223 <view style='height:70rpx'>
223 224 <text class='text_999_28 ' style='line-height:70rpx'>病人证照号码：</text>
224   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  225 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.id_card_no}}</text>
225 226 </view>
226 227 <view style='height:70rpx'>
227 228 <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>
228   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  229 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
229 230 </view>
230 231 <view style='height:70rpx'>
231 232 <text class='text_999_28 ' style='line-height:70rpx'>病人国籍：</text>
... ... @@ -233,15 +234,15 @@
233 234 </view>
234 235 <view style='height:70rpx'>
235 236 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
236   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
  237 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
237 238 </view>
238 239 <view style='height:70rpx'>
239 240 <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额：</text>
240   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
  241 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.total_amount}}元</text>
241 242 </view>
242 243 <view style='height:70rpx'>
243 244 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
244   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
  245 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
245 246 </view>
246 247 <view class='float_right' wx:if="{{item.status!='failed'}}">
247 248 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
... ... @@ -265,12 +266,12 @@
265 266 <view class='divide_line_f5f5f5'></view>
266 267 <view wx:if="{{house_type=='house_fund_rent'}}">
267 268 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
268   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
  269 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
269 270 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
270 271 </view>
271 272 <view wx:if="{{house_type=='house_fund_loan'}}">
272 273 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
273   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
  274 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
274 275 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
275 276 </view>
276 277 <view style='height:70rpx'>
... ...
... ... @@ -44,7 +44,7 @@ Page({
44 44 success: function (res) {
45 45 console.log("taxconfirm", res)
46 46 if (res.data && (res.data.status == '1' || res.data.status == '2')) { //未完善
47   - // that.showModal(res.data)
  47 + that.showModal(res.data)
48 48 }
49 49 }
50 50 })
... ...
请 注册 或 登录 后发表评论