wangyu / naturalPersonTax · 提交

提交 365ce229c8d80e25c546bbe26f2b9f5d4ad7860f

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

优化

内嵌 并排对比
正在显示 8 个修改的文件 包含 327 行增加 和 195 行删除
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证照类型</text> 13 <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证照类型</text>
14 <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text> 14 <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
15 </view> 15 </view>
16 - <view class='divide_line_f5f5f5'></view> 16 + <view class='divide_line'></view>
17 <view style='height:90rpx;padding:0 30rpx'> 17 <view style='height:90rpx;padding:0 30rpx'>
18 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 18 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
19 <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证件号码</text> 19 <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证件号码</text>
@@ -23,6 +23,24 @@ @@ -23,6 +23,24 @@
23 </view> 23 </view>
24 </view> 24 </view>
25 <view class="divide_line"></view> 25 <view class="divide_line"></view>
  26 + <view style='height:90rpx;padding:0 30rpx'>
  27 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  28 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人出生日期</text>
  29 + <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>1949-09-19</text>
  30 + </view>
  31 + <view class="divide_line"></view>
  32 + <view style='height:90rpx;padding:0 30rpx'>
  33 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  34 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
  35 + <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>中国</text>
  36 + </view>
  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>
26 <view class="btn_bottom"> 44 <view class="btn_bottom">
27 <button class="btn_bottom" formType="submit"> 保存</button> 45 <button class="btn_bottom" formType="submit"> 保存</button>
28 </view> 46 </view>
@@ -95,10 +95,10 @@ Page({ @@ -95,10 +95,10 @@ Page({
95 ], 95 ],
96 onChange: 'onPickerSelect' 96 onChange: 'onPickerSelect'
97 }, 97 },
98 - childrenbirthDate: { 98 + commonbirthDate: {
99 label: '出生日期', 99 label: '出生日期',
100 isrequre: true, 100 isrequre: true,
101 - bindtype: 'childrenbirthday', 101 + bindtype: 'commonbirthday',
102 selected: '', 102 selected: '',
103 isblack: 'true', 103 isblack: 'true',
104 placeholder: '请选择出生日期', 104 placeholder: '请选择出生日期',
@@ -215,6 +215,24 @@ Page({ @@ -215,6 +215,24 @@ Page({
215 placeholder: '请选择是否独生子女', 215 placeholder: '请选择是否独生子女',
216 onChange: 'onPickerSelect' 216 onChange: 'onPickerSelect'
217 }, 217 },
  218 + beforemarryData: {
  219 + label: '是否首套婚前贷款且婚后各自扣除',
  220 + bindtype: 'before_marry',
  221 + selected: '',
  222 + isblack: 'true',
  223 + values: ["是", "否"],
  224 + placeholder: '请选择',
  225 + onChange: 'onPickerSelect'
  226 + },
  227 + isselfData: {
  228 + label: '是否本人借款',
  229 + bindtype: 'is_self_loan',
  230 + selected: '',
  231 + isblack: 'true',
  232 + values: ["是", "否"],
  233 + placeholder: '请选择',
  234 + onChange: 'onPickerSelect'
  235 + },
218 reducetypeData: { 236 reducetypeData: {
219 label: '扣除方式', 237 label: '扣除方式',
220 isrequre: true, 238 isrequre: true,
@@ -294,6 +312,17 @@ Page({ @@ -294,6 +312,17 @@ Page({
294 placeholder: '请选择出租方类型', 312 placeholder: '请选择出租方类型',
295 onChange: 'onPickerSelect' 313 onChange: 'onPickerSelect'
296 }, 314 },
  315 + workingcityInfo: {
  316 + label: '主要工作城市',
  317 + mode: 'region',
  318 + bindtype: 'working_city',
  319 + isblack: 'true',
  320 + address_code: ['', ''],
  321 + address_value: ['', ''],
  322 + selected: '',
  323 + placeholder: '请选择城市',
  324 + onChange: 'onPickerSelect'
  325 + },
297 houseLocateInfo: { 326 houseLocateInfo: {
298 label: '房屋坐落地址', 327 label: '房屋坐落地址',
299 mode: 'region', 328 mode: 'region',
@@ -414,8 +443,19 @@ Page({ @@ -414,8 +443,19 @@ Page({
414 studystartdate: studystart_date, 443 studystartdate: studystart_date,
415 studyenddate: studyend_date 444 studyenddate: studyend_date
416 }) 445 })
417 - console.log("studystart_date", this.data.studystartdate);  
418 } 446 }
  447 + if ("medical_fund" == options.status) {
  448 + var cardtype_data = this.data.cardtypeData
  449 + cardtype_data.label = "病人证照类型"
  450 + var commonbirth_date = this.data.commonbirthDate
  451 + commonbirth_date.label = "病人出生日期"
  452 +
  453 + this.setData({
  454 + cardtypeData: cardtype_data,
  455 + commonbirthDate: commonbirth_date
  456 + })
  457 + }
  458 +
419 459
420 var title = '添加' + AddTypeNames[nameKey] 460 var title = '添加' + AddTypeNames[nameKey]
421 461
@@ -461,10 +501,10 @@ Page({ @@ -461,10 +501,10 @@ Page({
461 setData.children_name = data.name 501 setData.children_name = data.name
462 } 502 }
463 if (data.birth_date && data.birth_date > 0) { 503 if (data.birth_date && data.birth_date > 0) {
464 - var childrenbirthDate = this.data.childrenbirthDate  
465 - childrenbirthDate.selected = format.formatTime_date(data.birth_date)  
466 - childrenbirthDate.datelong = data.birth_date  
467 - setData.childrenbirthDate = childrenbirthDate 504 + var commonbirthDate = this.data.commonbirthDate
  505 + commonbirthDate.selected = format.formatTime_date(data.birth_date)
  506 + commonbirthDate.datelong = data.birth_date
  507 + setData.commonbirthDate = commonbirthDate
468 } 508 }
469 if (data.percent && data.percent.length) { 509 if (data.percent && data.percent.length) {
470 setData.percent = data.percent 510 setData.percent = data.percent
@@ -501,9 +541,9 @@ Page({ @@ -501,9 +541,9 @@ Page({
501 // } 541 // }
502 this.setData(setData) 542 this.setData(setData)
503 break; 543 break;
504 - // case '':  
505 - // var setData = {}  
506 - // break; 544 + // case 'continuing_education':
  545 + // var setData = {}
  546 + // break;
507 case 'medical_fund': 547 case 'medical_fund':
508 var setData = {} 548 var setData = {}
509 if (data.name && data.name.length) { 549 if (data.name && data.name.length) {
@@ -517,6 +557,12 @@ Page({ @@ -517,6 +557,12 @@ Page({
517 taxperson_relativeData.selected = data.family_ties 557 taxperson_relativeData.selected = data.family_ties
518 setData.taxperson_relativeData = taxperson_relativeData 558 setData.taxperson_relativeData = taxperson_relativeData
519 } 559 }
  560 + if (data.birth_date && data.birth_date > 0) {
  561 + var commonbirthDate = this.data.commonbirthDate
  562 + commonbirthDate.selected = format.formatTime_date(data.birth_date)
  563 + commonbirthDate.datelong = data.birth_date
  564 + setData.commonbirthDate = commonbirthDate
  565 + }
520 this.setData(setData) 566 this.setData(setData)
521 break; 567 break;
522 } 568 }
@@ -603,11 +649,11 @@ Page({ @@ -603,11 +649,11 @@ Page({
603 console.log('name***card_number', that.data.name + '***' + that.data.card_number) 649 console.log('name***card_number', that.data.name + '***' + that.data.card_number)
604 650
605 if (this.idcard_belong == 'children_id_card_no') { 651 if (this.idcard_belong == 'children_id_card_no') {
606 - this.data.childrenbirthDate.selected = birth_day 652 + this.data.commonbirthDate.selected = birth_day
607 data = { 653 data = {
608 children_id_card_no: id_info.id_card_number, 654 children_id_card_no: id_info.id_card_number,
609 children_name: id_info.name, 655 children_name: id_info.name,
610 - childrenbirthDate: this.data.childrenbirthDate 656 + commonbirthDate: this.data.commonbirthDate
611 } 657 }
612 } else if (this.idcard_belong == 'spouse_id_card_no') { 658 } else if (this.idcard_belong == 'spouse_id_card_no') {
613 this.data.loverbirthDate.selected = birth_day 659 this.data.loverbirthDate.selected = birth_day
@@ -647,7 +693,7 @@ Page({ @@ -647,7 +693,7 @@ Page({
647 this.showToast('请填写子女姓名') 693 this.showToast('请填写子女姓名')
648 return 694 return
649 } 695 }
650 - if (this.data.childrenbirthDate.selected.length < 1) { 696 + if (this.data.commonbirthDate.selected.length < 1) {
651 this.showToast('请选择子女出生日期') 697 this.showToast('请选择子女出生日期')
652 return 698 return
653 } 699 }
@@ -697,7 +743,7 @@ Page({ @@ -697,7 +743,7 @@ Page({
697 } 743 }
698 newdata.relationship = this.data.taxperson_relativeData.selected 744 newdata.relationship = this.data.taxperson_relativeData.selected
699 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected 745 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
700 - newdata.children_birthday = this.data.childrenbirthDate.datelong 746 + newdata.children_birthday = this.data.commonbirthDate.datelong
701 newdata.education_end = this.data.studystartdate.datelong 747 newdata.education_end = this.data.studystartdate.datelong
702 newdata.education_start = this.data.studyenddate.datelong 748 newdata.education_start = this.data.studyenddate.datelong
703 newdata.education_period = this.data.childedudegreeData.selected 749 newdata.education_period = this.data.childedudegreeData.selected
@@ -794,7 +840,10 @@ Page({ @@ -794,7 +840,10 @@ Page({
794 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) { 840 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
795 this.showToast('请填写证件号码') 841 this.showToast('请填写证件号码')
796 return 842 return
797 - } else if (this.data.taxperson_relativeData.selected.length < 1) { 843 + } else if (this.data.commonbirthDate.selected.length < 1) {
  844 + this.showToast('请选择病人出生日期')
  845 + return
  846 + }else if (this.data.taxperson_relativeData.selected.length < 1) {
798 this.showToast('请选择与纳税人关系') 847 this.showToast('请选择与纳税人关系')
799 return 848 return
800 } else if (!formdata.total_amount || formdata.total_amount < 0) { 849 } else if (!formdata.total_amount || formdata.total_amount < 0) {
@@ -809,6 +858,8 @@ Page({ @@ -809,6 +858,8 @@ Page({
809 newdata.amount_by_person = parseFloat(formdata.amount_by_person) 858 newdata.amount_by_person = parseFloat(formdata.amount_by_person)
810 newdata.id_card_type = this.data.cardtypeData.selected 859 newdata.id_card_type = this.data.cardtypeData.selected
811 newdata.relationship = this.data.taxperson_relativeData.selected 860 newdata.relationship = this.data.taxperson_relativeData.selected
  861 + newdata.patient_birthday = this.data.commonbirthDate.datelong
  862 + newdata.patient_birthday = "中国"
812 break; 863 break;
813 case 'house_fund': 864 case 'house_fund':
814 // subUrl = 'persontax/v1/medical-funds' 865 // subUrl = 'persontax/v1/medical-funds'
@@ -990,12 +1041,12 @@ Page({ @@ -990,12 +1041,12 @@ Page({
990 }) 1041 })
991 break; 1042 break;
992 1043
993 - case 'childrenbirthday':  
994 - var children_birthDate = this.data.childrenbirthDate 1044 + case 'commonbirthday':
  1045 + var children_birthDate = this.data.commonbirthDate
995 children_birthDate.selected = e.detail.value 1046 children_birthDate.selected = e.detail.value
996 children_birthDate.datelong = (Date.parse(new Date(e.detail.value)) / 1000) 1047 children_birthDate.datelong = (Date.parse(new Date(e.detail.value)) / 1000)
997 this.setData({ 1048 this.setData({
998 - childrenbirthDate: children_birthDate 1049 + commonbirthDate: children_birthDate
999 }) 1050 })
1000 break; 1051 break;
1001 case 'study_start_date': 1052 case 'study_start_date':
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <text class='text_black_30 float_left'>子女姓名</text> 25 <text class='text_black_30 float_left'>子女姓名</text>
26 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女姓名' name='children_name' value='{{children_name}}'></input> 26 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女姓名' name='children_name' value='{{children_name}}'></input>
27 </view> 27 </view>
28 - <template is="picker_cell_normal" data="{{...childrenbirthDate}}" /> 28 + <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
29 <view class='divide_line_f5f5f5'></view> 29 <view class='divide_line_f5f5f5'></view>
30 <view style='height:90rpx'> 30 <view style='height:90rpx'>
31 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 31 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
@@ -142,13 +142,13 @@ @@ -142,13 +142,13 @@
142 142
143 <template is="picker_cell_normal" data="{{...older_relativeData}}" /> 143 <template is="picker_cell_normal" data="{{...older_relativeData}}" />
144 144
145 -<view class='divide_line_f5f5f5'></view>  
146 -<view style='height:90rpx;'>  
147 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
148 - <text class='text_black_30 float_left'>分摊比例</text>  
149 - <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>  
150 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percent' value='{{percent}}'></input>  
151 - </view> 145 + <view class='divide_line_f5f5f5'></view>
  146 + <view style='height:90rpx;'>
  147 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  148 + <text class='text_black_30 float_left'>分摊比例</text>
  149 + <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
  150 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percent' value='{{percent}}'></input>
  151 + </view>
152 <!-- <view class='divide_line_f5f5f5'></view> 152 <!-- <view class='divide_line_f5f5f5'></view>
153 <view style='height:90rpx'> 153 <view style='height:90rpx'>
154 <text class='text_black_30 float_left'>分摊比例</text> 154 <text class='text_black_30 float_left'>分摊比例</text>
@@ -159,7 +159,7 @@ @@ -159,7 +159,7 @@
159 <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'> 159 <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
160 <view style='height:90rpx'> 160 <view style='height:90rpx'>
161 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 161 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
162 - <text class='text_black_30 float_left'>姓名</text> 162 + <text class='text_black_30 float_left'>病人姓名</text>
163 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input> 163 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input>
164 </view> 164 </view>
165 <view class='divide_line_f5f5f5'></view> 165 <view class='divide_line_f5f5f5'></view>
@@ -168,10 +168,18 @@ @@ -168,10 +168,18 @@
168 <view class='divide_line_f5f5f5'></view> 168 <view class='divide_line_f5f5f5'></view>
169 <view style='height:90rpx'> 169 <view style='height:90rpx'>
170 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 170 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
171 - <text class='text_black_30 float_left'>身份证件号码</text>  
172 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='id_card_no' value='{{id_card_no}}'></input> 171 + <text class='text_black_30 float_left'>病人证照号码</text>
  172 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证照号码' name='id_card_no' value='{{id_card_no}}'></input>
173 </view> 173 </view>
174 <view class='divide_line_f5f5f5'></view> 174 <view class='divide_line_f5f5f5'></view>
  175 + <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
  176 + <view class='divide_line_f5f5f5'></view>
  177 + <view style='height:90rpx'>
  178 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  179 + <text class='text_black_30 float_left'>病人国籍</text>
  180 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
  181 + </view>
  182 + <view class='divide_line_f5f5f5'></view>
175 <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> 183 <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
176 <view class='divide_line_f5f5f5'></view> 184 <view class='divide_line_f5f5f5'></view>
177 <view style='height:90rpx'> 185 <view style='height:90rpx'>
@@ -187,60 +195,80 @@ @@ -187,60 +195,80 @@
187 </view> 195 </view>
188 </view> 196 </view>
189 <!-- 住房 --> 197 <!-- 住房 -->
190 - <view wx:if="{{cur_index=='house_fund'}}" style='padding:0 30rpx;'> 198 + <view wx:if="{{cur_index=='house_fund'}}">
191 199
192 <view wx:if="{{house_type=='house_fund_loan'}}"> 200 <view wx:if="{{house_type=='house_fund_loan'}}">
  201 + <view style='padding:0 30rpx;'>
  202 + <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
  203 + <view class='divide_line_f5f5f5'></view>
  204 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
  205 + <view class='divide_line_f5f5f5'></view>
  206 + <view style='height:90rpx'>
  207 + <text class='text_black_30 float_left'>证书号码</text>
  208 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
  209 + </view>
  210 + <view class='divide_line_f5f5f5'></view>
  211 +
  212 + <template is="picker_cell_normal" data="{{...beforemarryData}}" />
  213 + <view class='divide_line_f5f5f5'></view>
  214 + <template is="picker_cell_normal" data="{{...isselfData}}" />
193 215
194 - <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />  
195 - <view class='divide_line_f5f5f5'></view>  
196 - <template is="picker_cell_normal" data="{{...identifytypeData}}" />  
197 - <view class='divide_line_f5f5f5'></view>  
198 - <view style='height:90rpx'>  
199 - <text class='text_black_30 float_left'>证书号码</text>  
200 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>  
201 </view> 216 </view>
202 - <view class='divide_line_f5f5f5'></view>  
203 - <template is="picker_cell_normal" data="{{...loantypeData}}" />  
204 - <view class='divide_line_f5f5f5'></view>  
205 - <view style='height:90rpx'>  
206 - <text class='text_black_30 float_left'>贷款合同编号</text>  
207 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='contract_no'></input> 217 +
  218 + <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
  219 + <view style='padding:0 30rpx;'>
  220 + <template is="picker_cell_normal" data="{{...loantypeData}}" />
  221 + <view class='divide_line_f5f5f5'></view>
  222 + <view style='height:90rpx'>
  223 + <text class='text_black_30 float_left'>贷款合同编号</text>
  224 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='contract_no'></input>
  225 + </view>
  226 + <view class='divide_line_f5f5f5'></view>
  227 + <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
  228 + <view class='divide_line_f5f5f5'></view>
  229 + <template is="picker_cell_normal" data="{{...loandatelongData}}" />
208 </view> 230 </view>
209 - <view class='divide_line_f5f5f5'></view>  
210 - <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />  
211 - <view class='divide_line_f5f5f5'></view>  
212 - <template is="picker_cell_normal" data="{{...loandatelongData}}" /> 231 +
213 </view> 232 </view>
214 <view wx:if="{{house_type=='house_fund_rent'}}"> 233 <view wx:if="{{house_type=='house_fund_rent'}}">
215 - <template is="picker_cell_normal" data="{{...contactLocateInfo}}" />  
216 - <view class='divide_line_f5f5f5'></view>  
217 - <template is="picker_cell_normal" data="{{...leasetypeData}}" />  
218 - <view class='divide_line_f5f5f5'></view>  
219 - <view style='height:90rpx'>  
220 - <text class='text_black_30 float_left'>出租方名称</text>  
221 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='lease_name'></input>  
222 - </view>  
223 - <view class='divide_line_f5f5f5'></view>  
224 - <view style='height:90rpx'>  
225 - <text class='text_black_30 float_left'>出租方纳税人识别号</text>  
226 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>  
227 - </view>  
228 - <view class='divide_line_f5f5f5'></view>  
229 - <template is="picker_cell_normal" data="{{...identifytypeData}}" />  
230 - <view class='divide_line_f5f5f5'></view>  
231 - <view style='height:90rpx'>  
232 - <text class='text_black_30 float_left'>证书号码</text>  
233 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input> 234 +
  235 + <view style='padding:0 30rpx;'>
  236 + <template is="picker_cell_normal" data="{{...workingcityInfo}}" />
  237 + <view class='divide_line_f5f5f5'></view>
  238 + <template is="picker_cell_normal" data="{{...leasetypeData}}" />
  239 + <view class='divide_line_f5f5f5'></view>
  240 + <view style='height:90rpx'>
  241 + <text class='text_black_30 float_left'>出租方名称</text>
  242 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='lease_name'></input>
  243 + </view>
  244 + <view class='divide_line_f5f5f5'></view>
  245 + <view style='height:90rpx'>
  246 + <text class='text_black_30 float_left'>出租方纳税人识别号</text>
  247 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
  248 + </view>
  249 + <view class='divide_line_f5f5f5'></view>
  250 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
  251 + <view class='divide_line_f5f5f5'></view>
  252 + <view style='height:90rpx'>
  253 + <text class='text_black_30 float_left'>证书号码</text>
  254 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
  255 + </view>
234 </view> 256 </view>
235 - <view class='divide_line_f5f5f5'></view>  
236 - <view style='height:90rpx'>  
237 - <text class='text_black_30 float_left'>租赁合同编号</text>  
238 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='contract_no'></input> 257 + <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
  258 + <view style='padding:0 30rpx;'>
  259 + <template is="picker_cell_normal" data="{{...contactLocateInfo}}" />
  260 + <view class='divide_line_f5f5f5'></view>
  261 +
  262 + <view style='height:90rpx'>
  263 + <text class='text_black_30 float_left'>租赁合同编号</text>
  264 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='contract_no'></input>
  265 + </view>
  266 + <view class='divide_line_f5f5f5'></view>
  267 + <template is="picker_cell_normal" data="{{...leasestartDate}}" />
  268 + <view class='divide_line_f5f5f5'></view>
  269 + <template is="picker_cell_normal" data="{{...leaseendDate}}" />
239 </view> 270 </view>
240 - <view class='divide_line_f5f5f5'></view>  
241 - <template is="picker_cell_normal" data="{{...leasestartDate}}" />  
242 - <view class='divide_line_f5f5f5'></view>  
243 - <template is="picker_cell_normal" data="{{...leaseendDate}}" /> 271 +
244 </view> 272 </view>
245 </view> 273 </view>
246 274
@@ -7,6 +7,7 @@ Page({ @@ -7,6 +7,7 @@ Page({
7 */ 7 */
8 data: { 8 data: {
9 cur_status:"", 9 cur_status:"",
  10 + house_type: "",
10 additiontitle: { 11 additiontitle: {
11 "children_education": "子女教育", 12 "children_education": "子女教育",
12 "continuing_education": "继续教育", 13 "continuing_education": "继续教育",
@@ -15,6 +16,7 @@ Page({ @@ -15,6 +16,7 @@ Page({
15 "house_fund": "住房" 16 "house_fund": "住房"
16 }, 17 },
17 reducetype: { 18 reducetype: {
  19 + "":"月",
18 "month": "月", 20 "month": "月",
19 "year": "年" 21 "year": "年"
20 }, 22 },
@@ -27,10 +29,14 @@ Page({ @@ -27,10 +29,14 @@ Page({
27 onLoad: function (options) { 29 onLoad: function (options) {
28 var that = this 30 var that = this
29 console.log("options", options); 31 console.log("options", options);
  32 + var pages = getCurrentPages();
  33 + //获取上一个页面的所有的方法和data中的数据
  34 + var lastpage = pages[pages.length - 2]
  35 + console.log("lastpage", lastpage.data);
30 this.handleData(options.datas) 36 this.handleData(options.datas)
31 this.setData({ 37 this.setData({
32 cur_status: options.status, 38 cur_status: options.status,
33 - datas: JSON.parse(options.datas) 39 + house_type: lastpage.data.house_type
34 }) 40 })
35 wx.setNavigationBarTitle({ 41 wx.setNavigationBarTitle({
36 title: that.data.additiontitle[options.status], 42 title: that.data.additiontitle[options.status],
@@ -38,9 +44,8 @@ Page({ @@ -38,9 +44,8 @@ Page({
38 }, 44 },
39 45
40 handleData: function (data){ 46 handleData: function (data){
41 - var newData = JSON.parse(data);  
42 -  
43 - if (newData && newData.length>0){ 47 + var newdata = JSON.parse(data);
  48 + if (newdata ){
44 if (newdata.children_birthday && newdata.children_birthday > 0) { 49 if (newdata.children_birthday && newdata.children_birthday > 0) {
45 newdata.children_birthday_new = format.formatTime_date(newdata.children_birthday) 50 newdata.children_birthday_new = format.formatTime_date(newdata.children_birthday)
46 } 51 }
@@ -67,9 +72,10 @@ Page({ @@ -67,9 +72,10 @@ Page({
67 newdata.rent_end_new = format.formatTime_date(newdata.rent_end) 72 newdata.rent_end_new = format.formatTime_date(newdata.rent_end)
68 } 73 }
69 this.setData({ 74 this.setData({
70 - datas: newData 75 + datas: newdata
71 }) 76 })
72 console.log("handleData", this.data.datas) 77 console.log("handleData", this.data.datas)
  78 +
73 } 79 }
74 }, 80 },
75 81
@@ -4,78 +4,65 @@ @@ -4,78 +4,65 @@
4 <!-- 子女教育 --> 4 <!-- 子女教育 -->
5 <view style='padding:30rpx' wx:if="{{cur_status=='children_education'}}"> 5 <view style='padding:30rpx' wx:if="{{cur_status=='children_education'}}">
6 <view style='height:90rpx;width:100%'> 6 <view style='height:90rpx;width:100%'>
7 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
8 - <text class='text_left'>子女身份证件类型：</text> 7 + <text class='text_left'>子女证照类型</text>
9 <text class='text_right_333'>{{datas.children_id_card_type=='1'?"居民身份证":datas.children_id_card_type}}</text> 8 <text class='text_right_333'>{{datas.children_id_card_type=='1'?"居民身份证":datas.children_id_card_type}}</text>
10 </view> 9 </view>
11 <view style='height:90rpx;width:100%'> 10 <view style='height:90rpx;width:100%'>
12 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
13 - <text class='text_left'>子女身份证件号码：</text> 11 + <text class='text_left'>子女证照号码</text>
14 <text class='text_right_333'>{{datas.children_id_card_no}}</text> 12 <text class='text_right_333'>{{datas.children_id_card_no}}</text>
15 </view> 13 </view>
16 <view style='height:90rpx;width:100%'> 14 <view style='height:90rpx;width:100%'>
17 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
18 <text class='text_left'>子女姓名</text> 15 <text class='text_left'>子女姓名</text>
19 <text class='text_right_333'>{{datas.children_name}}</text> 16 <text class='text_right_333'>{{datas.children_name}}</text>
20 </view> 17 </view>
21 <view style='height:90rpx;width:100%'> 18 <view style='height:90rpx;width:100%'>
22 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
23 <text class='text_left'>出生日期</text> 19 <text class='text_left'>出生日期</text>
24 <text class='text_right_333'>{{datas.children_birthday_new}}</text> 20 <text class='text_right_333'>{{datas.children_birthday_new}}</text>
25 </view> 21 </view>
26 <view style='height:90rpx;width:100%'> 22 <view style='height:90rpx;width:100%'>
27 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
28 <text class='text_left'>国籍</text> 23 <text class='text_left'>国籍</text>
29 - <text class='text_right_333'>{{datas.children_nation}}</text> 24 + <text class='text_right_333'>中国</text>
30 </view> 25 </view>
31 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 26 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
32 <view style='height:90rpx;width:100%'> 27 <view style='height:90rpx;width:100%'>
33 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
34 <text class='text_left'>分配比例</text> 28 <text class='text_left'>分配比例</text>
35 <text class='text_right_333'>{{datas.percent}}%</text> 29 <text class='text_right_333'>{{datas.percent}}%</text>
36 </view> 30 </view>
37 <view style='height:90rpx;width:100%'> 31 <view style='height:90rpx;width:100%'>
38 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
39 <text class='text_left'>子女学籍号</text> 32 <text class='text_left'>子女学籍号</text>
40 <text class='text_right_333'>{{datas.student_no}}</text> 33 <text class='text_right_333'>{{datas.student_no}}</text>
41 </view> 34 </view>
42 <view style='height:90rpx;width:100%'> 35 <view style='height:90rpx;width:100%'>
43 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
44 <text class='text_left'>子女受教育阶段</text> 36 <text class='text_left'>子女受教育阶段</text>
45 <text class='text_right_333'>{{datas.education_period}}</text> 37 <text class='text_right_333'>{{datas.education_period}}</text>
46 </view> 38 </view>
47 <view style='height:90rpx;width:100%'> 39 <view style='height:90rpx;width:100%'>
48 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
49 - <text class='text_left'>受教育日期起</text> 40 + <text class='text_left'>受教育期间起</text>
50 <text class='text_right_333'>{{datas.education_start_new}}</text> 41 <text class='text_right_333'>{{datas.education_start_new}}</text>
51 </view> 42 </view>
52 <view style='height:90rpx;width:100%'> 43 <view style='height:90rpx;width:100%'>
53 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
54 - <text class='text_left'>受教育日期止</text> 44 + <text class='text_left'>教育终止时间</text>
55 <text class='text_right_333'>{{datas.education_end_new}}</text> 45 <text class='text_right_333'>{{datas.education_end_new}}</text>
56 </view> 46 </view>
57 <view style='height:90rpx;width:100%'> 47 <view style='height:90rpx;width:100%'>
58 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
59 <text class='text_left'>就读国家(地区)</text> 48 <text class='text_left'>就读国家(地区)</text>
60 - <text class='text_right_333'>中国</text> 49 + <text class='text_right_333'>{{datas.school_country}}</text>
61 </view> 50 </view>
62 <view style='height:90rpx;width:100%'> 51 <view style='height:90rpx;width:100%'>
63 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
64 <text class='text_left'>就读学校</text> 52 <text class='text_left'>就读学校</text>
65 - <text class='text_right_333'>北京八一小学</text> 53 + <text class='text_right_333'>{{datas.school_name}}</text>
66 </view> 54 </view>
67 - <view style='height:90rpx;width:100%'>  
68 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text> 55 + <!-- <view style='height:90rpx;width:100%'>
69 <text class='text_left'>就读国家(地区)</text> 56 <text class='text_left'>就读国家(地区)</text>
70 <text class='text_right_333'>{{datas.education_end_new}}</text> 57 <text class='text_right_333'>{{datas.education_end_new}}</text>
71 - </view> 58 + </view> -->
72 <view style='height:90rpx;width:100%'> 59 <view style='height:90rpx;width:100%'>
73 <text class='text_left'>扣除方式</text> 60 <text class='text_left'>扣除方式</text>
74 <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text> 61 <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
75 </view> 62 </view>
76 <view style='height:90rpx;width:100%'> 63 <view style='height:90rpx;width:100%'>
77 <text class='text_left'>扣除金额</text> 64 <text class='text_left'>扣除金额</text>
78 - <text class='text_right_orange'>￥{{datas.deduction_amount/reducetype[datas.deduction_type]}}</text> 65 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
79 </view> 66 </view>
80 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 67 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
81 <view style='height:90rpx;width:100%'> 68 <view style='height:90rpx;width:100%'>
@@ -96,50 +83,42 @@ @@ -96,50 +83,42 @@
96 </view> 83 </view>
97 <view style='height:90rpx;width:100%'> 84 <view style='height:90rpx;width:100%'>
98 <text class='text_left'>国籍</text> 85 <text class='text_left'>国籍</text>
99 - <text class='text_right_333'>{{datas.nation}}</text> 86 + <text class='text_right_333'>中国</text>
100 </view> 87 </view>
101 </view> 88 </view>
102 89
103 <!-- 赡养老人 --> 90 <!-- 赡养老人 -->
104 <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}"> 91 <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
105 <view style='height:90rpx;width:100%'> 92 <view style='height:90rpx;width:100%'>
106 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
107 - <text class='text_left'>赡养类型：</text> 93 + <text class='text_left'>赡养类型</text>
108 <text class='text_right_333'>{{datas.support_type}}</text> 94 <text class='text_right_333'>{{datas.support_type}}</text>
109 </view> 95 </view>
110 <view style='height:90rpx;width:100%'> 96 <view style='height:90rpx;width:100%'>
111 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
112 - <text class='text_left'>被赡养人姓名：</text> 97 + <text class='text_left'>被赡养人姓名</text>
113 <text class='text_right_333'>{{datas.supported_name}}</text> 98 <text class='text_right_333'>{{datas.supported_name}}</text>
114 </view> 99 </view>
115 <view style='height:90rpx;width:100%'> 100 <view style='height:90rpx;width:100%'>
116 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
117 - <text class='text_left'>被赡养人证件类型：</text> 101 + <text class='text_left'>被赡养人证照类型</text>
118 <text class='text_right_333'>{{datas.id_card_type=='1'?"身份证":datas.id_card_type}}</text> 102 <text class='text_right_333'>{{datas.id_card_type=='1'?"身份证":datas.id_card_type}}</text>
119 </view> 103 </view>
120 <view style='height:90rpx;width:100%'> 104 <view style='height:90rpx;width:100%'>
121 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
122 - <text class='text_left'>被赡养人证件号码：</text> 105 + <text class='text_left'>被赡养人证照号码</text>
123 <text class='text_right_333'>{{datas.supported_name}}</text> 106 <text class='text_right_333'>{{datas.supported_name}}</text>
124 </view> 107 </view>
125 <view style='height:90rpx;width:100%'> 108 <view style='height:90rpx;width:100%'>
126 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
127 - <text class='text_left'>被赡养人出生日期：</text> 109 + <text class='text_left'>被赡养人出生日期</text>
128 <text class='text_right_333'>{{datas.birthday_new}}</text> 110 <text class='text_right_333'>{{datas.birthday_new}}</text>
129 </view> 111 </view>
130 <view style='height:90rpx;width:100%'> 112 <view style='height:90rpx;width:100%'>
131 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
132 - <text class='text_left'>被赡养人国籍：</text>  
133 - <text class='text_right_333'>{{datas.nation}}</text> 113 + <text class='text_left'>被赡养人国籍(地区)</text>
  114 + <text class='text_right_333'>中国</text>
134 </view> 115 </view>
135 <view style='height:90rpx;width:100%'> 116 <view style='height:90rpx;width:100%'>
136 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
137 - <text class='text_left'>与纳税人关系：</text> 117 + <text class='text_left'>与纳税人关系</text>
138 <text class='text_right_333'>{{datas.relationship}}</text> 118 <text class='text_right_333'>{{datas.relationship}}</text>
139 </view> 119 </view>
140 <view style='height:90rpx;width:100%'> 120 <view style='height:90rpx;width:100%'>
141 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
142 - <text class='text_left'>分摊比例：</text> 121 + <text class='text_left'>分摊比例</text>
143 <text class='text_right_333'>{{datas.percent}}%</text> 122 <text class='text_right_333'>{{datas.percent}}%</text>
144 </view> 123 </view>
145 <view style='height:90rpx;width:100%'> 124 <view style='height:90rpx;width:100%'>
@@ -148,63 +127,111 @@ @@ -148,63 +127,111 @@
148 </view> 127 </view>
149 <view style='height:90rpx;width:100%'> 128 <view style='height:90rpx;width:100%'>
150 <text class='text_left'>扣除金额</text> 129 <text class='text_left'>扣除金额</text>
151 - <text class='text_right_orange'>￥{{datas.deduction_amount/reducetype[datas.deduction_type]}}</text> 130 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
152 </view> 131 </view>
153 </view> 132 </view>
154 133
155 <!-- 住房 --> 134 <!-- 住房 -->
156 <view style='padding:30rpx' wx:if="{{cur_status=='house_fund'}}"> 135 <view style='padding:30rpx' wx:if="{{cur_status=='house_fund'}}">
157 - <view style='height:90rpx;width:100%'>  
158 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
159 - <text class='text_left'>租赁房屋坐落地址：</text>  
160 - <text class='text_right_333'>{{datas.house_address}}</text>  
161 - </view>  
162 - <view style='height:90rpx'>  
163 - <text class='text_right_333'>{{datas.house_detail_address}}</text>  
164 - </view>  
165 - <view style='height:90rpx;width:100%'>  
166 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
167 - <text class='text_left'>出租方类型：</text>  
168 - <text class='text_right_333'>{{datas.owner_type}}</text>  
169 - </view>  
170 - <view style='height:90rpx;width:100%'>  
171 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
172 - <text class='text_left'>出租方名称：</text>  
173 - <text class='text_right_333'>{{datas.owner_name}}</text>  
174 - </view>  
175 - <view style='height:90rpx;width:100%'>  
176 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
177 - <view style='height:90rpx;float:left;display:flex;flex-direction:column'>  
178 - <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>  
179 - <!-- <text style='line-height:24rpx;font-size:24rpx;color:#AEAEAE;'>统一社会信用代码</text> --> 136 + <!-- 租赁 -->
  137 + <view wx:if="{{house_type=='house_fund_rent'}}">
  138 + <view style='height:90rpx;width:100%'>
  139 + <text class='text_left'>主要工作城市</text>
  140 + <text class='text_right_333'>{{datas.house_address}}</text>
  141 + </view>
  142 + <view style='height:90rpx'>
  143 + <text class='text_right_333'>{{datas.house_detail_address}}</text>
  144 + </view>
  145 + <view style='height:90rpx;width:100%'>
  146 + <text class='text_left'>出租方类型</text>
  147 + <text class='text_right_333'>{{datas.owner_type}}</text>
  148 + </view>
  149 + <view style='height:90rpx;width:100%'>
  150 + <text class='text_left'>出租方名称</text>
  151 + <text class='text_right_333'>{{datas.owner_name}}</text>
  152 + </view>
  153 + <view style='height:90rpx;width:100%'>
  154 + <view style='height:90rpx;float:left;display:flex;flex-direction:column'>
  155 + <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>
  156 + <!-- <text style='line-height:24rpx;font-size:24rpx;color:#AEAEAE;'>统一社会信用代码</text> -->
  157 + </view>
  158 + <text class='text_right_333'>{{datas.owner_credit_no}}</text>
  159 + </view>
  160 + <view style='height:90rpx;width:100%'>
  161 + <text class='text_left'>证件类型</text>
  162 + <text class='text_right_333'>{{datas.certification_type}}</text>
  163 + </view>
  164 + <view style='height:90rpx;width:100%'>
  165 + <text class='text_left'>证件号码</text>
  166 + <text class='text_right_333'>{{datas.certification_no}}</text>
  167 + </view>
  168 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  169 + <view style='height:90rpx;width:100%'>
  170 + <text class='text_left'>租赁房屋坐落地址</text>
  171 + <text class='text_right_333'>{{datas.house_address}}</text>
  172 + </view>
  173 + <view style='height:90rpx'>
  174 + <text class='text_right_333'>{{datas.house_detail_address}}</text>
  175 + </view>
  176 + <view style='height:90rpx;width:100%'>
  177 + <text class='text_left'>租赁合同编号</text>
  178 + <text class='text_right_333'>{{datas.rent_contract_no}}</text>
  179 + </view>
  180 + <view style='height:90rpx;width:100%'>
  181 + <text class='text_left'>租赁期起</text>
  182 + <text class='text_right_333'>{{datas.rent_start_new}}</text>
  183 + </view>
  184 + <view style='height:90rpx;width:100%'>
  185 + <text class='text_left'>租赁期止</text>
  186 + <text class='text_right_333'>{{datas.rent_end_new}}</text>
180 </view> 187 </view>
181 - <text class='text_right_333'>{{datas.owner_credit_no}}</text>  
182 - </view>  
183 - <view style='height:90rpx;width:100%'>  
184 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
185 - <text class='text_left'>证书类型：</text>  
186 - <text class='text_right_333'>{{datas.certification_type}}</text>  
187 - </view>  
188 - <view style='height:90rpx;width:100%'>  
189 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
190 - <text class='text_left'>证书号码：</text>  
191 - <text class='text_right_333'>{{datas.certification_no}}</text>  
192 - </view>  
193 - <view style='width:100%;height:20rpx;background:#f9f9f9'></view>  
194 - <view style='height:90rpx;width:100%'>  
195 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
196 - <text class='text_left'>租赁合同编号</text>  
197 - <text class='text_right_333'>{{datas.rent_contract_no}}</text>  
198 - </view>  
199 - <view style='height:90rpx;width:100%'>  
200 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
201 - <text class='text_left'>租赁期起</text>  
202 - <text class='text_right_333'>{{datas.rent_start_new}}</text>  
203 </view> 188 </view>
204 - <view style='height:90rpx;width:100%'>  
205 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>  
206 - <text class='text_left'>租赁期止</text>  
207 - <text class='text_right_333'>{{datas.rent_end_new}}</text> 189 + <!-- //贷款 -->
  190 + <view wx:if="{{house_type=='house_fund_loan'}}">
  191 + <view style='height:90rpx;width:100%'>
  192 + <text class='text_left'>房屋坐落地址</text>
  193 + <text class='text_right_333'>{{datas.house_address}}</text>
  194 + </view>
  195 + <view style='height:90rpx'>
  196 + <text class='text_right_333'>{{datas.house_detail_address}}</text>
  197 + </view>
  198 + <view style='height:90rpx;width:100%'>
  199 + <text class='text_left'>证书类型</text>
  200 + <text class='text_right_333'>{{datas.certification_type}}</text>
  201 + </view>
  202 + <view style='height:90rpx;width:100%'>
  203 + <text class='text_left'>证书类型</text>
  204 + <text class='text_right_333'>{{datas.certification_type}}</text>
  205 + </view>
  206 + <view style='height:90rpx;width:100%'>
  207 + <text class='text_left'>证书号码</text>
  208 + <text class='text_right_333'>{{datas.certification_no}}</text>
  209 + </view>
  210 + <view style='height:90rpx;width:100%'>
  211 + <text class='text_left'>是否首套婚前贷款且婚后各自扣除：</text>
  212 + <text class='text_right_333'>{{}}</text>
  213 + </view>
  214 + <view style='height:90rpx;width:100%'>
  215 + <text class='text_left'>是否本人借款</text>
  216 + <text class='text_right_333'>{{datas.certification_type}}</text>
  217 + </view>
  218 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  219 + <view style='height:90rpx;width:100%'>
  220 + <text class='text_left'>贷款类型</text>
  221 + <text class='text_right_333'>{{datas.loan_type}}</text>
  222 + </view>
  223 + <view style='height:90rpx;width:100%'>
  224 + <text class='text_left'>贷款合同编号</text>
  225 + <text class='text_right_333'>{{datas.loan_contract_no}}</text>
  226 + </view>
  227 + <view style='height:90rpx;width:100%'>
  228 + <text class='text_left'>首次还款日期</text>
  229 + <text class='text_right_333'>{{datas.loan_start}}</text>
  230 + </view>
  231 + <view style='height:90rpx;width:100%'>
  232 + <text class='text_left'>贷款期限(月数)</text>
  233 + <text class='text_right_333'>{{datas.loan_months}}</text>
  234 + </view>
208 </view> 235 </view>
209 <view style='height:90rpx;width:100%'> 236 <view style='height:90rpx;width:100%'>
210 <text class='text_left'>扣除方式</text> 237 <text class='text_left'>扣除方式</text>
@@ -212,7 +239,7 @@ @@ -212,7 +239,7 @@
212 </view> 239 </view>
213 <view style='height:90rpx;width:100%'> 240 <view style='height:90rpx;width:100%'>
214 <text class='text_left'>扣除金额</text> 241 <text class='text_left'>扣除金额</text>
215 - <text class='text_right_orange'>￥{{datas.deduction_amount/reducetype[datas.deduction_type]}}</text> 242 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
216 </view> 243 </view>
217 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 244 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
218 <view style='height:90rpx;width:100%'> 245 <view style='height:90rpx;width:100%'>
@@ -236,7 +263,4 @@ @@ -236,7 +263,4 @@
236 <text class='text_right_333'>中国</text> 263 <text class='text_right_333'>中国</text>
237 </view> 264 </view>
238 </view> 265 </view>
239 -  
240 -  
241 -  
242 </scroll-view> 266 </scroll-view>
@@ -24,12 +24,9 @@ Page({ @@ -24,12 +24,9 @@ Page({
24 "house_fund": "住房" 24 "house_fund": "住房"
25 }, 25 },
26 reducetype:{ 26 reducetype:{
27 - "month":"月度",  
28 - "year":"年度"  
29 - },  
30 - reducetypeunit: {  
31 - "month": "月",  
32 - "year": "年" 27 + "":"月",
  28 + "month":"月",
  29 + "year":"年"
33 }, 30 },
34 datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"] 31 datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"]
35 }, 32 },
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
27 <view style='width:100%;display:flex;flex-direction:row '> 27 <view style='width:100%;display:flex;flex-direction:row '>
28 <view class='float_left' style='flex:1'> 28 <view class='float_left' style='flex:1'>
29 <text class='text_999_24 '>扣除方式</text> 29 <text class='text_999_24 '>扣除方式</text>
30 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text> 30 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
31 </view> 31 </view>
32 <view class='float_right' style='flex:1'> 32 <view class='float_right' style='flex:1'>
33 <text class='text_999_24 '>可扣除金额</text> 33 <text class='text_999_24 '>可扣除金额</text>
34 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text> 34 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
35 </view> 35 </view>
36 </view> 36 </view>
37 </view> 37 </view>
@@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
41 <view style='width:100%;display:flex;flex-direction:row '> 41 <view style='width:100%;display:flex;flex-direction:row '>
42 <view class='float_left' style='flex:1'> 42 <view class='float_left' style='flex:1'>
43 <text class='text_999_24 '>扣除方式</text> 43 <text class='text_999_24 '>扣除方式</text>
44 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text> 44 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
45 </view> 45 </view>
46 <view class='float_right' style='flex:1'> 46 <view class='float_right' style='flex:1'>
47 <text class='text_999_24 '>可扣除金额</text> 47 <text class='text_999_24 '>可扣除金额</text>
48 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text> 48 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
49 </view> 49 </view>
50 </view> 50 </view>
51 </view> 51 </view>
@@ -53,11 +53,11 @@ @@ -53,11 +53,11 @@
53 <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> 53 <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
54 <view class='float_left' style='flex:1'> 54 <view class='float_left' style='flex:1'>
55 <text class='text_999_24 '>扣除方式</text> 55 <text class='text_999_24 '>扣除方式</text>
56 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text> 56 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
57 </view> 57 </view>
58 <view class='float_right' style='flex:1'> 58 <view class='float_right' style='flex:1'>
59 <text class='text_999_24 '>可扣除金额</text> 59 <text class='text_999_24 '>可扣除金额</text>
60 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetypeunit[itemData.deduction_type]}}</text> 60 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
61 </view> 61 </view>
62 </view> 62 </view>
63 </view> 63 </view>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </view> 37 </view>
38 <view style='height:70rpx'> 38 <view style='height:70rpx'>
39 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 39 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
40 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount/reducetype[item.deduction_type]}}</text> 40 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
41 </view> 41 </view>
42 <view class='divide_line_f5f5f5'></view> 42 <view class='divide_line_f5f5f5'></view>
43 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 43 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 </view> 91 </view>
92 <view style='height:70rpx'> 92 <view style='height:70rpx'>
93 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 93 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
94 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount/reducetype[item.deduction_type]}}</text> 94 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
95 </view> 95 </view>
96 </view> 96 </view>
97 </view> 97 </view>
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </view> 126 </view>
127 <view style='height:70rpx'> 127 <view style='height:70rpx'>
128 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 128 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
129 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount/reducetype[item.deduction_type]}}</text> 129 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
130 </view> 130 </view>
131 </view> 131 </view>
132 132
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 </view> 163 </view>
164 <view style='height:70rpx'> 164 <view style='height:70rpx'>
165 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 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> 166 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
167 </view> 167 </view>
168 <view class='divide_line_f5f5f5'></view> 168 <view class='divide_line_f5f5f5'></view>
169 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 169 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
@@ -212,18 +212,26 @@ @@ -212,18 +212,26 @@
212 <view style='padding-right:30rpx'> 212 <view style='padding-right:30rpx'>
213 <view class='divide_line_f5f5f5'></view> 213 <view class='divide_line_f5f5f5'></view>
214 <view style='height:70rpx'> 214 <view style='height:70rpx'>
215 - <text class='text_999_28 ' style='line-height:70rpx'>姓名：</text> 215 + <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> 216 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
217 </view> 217 </view>
218 <view style='height:70rpx'> 218 <view style='height:70rpx'>
219 - <text class='text_999_28 ' style='line-height:70rpx'>身份证件类型：</text> 219 + <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> 220 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
221 </view> 221 </view>
222 <view style='height:70rpx'> 222 <view style='height:70rpx'>
223 - <text class='text_999_28 ' style='line-height:70rpx'>身份证件号码：</text> 223 + <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> 224 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
225 </view> 225 </view>
226 <view style='height:70rpx'> 226 <view style='height:70rpx'>
  227 + <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>
  228 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  229 + </view>
  230 + <view style='height:70rpx'>
  231 + <text class='text_999_28 ' style='line-height:70rpx'>病人国籍：</text>
  232 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>中国</text>
  233 + </view>
  234 + <view style='height:70rpx'>
227 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text> 235 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
228 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 236 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
229 </view> 237 </view>
@@ -271,7 +279,7 @@ @@ -271,7 +279,7 @@
271 </view> 279 </view>
272 <view style='height:70rpx'> 280 <view style='height:70rpx'>
273 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 281 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
274 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount/reducetype[item.deduction_type]}}</text> 282 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
275 </view> 283 </view>
276 <view class='divide_line_f5f5f5'></view> 284 <view class='divide_line_f5f5f5'></view>
277 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 285 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
请 注册 或 登录 后发表评论