wangyu / naturalPersonTax · 提交

提交 db5696af0cb59bd53e5737eb0ddb954dd974abb6

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

优化

内嵌 并排对比
正在显示 5 个修改的文件 包含 294 行增加 和 272 行删除
@@ -85,6 +85,16 @@ Page({ @@ -85,6 +85,16 @@ Page({
85 values: ["本人", "配偶", "子女"], 85 values: ["本人", "配偶", "子女"],
86 onChange: 'onPickerSelect' 86 onChange: 'onPickerSelect'
87 }, 87 },
  88 + childrenpercentData: {
  89 + label: '分配比例',
  90 + bindtype: 'child_percent',
  91 + selected: '',
  92 + isrequre: true,
  93 + isblack: 'true',
  94 + values: ["0%", "50%", "100%"],
  95 + placeholder: '请选择分配比例',
  96 + onChange: 'onPickerSelect'
  97 + },
88 childrencardtypeData: { 98 childrencardtypeData: {
89 label: '子女证照类型', 99 label: '子女证照类型',
90 isrequre: true, 100 isrequre: true,
@@ -202,7 +212,7 @@ Page({ @@ -202,7 +212,7 @@ Page({
202 bindtype: 'olderbirthday', 212 bindtype: 'olderbirthday',
203 selected: '', 213 selected: '',
204 isblack: 'true', 214 isblack: 'true',
205 - placeholder: '请选择被赡养人出生日期', 215 + placeholder: '请选择日期',
206 mode: "date", 216 mode: "date",
207 fields: "day", 217 fields: "day",
208 start: '1970-01-01', 218 start: '1970-01-01',
@@ -524,7 +534,9 @@ Page({ @@ -524,7 +534,9 @@ Page({
524 setData.commonbirthDate = commonbirthDate 534 setData.commonbirthDate = commonbirthDate
525 } 535 }
526 if (data.percent && data.percent.length) { 536 if (data.percent && data.percent.length) {
527 - setData.percent = data.percent 537 + var childrenpercentData = this.data.childrenpercentData
  538 + childrenpercentData.selected = data.percent
  539 + setData.childrenpercentData = childrenpercentData
528 } 540 }
529 if (data.student_no && data.student_no.length) { 541 if (data.student_no && data.student_no.length) {
530 setData.children_student_no = data.student_no 542 setData.children_student_no = data.student_no
@@ -918,11 +930,9 @@ Page({ @@ -918,11 +930,9 @@ Page({
918 this.showToast('请选择子女出生日期') 930 this.showToast('请选择子女出生日期')
919 return 931 return
920 } 932 }
921 - if (!formdata.percent || formdata.percent < 1 || formdata.percent > 100) {  
922 - this.showToast('请填写合理分配比例') 933 + if (this.data.childrenpercentData.selected.length < 1) {
  934 + this.showToast('请选择分配比例')
923 return 935 return
924 - } else {  
925 - newdata.percent = parseFloat(formdata.percent)  
926 } 936 }
927 if (!formdata.children_student_no || formdata.children_student_no.length < 1) { 937 if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
928 this.showToast('请填写学籍号') 938 this.showToast('请填写学籍号')
@@ -958,6 +968,7 @@ Page({ @@ -958,6 +968,7 @@ Page({
958 } 968 }
959 } 969 }
960 newdata.relationship = this.data.taxperson_relativeData.selected 970 newdata.relationship = this.data.taxperson_relativeData.selected
  971 + newdata.percent = parseFloat(this.data.childrenpercentData.selected.replace("%",""))
961 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected 972 newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
962 newdata.children_birthday = this.data.commonbirthDate.datelong 973 newdata.children_birthday = this.data.commonbirthDate.datelong
963 newdata.education_end = this.data.studystartdate.datelong 974 newdata.education_end = this.data.studystartdate.datelong
@@ -1297,7 +1308,14 @@ Page({ @@ -1297,7 +1308,14 @@ Page({
1297 childrencardtypeData: children_cardtypedata 1308 childrencardtypeData: children_cardtypedata
1298 }) 1309 })
1299 break; 1310 break;
1300 - 1311 + case 'child_percent':
  1312 + var childrenpercent_data = this.data.childrenpercentData
  1313 + childrenpercent_data.selected = childrenpercent_data.values[e.detail.value]
  1314 + this.setData({
  1315 + childrenpercentData: childrenpercent_data
  1316 + })
  1317 + break;
  1318 + break;
1301 case 'commonbirthday': 1319 case 'commonbirthday':
1302 var children_birthDate = this.data.commonbirthDate 1320 var children_birthDate = this.data.commonbirthDate
1303 children_birthDate.selected = e.detail.value 1321 children_birthDate.selected = e.detail.value
@@ -37,335 +37,336 @@ @@ -37,335 +37,336 @@
37 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view> 37 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
38 38
39 <view style='padding:0 30rpx;'> 39 <view style='padding:0 30rpx;'>
40 - <view style='height:90rpx;'> 40 + <!-- <view style='height:90rpx;'>
41 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 41 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
42 <text class='text_black_30 float_left'>分配比例</text> 42 <text class='text_black_30 float_left'>分配比例</text>
43 <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text> 43 <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
44 <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> 44 <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>
45 - </view> 45 + </view> -->
  46 + <template is="picker_cell_normal" data="{{...childrenpercentData}}" />
46 47
47 - <view class='divide_line_f5f5f5'></view>  
48 - <view style='height:90rpx'>  
49 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
50 - <text class='text_black_30 float_left'>子女学籍号</text>  
51 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>  
52 - </view>  
53 - <view class='divide_line_f5f5f5'></view> 48 + <view class='divide_line_f5f5f5'></view>
  49 + <view style='height:90rpx'>
  50 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  51 + <text class='text_black_30 float_left'>子女学籍号</text>
  52 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
  53 + </view>
  54 + <view class='divide_line_f5f5f5'></view>
54 55
55 - <template is="picker_cell_normal" data="{{...childedudegreeData}}" />  
56 - <view class='divide_line_f5f5f5'></view> 56 + <template is="picker_cell_normal" data="{{...childedudegreeData}}" />
  57 + <view class='divide_line_f5f5f5'></view>
57 58
58 - <template is="picker_cell_normal" data="{{...studystartdate}}" />  
59 - <view class='divide_line_f5f5f5'></view> 59 + <template is="picker_cell_normal" data="{{...studystartdate}}" />
  60 + <view class='divide_line_f5f5f5'></view>
60 61
61 - <template is="picker_cell_normal" data="{{...studyenddate}}" /> 62 + <template is="picker_cell_normal" data="{{...studyenddate}}" />
62 63
63 - <view class='divide_line_f5f5f5'></view>  
64 - <template is="picker_cell_normal" data="{{...schoolCountryData}}" />  
65 - <view class='divide_line_f5f5f5'></view>  
66 - <view style='height:90rpx'>  
67 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
68 - <text class='text_black_30 float_left'>就读学校名称</text>  
69 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>  
70 - </view>  
71 - <view class='divide_line_f5f5f5'></view> 64 + <view class='divide_line_f5f5f5'></view>
  65 + <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
  66 + <view class='divide_line_f5f5f5'></view>
  67 + <view style='height:90rpx'>
  68 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  69 + <text class='text_black_30 float_left'>就读学校名称</text>
  70 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>
72 </view> 71 </view>
  72 + <view class='divide_line_f5f5f5'></view>
73 </view> 73 </view>
74 - <!-- 继续教育 -->  
75 - <view wx:if="{{cur_index=='continuing_education'}}" style='padding:0 30rpx;'> 74 +</view>
  75 +<!-- 继续教育 -->
  76 +<view wx:if="{{cur_index=='continuing_education'}}" style='padding:0 30rpx;'>
76 77
77 - <template is="picker_cell_normal" data="{{...edutypeData}}" />  
78 - <view class='divide_line_f5f5f5'></view>  
79 - <view wx:if="{{edu_lable=='school'}}">  
80 - <!-- <view style='height:90rpx'> 78 + <template is="picker_cell_normal" data="{{...edutypeData}}" />
  79 + <view class='divide_line_f5f5f5'></view>
  80 + <view wx:if="{{edu_lable=='school'}}">
  81 + <!-- <view style='height:90rpx'>
81 <text class='text_black_30 float_left'>学历教育阶段</text> 82 <text class='text_black_30 float_left'>学历教育阶段</text>
82 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段' name='education_period'></input> 83 <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段' name='education_period'></input>
83 </view> --> 84 </view> -->
84 - <template is="picker_cell_normal" data="{{...edulevelData}}" />  
85 - <view class='divide_line_f5f5f5'></view>  
86 - <template is="picker_cell_normal" data="{{...studystartdate}}" />  
87 - <view class='divide_line_f5f5f5'></view>  
88 - <template is="picker_cell_normal" data="{{...studyenddate}}" /> 85 + <template is="picker_cell_normal" data="{{...edulevelData}}" />
  86 + <view class='divide_line_f5f5f5'></view>
  87 + <template is="picker_cell_normal" data="{{...studystartdate}}" />
  88 + <view class='divide_line_f5f5f5'></view>
  89 + <template is="picker_cell_normal" data="{{...studyenddate}}" />
89 90
90 - </view>  
91 - <view wx:elif="{{edu_lable=='tech'}}">  
92 - <template is="picker_cell_normal" data="{{...edustyleData}}" />  
93 - <view class='divide_line_f5f5f5'></view>  
94 - <template is="picker_cell_normal" data="{{...applydate}}" />  
95 - <view class='divide_line_f5f5f5'></view>  
96 - <view style='height:90rpx'>  
97 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
98 - <text class='text_black_30 float_left'>证书名称</text>  
99 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='certification_name'></input>  
100 - </view>  
101 - <view class='divide_line_f5f5f5'></view>  
102 - <view style='height:90rpx'>  
103 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
104 - <text class='text_black_30 float_left'>证书编号</text>  
105 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书编号' name='certification_no'></input>  
106 - </view>  
107 - <view class='divide_line_f5f5f5'></view> 91 + </view>
  92 + <view wx:elif="{{edu_lable=='tech'}}">
  93 + <template is="picker_cell_normal" data="{{...edustyleData}}" />
  94 + <view class='divide_line_f5f5f5'></view>
  95 + <template is="picker_cell_normal" data="{{...applydate}}" />
  96 + <view class='divide_line_f5f5f5'></view>
  97 + <view style='height:90rpx'>
  98 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  99 + <text class='text_black_30 float_left'>证书名称</text>
  100 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='certification_name'></input>
  101 + </view>
  102 + <view class='divide_line_f5f5f5'></view>
  103 + <view style='height:90rpx'>
  104 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  105 + <text class='text_black_30 float_left'>证书编号</text>
  106 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书编号' name='certification_no'></input>
  107 + </view>
  108 + <view class='divide_line_f5f5f5'></view>
  109 + <view style='height:90rpx'>
  110 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  111 + <text class='text_black_30 float_left'>发证机关</text>
  112 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_autority'></input>
  113 + </view>
  114 + </view>
  115 +
  116 +</view>
  117 +<!-- 赡养老人 -->
  118 +<view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
  119 + <template is="picker_cell_normal" data="{{...supporttypeData}}" />
  120 + <view class='divide_line_f5f5f5'></view>
  121 + <view style='height:90rpx'>
  122 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  123 + <text class='text_black_30 float_left'>被赡养人姓名</text>
  124 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='supported_name' value='{{supported_name}}'></input>
  125 + </view>
  126 + <view class='divide_line_f5f5f5'></view>
  127 + <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
  128 + <view class='divide_line_f5f5f5'></view>
  129 + <view style='height:90rpx'>
  130 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  131 + <text class='text_black_30 float_left'>被赡养人证照号码</text>
  132 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='id_card_no' value='{{id_card_no}}'></input>
  133 + </view>
  134 + <view class='divide_line_f5f5f5'></view>
  135 + <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
  136 + <view class='divide_line_f5f5f5'></view>
  137 + <view style='height:90rpx'>
  138 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  139 + <text class='text_black_30 float_left'>被赡养人国籍(地区)</text>
  140 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
  141 + </view>
  142 + <view class='divide_line_f5f5f5'></view>
  143 +
  144 + <template is="picker_cell_normal" data="{{...older_relativeData}}" />
  145 +
  146 + <view class='divide_line_f5f5f5'></view>
  147 + <view style='height:90rpx;'>
  148 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  149 + <text class='text_black_30 float_left'>分摊比例</text>
  150 + <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
  151 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percentage' value='{{percentage}}'></input>
  152 + </view>
  153 + <!-- <view class='divide_line_f5f5f5'></view>
108 <view style='height:90rpx'> 154 <view style='height:90rpx'>
109 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
110 - <text class='text_black_30 float_left'>发证机关</text>  
111 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_autority'></input>  
112 - </view>  
113 - </view> 155 + <text class='text_black_30 float_left'>分摊比例</text>
  156 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' name='allocation_ratio'></input>
  157 + </view> -->
  158 +</view>
  159 +<!-- 大病医疗 -->
  160 +<view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
  161 + <view style='height:90rpx'>
  162 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  163 + <text class='text_black_30 float_left'>病人姓名</text>
  164 + <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>
  165 + </view>
  166 + <view class='divide_line_f5f5f5'></view>
114 167
115 - </view>  
116 - <!-- 赡养老人 -->  
117 - <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>  
118 - <template is="picker_cell_normal" data="{{...supporttypeData}}" /> 168 + <template is="picker_cell_normal" data="{{...cardtypeData}}" />
  169 + <view class='divide_line_f5f5f5'></view>
  170 + <view style='height:90rpx'>
  171 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  172 + <text class='text_black_30 float_left'>病人证照号码</text>
  173 + <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' type='idcard' value='{{id_card_no}}'></input>
  174 + </view>
  175 + <view class='divide_line_f5f5f5'></view>
  176 + <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
  177 + <view class='divide_line_f5f5f5'></view>
  178 + <view style='height:90rpx'>
  179 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  180 + <text class='text_black_30 float_left'>病人国籍</text>
  181 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
  182 + </view>
  183 + <view class='divide_line_f5f5f5'></view>
  184 + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
  185 + <view class='divide_line_f5f5f5'></view>
  186 + <view style='height:90rpx'>
  187 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  188 + <text class='text_black_30 float_left'>医疗支出总金额</text>
  189 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_amount' value='{{total_amount}}'></input>
  190 + </view>
  191 + <view class='divide_line_f5f5f5'></view>
  192 + <view style='height:90rpx'>
  193 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
  194 + <text class='text_black_30 float_left'>个人负担金额</text>
  195 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入金额' type='digit' name='amount_by_person' value='{{total_amount}}'></input>
  196 + </view>
  197 +</view>
  198 +<!-- 住房 -->
  199 +<view wx:if="{{cur_index=='house_fund'}}">
  200 +
  201 + <view wx:if="{{house_type=='house_fund_loan'}}">
  202 + <view style='padding:0 30rpx;'>
  203 + <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
  204 + <view class='divide_line_f5f5f5'></view>
  205 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
119 <view class='divide_line_f5f5f5'></view> 206 <view class='divide_line_f5f5f5'></view>
120 <view style='height:90rpx'> 207 <view style='height:90rpx'>
121 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 208 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
122 - <text class='text_black_30 float_left'>被赡养人姓名</text>  
123 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='supported_name' value='{{supported_name}}'></input> 209 + <text class='text_black_30 float_left'>证书号码</text>
  210 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='certification_no'></input>
124 </view> 211 </view>
125 <view class='divide_line_f5f5f5'></view> 212 <view class='divide_line_f5f5f5'></view>
126 - <template is="picker_cell_normal" data="{{...oldercardtypeData}}" /> 213 +
  214 + <template is="picker_cell_normal" data="{{...beforemarryData}}" />
  215 + <view class='divide_line_f5f5f5'></view>
  216 + <template is="picker_cell_normal" data="{{...isselfData}}" />
  217 +
  218 + </view>
  219 +
  220 + <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
  221 + <view style='padding:0 30rpx;'>
  222 + <template is="picker_cell_normal" data="{{...loantypeData}}" />
127 <view class='divide_line_f5f5f5'></view> 223 <view class='divide_line_f5f5f5'></view>
128 <view style='height:90rpx'> 224 <view style='height:90rpx'>
129 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 225 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
130 - <text class='text_black_30 float_left'>被赡养人证照号码</text>  
131 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='id_card_no' value='{{id_card_no}}'></input> 226 + <text class='text_black_30 float_left'>贷款合同编号</text>
  227 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='loan_contract_no'></input>
132 </view> 228 </view>
133 <view class='divide_line_f5f5f5'></view> 229 <view class='divide_line_f5f5f5'></view>
134 - <template is="picker_cell_normal" data="{{...olderbirthDate}}" /> 230 + <template is="picker_cell_normal" data="{{...bankInfo}}" />
  231 + <view class='divide_line_f5f5f5'></view>
  232 + <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
135 <view class='divide_line_f5f5f5'></view> 233 <view class='divide_line_f5f5f5'></view>
  234 + <!-- <template is="picker_cell_normal" data="{{...loandatelongData}}" /> -->
136 <view style='height:90rpx'> 235 <view style='height:90rpx'>
137 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 236 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
138 - <text class='text_black_30 float_left'>被赡养人国籍(地区)</text>  
139 - <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text> 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='loan_datelong' type='number'></input>
140 </view> 239 </view>
141 - <view class='divide_line_f5f5f5'></view> 240 + </view>
142 241
143 - <template is="picker_cell_normal" data="{{...older_relativeData}}" /> 242 + </view>
  243 + <view wx:if="{{house_type=='house_fund_rent'}}">
144 244
  245 + <view style='padding:0 30rpx;'>
  246 + <template is="picker_cell_normal" data="{{...workingcityInfo}}" />
  247 + <view class='divide_line_f5f5f5'></view>
  248 + <template is="picker_cell_normal" data="{{...leasetypeData}}" />
145 <view class='divide_line_f5f5f5'></view> 249 <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='percentage' value='{{percentage}}'></input>  
151 - </view>  
152 - <!-- <view class='divide_line_f5f5f5'></view>  
153 - <view style='height:90rpx'>  
154 - <text class='text_black_30 float_left'>分摊比例</text>  
155 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' name='allocation_ratio'></input>  
156 - </view> -->  
157 - </view>  
158 - <!-- 大病医疗 -->  
159 - <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>  
160 <view style='height:90rpx'> 250 <view style='height:90rpx'>
161 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 251 <text style='color:red;font-size: 30rpx;line-height: 90rpx;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> 252 + <text class='text_black_30 float_left'>出租方名称</text>
  253 + <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>
164 </view> 254 </view>
165 <view class='divide_line_f5f5f5'></view> 255 <view class='divide_line_f5f5f5'></view>
166 -  
167 - <template is="picker_cell_normal" data="{{...cardtypeData}}" />  
168 - <view class='divide_line_f5f5f5'></view>  
169 <view style='height:90rpx'> 256 <view style='height:90rpx'>
170 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 257 <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> 258 + <text class='text_black_30 float_left'>出租方纳税人识别号</text>
  259 + <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
173 </view> 260 </view>
174 <view class='divide_line_f5f5f5'></view> 261 <view class='divide_line_f5f5f5'></view>
175 - <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> 262 + <template is="picker_cell_normal" data="{{...identifytypeData}}" />
176 <view class='divide_line_f5f5f5'></view> 263 <view class='divide_line_f5f5f5'></view>
177 <view style='height:90rpx'> 264 <view style='height:90rpx'>
178 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 265 <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> 266 + <text class='text_black_30 float_left'>证件号码</text>
  267 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' name='owner_id_cartd_no'></input>
181 </view> 268 </view>
182 - <view class='divide_line_f5f5f5'></view>  
183 - <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> 269 + </view>
  270 + <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
  271 + <view style='padding:0 30rpx;'>
  272 + <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
184 <view class='divide_line_f5f5f5'></view> 273 <view class='divide_line_f5f5f5'></view>
185 <view style='height:90rpx'> 274 <view style='height:90rpx'>
186 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
187 - <text class='text_black_30 float_left'>医疗支出总金额</text>  
188 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_amount' value='{{total_amount}}'></input> 275 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='detail_address'></input>
189 </view> 276 </view>
190 <view class='divide_line_f5f5f5'></view> 277 <view class='divide_line_f5f5f5'></view>
191 <view style='height:90rpx'> 278 <view style='height:90rpx'>
192 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 279 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
193 - <text class='text_black_30 float_left'>个人负担金额</text>  
194 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入金额' type='digit' name='amount_by_person' value='{{total_amount}}'></input> 280 + <text class='text_black_30 float_left'>租赁合同编号</text>
  281 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='rent_contract_no'></input>
195 </view> 282 </view>
  283 + <view class='divide_line_f5f5f5'></view>
  284 + <template is="picker_cell_normal" data="{{...leasestartDate}}" />
  285 + <view class='divide_line_f5f5f5'></view>
  286 + <template is="picker_cell_normal" data="{{...leaseendDate}}" />
196 </view> 287 </view>
197 - <!-- 住房 -->  
198 - <view wx:if="{{cur_index=='house_fund'}}">  
199 288
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 style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
208 - <text class='text_black_30 float_left'>证书号码</text>  
209 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='certification_no'></input>  
210 - </view>  
211 - <view class='divide_line_f5f5f5'></view> 289 + </view>
  290 +</view>
212 291
213 - <template is="picker_cell_normal" data="{{...beforemarryData}}" />  
214 - <view class='divide_line_f5f5f5'></view>  
215 - <template is="picker_cell_normal" data="{{...isselfData}}" /> 292 +<view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund'}}">
  293 + <view class='divide_line_f5f5f5'></view>
  294 + <template is="picker_cell_normal" data="{{...reducetypeData}}" />
  295 + <view class='divide_line_f5f5f5'></view>
  296 + <view style='height:90rpx'>
  297 + <text class='text_black_30 float_left'>扣除金额</text>
  298 + <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
  299 + <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
  300 + <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
  301 + </view>
  302 + <view class='divide_line_f5f5f5'></view>
216 303
217 - </view>  
218 -  
219 - <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>  
220 - <view style='padding:0 30rpx;'>  
221 - <template is="picker_cell_normal" data="{{...loantypeData}}" />  
222 - <view class='divide_line_f5f5f5'></view>  
223 - <view style='height:90rpx'>  
224 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
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='loan_contract_no'></input>  
227 - </view>  
228 - <view class='divide_line_f5f5f5'></view>  
229 - <template is="picker_cell_normal" data="{{...bankInfo}}" />  
230 - <view class='divide_line_f5f5f5'></view>  
231 - <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />  
232 - <view class='divide_line_f5f5f5'></view>  
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>  
239 - </view> 304 +</view>
240 305
241 - </view>  
242 - <view wx:if="{{house_type=='house_fund_rent'}}"> 306 +<view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
243 307
244 - <view style='padding:0 30rpx;'>  
245 - <template is="picker_cell_normal" data="{{...workingcityInfo}}" />  
246 - <view class='divide_line_f5f5f5'></view>  
247 - <template is="picker_cell_normal" data="{{...leasetypeData}}" />  
248 - <view class='divide_line_f5f5f5'></view>  
249 - <view style='height:90rpx'>  
250 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
251 - <text class='text_black_30 float_left'>出租方名称</text>  
252 - <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>  
253 - </view>  
254 - <view class='divide_line_f5f5f5'></view>  
255 - <view style='height:90rpx'>  
256 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
257 - <text class='text_black_30 float_left'>出租方纳税人识别号</text>  
258 - <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>  
259 - </view>  
260 - <view class='divide_line_f5f5f5'></view>  
261 - <template is="picker_cell_normal" data="{{...identifytypeData}}" />  
262 - <view class='divide_line_f5f5f5'></view>  
263 - <view style='height:90rpx'>  
264 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
265 - <text class='text_black_30 float_left'>证件号码</text>  
266 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' name='owner_id_cartd_no'></input>  
267 - </view>  
268 - </view>  
269 - <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>  
270 - <view style='padding:0 30rpx;'>  
271 - <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />  
272 - <view class='divide_line_f5f5f5'></view>  
273 - <view style='height:90rpx'>  
274 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='detail_address'></input>  
275 - </view>  
276 - <view class='divide_line_f5f5f5'></view>  
277 - <view style='height:90rpx'>  
278 - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>  
279 - <text class='text_black_30 float_left'>租赁合同编号</text>  
280 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='rent_contract_no'></input>  
281 - </view>  
282 - <view class='divide_line_f5f5f5'></view>  
283 - <template is="picker_cell_normal" data="{{...leasestartDate}}" />  
284 - <view class='divide_line_f5f5f5'></view>  
285 - <template is="picker_cell_normal" data="{{...leaseendDate}}" />  
286 - </view> 308 +<view style='padding:0 30rpx;'>
287 309
288 - </view> 310 + <view wx:if="{{cur_index=='children_education'}}">
  311 + <view style='height:90rpx'>
  312 + <text class='text_black_30 float_left'>配偶姓名</text>
  313 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
289 </view> 314 </view>
  315 + <view class='divide_line_f5f5f5'></view>
290 316
291 - <view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund'}}">  
292 - <view class='divide_line_f5f5f5'></view>  
293 - <template is="picker_cell_normal" data="{{...reducetypeData}}" />  
294 - <view class='divide_line_f5f5f5'></view>  
295 - <view style='height:90rpx'>  
296 - <text class='text_black_30 float_left'>扣除金额</text>  
297 - <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>  
298 - <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>  
299 - <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> --> 317 + <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
  318 + <view class='divide_line_f5f5f5'></view>
  319 + <view style='height:90rpx'>
  320 + <text class='text_black_30 float_left'>配偶证件号码</text>
  321 + <view wx:if="{{isIdCard}}">
  322 + <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
  323 + <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input>
300 </view> 324 </view>
301 - <view class='divide_line_f5f5f5'></view>  
302 -  
303 </view> 325 </view>
  326 + <view class='divide_line_f5f5f5'></view>
  327 + <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
  328 + <view class='divide_line_f5f5f5'></view>
  329 + <view style='height:90rpx'>
  330 + <text class='text_black_30 float_left'>国籍</text>
  331 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
  332 + </view>
  333 + </view>
304 334
305 - <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>  
306 -  
307 - <view style='padding:0 30rpx;'>  
308 -  
309 - <view wx:if="{{cur_index=='children_education'}}">  
310 - <view style='height:90rpx'>  
311 - <text class='text_black_30 float_left'>配偶姓名</text>  
312 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>  
313 - </view>  
314 - <view class='divide_line_f5f5f5'></view>  
315 -  
316 - <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />  
317 - <view class='divide_line_f5f5f5'></view>  
318 - <view style='height:90rpx'>  
319 - <text class='text_black_30 float_left'>配偶证件号码</text>  
320 - <view wx:if="{{isIdCard}}">  
321 - <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>  
322 - <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input>  
323 - </view>  
324 - </view>  
325 - <view class='divide_line_f5f5f5'></view>  
326 - <template is="picker_cell_normal" data="{{...loverbirthDate}}" />  
327 - <view class='divide_line_f5f5f5'></view>  
328 - <view style='height:90rpx'>  
329 - <text class='text_black_30 float_left'>国籍</text>  
330 - <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>  
331 - </view>  
332 - </view>  
333 -  
334 - <view wx:if="{{cur_index=='house_fund'}}">  
335 - <view style='height:90rpx'>  
336 - <text class='text_black_30 float_left'>配偶姓名</text>  
337 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>  
338 - </view>  
339 - <view class='divide_line_f5f5f5'></view> 335 + <view wx:if="{{cur_index=='house_fund'}}">
  336 + <view style='height:90rpx'>
  337 + <text class='text_black_30 float_left'>配偶姓名</text>
  338 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
  339 + </view>
  340 + <view class='divide_line_f5f5f5'></view>
340 341
341 - <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />  
342 - <view class='divide_line_f5f5f5'></view>  
343 - <view style='height:90rpx'>  
344 - <text class='text_black_30 float_left'>配偶证件号码</text>  
345 - <view wx:if="{{isIdCard}}">  
346 - <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>  
347 - <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input>  
348 - </view>  
349 - </view>  
350 - <view class='divide_line_f5f5f5'></view>  
351 - <template is="picker_cell_normal" data="{{...loverbirthDate}}" />  
352 - <view class='divide_line_f5f5f5'></view>  
353 - <view style='height:90rpx'>  
354 - <text class='text_black_30 float_left'>国籍</text>  
355 - <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>  
356 - </view> 342 + <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
  343 + <view class='divide_line_f5f5f5'></view>
  344 + <view style='height:90rpx'>
  345 + <text class='text_black_30 float_left'>配偶证件号码</text>
  346 + <view wx:if="{{isIdCard}}">
  347 + <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
  348 + <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input>
357 </view> 349 </view>
358 -  
359 </view> 350 </view>
360 - <!-- <view class='divide_line_f5f5f5'></view> 351 + <view class='divide_line_f5f5f5'></view>
  352 + <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
  353 + <view class='divide_line_f5f5f5'></view>
  354 + <view style='height:90rpx'>
  355 + <text class='text_black_30 float_left'>国籍</text>
  356 + <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
  357 + </view>
  358 + </view>
  359 +
  360 +</view>
  361 +<!-- <view class='divide_line_f5f5f5'></view>
361 <view class='text_black_30 float_left'>上传材料</view> --> 362 <view class='text_black_30 float_left'>上传材料</view> -->
362 - <view style='width:100%;height:180rpx;background:#f8f8f8'></view>  
363 - <!-- <view style='margin-bottom:140rpx'> 363 +<view style='width:100%;height:180rpx;background:#f8f8f8'></view>
  364 +<!-- <view style='margin-bottom:140rpx'>
364 <image src='{{img_path}}' style='width:100%;height:380rpx' bindtap='goupload'></image> 365 <image src='{{img_path}}' style='width:100%;height:380rpx' bindtap='goupload'></image>
365 <view class='text_999_30' style='text-align:center;margin:20rpx 30rpx'>{{extrainfo_arr[cur_index]}}</view> 366 <view class='text_999_30' style='text-align:center;margin:20rpx 30rpx'>{{extrainfo_arr[cur_index]}}</view>
366 </view> --> 367 </view> -->
367 - <view class="btn_bottom">  
368 - <button class="btn_bottom" formType="submit">提交申报</button>  
369 - </view>  
370 - </form> 368 +<view class="btn_bottom">
  369 + <button class="btn_bottom" formType="submit">提交申报</button>
  370 +</view>
  371 +</form>
371 </view> 372 </view>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class='page'> 2 <view class='page'>
3 3
4 <view style='margin-bottom:30rpxbackground:#fff'> 4 <view style='margin-bottom:30rpxbackground:#fff'>
5 - <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01"> 5 + <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'> 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text> 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}}'> 8 <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </view> 12 </view>
13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}"> 13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02"> 14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
15 - <view hidden="{{false}}"> 15 + <view >
16 <view class='divide_line' style='margin:0 50rpx'></view> 16 <view class='divide_line' style='margin:0 50rpx'></view>
17 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '> 17 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
18 <view style='height:40rpx'> 18 <view style='height:40rpx'>
@@ -21,9 +21,9 @@ @@ -21,9 +21,9 @@
21 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> 21 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
22 <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>查看</text> 22 <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>查看</text>
23 </view> 23 </view>
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'}}"> 24 + <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
  25 + <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
  26 + <view wx:if="{{itemtypedetail.continue_education_type=='title'}}">
27 <text style='font-size:28rpx;color:#666'>学历教育</text> 27 <text style='font-size:28rpx;color:#666'>学历教育</text>
28 <view style='width:100%;display:flex;flex-direction:row '> 28 <view style='width:100%;display:flex;flex-direction:row '>
29 <view class='float_left' style='flex:1'> 29 <view class='float_left' style='flex:1'>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </view> 36 </view>
37 </view> 37 </view>
38 </view> 38 </view>
39 - <view wx:if="{{itemdetail.continue_education_type=='major'||itemdetail.continue_education_type=='profession'}}"> 39 + <view wx:if="{{itemtypedetail.continue_education_type=='major'||itemdetail.continue_education_type=='profession'}}">
40 <text style='font-size:28rpx;color:#666'>非学历教育</text> 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> 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 '> 42 <view style='width:100%;display:flex;flex-direction:row '>
@@ -102,6 +102,9 @@ Page({ @@ -102,6 +102,9 @@ Page({
102 this.setData({ 102 this.setData({
103 showModal: false 103 showModal: false
104 }) 104 })
  105 + wx.navigateBack({
  106 + delta:1
  107 + })
105 }, 108 },
106 109
107 confirmhandle: function(e) { 110 confirmhandle: function(e) {
@@ -30,7 +30,7 @@ Page({ @@ -30,7 +30,7 @@ Page({
30 selected: '', 30 selected: '',
31 disabled: false, 31 disabled: false,
32 placeholder: '请选择关系', 32 placeholder: '请选择关系',
33 - values: ["子","女" ,"配偶", "父母", "祖父母", "外祖父母"], 33 + values: ["子","女" ,"配偶", "父母", "祖父母、外祖父母"],
34 onChange: 'onPickerSelect' 34 onChange: 'onPickerSelect'
35 }, 35 },
36 cardtypeData: { 36 cardtypeData: {
请 注册 或 登录 后发表评论