wangyu / naturalPersonTax · 提交

提交 0809407b146991c12d515d577ebfc0f17005acb3

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

优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 231 行增加 和 180 行删除

83.8 KB | 宽: | 高:

83.8 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
@@ -2,67 +2,72 @@ @@ -2,67 +2,72 @@
2 <scroll-view class='page'> 2 <scroll-view class='page'>
3 3
4 <!-- 子女教育 --> 4 <!-- 子女教育 -->
5 - <view style='margin:30rpx' wx:if="{{cur_status=='children_education'}}">  
6 - <view style='height:90rpx;width:100%;clear:both;'>  
7 - <text class='text_left'>子女证照类型</text>  
8 - <text class='text_right_333'>{{datas.children_id_card_type=='1'?"居民身份证":datas.children_id_card_type}}</text>  
9 - </view>  
10 - <view style='height:90rpx;width:100%;clear:both;'>  
11 - <text class='text_left'>子女证照号码</text>  
12 - <text class='text_right_333'>{{datas.children_id_card_no}}</text>  
13 - </view>  
14 - <view style='height:90rpx;width:100%;clear:both;'>  
15 - <text class='text_left'>子女姓名</text>  
16 - <text class='text_right_333'>{{datas.children_name}}</text>  
17 - </view>  
18 - <view style='height:90rpx;width:100%;clear:both;'>  
19 - <text class='text_left'>出生日期</text>  
20 - <text class='text_right_333'>{{datas.children_birthday}}</text>  
21 - </view>  
22 - <view style='height:90rpx;width:100%;clear:both;'>  
23 - <text class='text_left'>国籍</text>  
24 - <text class='text_right_333'>中国</text> 5 + <view wx:if="{{cur_status=='children_education'}}">
  6 + <view style='margin:30rpx'>
  7 + <view style='height:90rpx;width:100%;clear:both;'>
  8 + <text class='text_left'>子女证照类型</text>
  9 + <text class='text_right_333'>{{datas.children_id_card_type=='1'?"居民身份证":datas.children_id_card_type}}</text>
  10 + </view>
  11 + <view style='height:90rpx;width:100%;clear:both;'>
  12 + <text class='text_left'>子女证照号码</text>
  13 + <text class='text_right_333'>{{datas.children_id_card_no}}</text>
  14 + </view>
  15 + <view style='height:90rpx;width:100%;clear:both;'>
  16 + <text class='text_left'>子女姓名</text>
  17 + <text class='text_right_333'>{{datas.children_name}}</text>
  18 + </view>
  19 + <view style='height:90rpx;width:100%;clear:both;'>
  20 + <text class='text_left'>出生日期</text>
  21 + <text class='text_right_333'>{{datas.children_birthday}}</text>
  22 + </view>
  23 + <view style='height:90rpx;width:100%;clear:both;'>
  24 + <text class='text_left'>国籍</text>
  25 + <text class='text_right_333'>中国</text>
  26 + </view>
25 </view> 27 </view>
  28 +
26 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 29 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
27 - <view style='height:90rpx;width:100%;clear:both;'>  
28 - <text class='text_left'>分配比例</text>  
29 - <text class='text_right_333'>{{datas.percent}}%</text>  
30 - </view>  
31 - <view style='height:90rpx;width:100%;clear:both;'>  
32 - <text class='text_left'>子女学籍号</text>  
33 - <text class='text_right_333'>{{datas.student_no}}</text>  
34 - </view>  
35 - <view style='height:90rpx;width:100%;clear:both;'>  
36 - <text class='text_left'>子女受教育阶段</text>  
37 - <text class='text_right_333'>{{datas.education_period}}</text>  
38 - </view>  
39 - <view style='height:90rpx;width:100%;clear:both;'>  
40 - <text class='text_left'>受教育期间起</text>  
41 - <text class='text_right_333'>{{datas.education_start}}</text>  
42 - </view>  
43 - <view style='height:90rpx;width:100%;clear:both;'>  
44 - <text class='text_left'>教育终止时间</text>  
45 - <text class='text_right_333'>{{datas.education_end}}</text>  
46 - </view>  
47 - <view style='height:90rpx;width:100%;clear:both;'>  
48 - <text class='text_left'>就读国家(地区)</text>  
49 - <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国(大陆)'}}</text>  
50 - </view>  
51 - <view style='height:90rpx;width:100%;clear:both;'>  
52 - <text class='text_left'>就读学校名称</text>  
53 - <text class='text_right_333'>{{datas.school_name}}</text>  
54 - </view>  
55 - <!-- <view style='height:90rpx;width:100%'> 30 + <view style='margin:30rpx'>
  31 + <view style='height:90rpx;width:100%;clear:both;'>
  32 + <text class='text_left'>分配比例</text>
  33 + <text class='text_right_333'>{{datas.percent}}%</text>
  34 + </view>
  35 + <view style='height:90rpx;width:100%;clear:both;'>
  36 + <text class='text_left'>子女学籍号</text>
  37 + <text class='text_right_333'>{{datas.student_no}}</text>
  38 + </view>
  39 + <view style='height:90rpx;width:100%;clear:both;'>
  40 + <text class='text_left'>子女受教育阶段</text>
  41 + <text class='text_right_333'>{{datas.education_period}}</text>
  42 + </view>
  43 + <view style='height:90rpx;width:100%;clear:both;'>
  44 + <text class='text_left'>受教育期间起</text>
  45 + <text class='text_right_333'>{{datas.education_start}}</text>
  46 + </view>
  47 + <view style='height:90rpx;width:100%;clear:both;'>
  48 + <text class='text_left'>教育终止时间</text>
  49 + <text class='text_right_333'>{{datas.education_end}}</text>
  50 + </view>
  51 + <view style='height:90rpx;width:100%;clear:both;'>
  52 + <text class='text_left'>就读国家(地区)</text>
  53 + <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国(大陆)'}}</text>
  54 + </view>
  55 + <view style='height:90rpx;width:100%;clear:both;'>
  56 + <text class='text_left'>就读学校名称</text>
  57 + <text class='text_right_333'>{{datas.school_name}}</text>
  58 + </view>
  59 + <!-- <view style='height:90rpx;width:100%'>
56 <text class='text_left'>就读国家(地区)</text> 60 <text class='text_left'>就读国家(地区)</text>
57 <text class='text_right_333'>{{datas.education_end_new}}</text> 61 <text class='text_right_333'>{{datas.education_end_new}}</text>
58 </view> --> 62 </view> -->
59 - <view style='height:90rpx;width:100%;clear:both;'>  
60 - <text class='text_left'>扣除方式</text>  
61 - <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>  
62 - </view>  
63 - <view style='height:90rpx;width:100%;clear:both;'>  
64 - <text class='text_left'>扣除金额</text>  
65 - <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text> 63 + <view style='height:90rpx;width:100%;clear:both;'>
  64 + <text class='text_left'>扣除方式</text>
  65 + <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
  66 + </view>
  67 + <view style='height:90rpx;width:100%;clear:both;'>
  68 + <text class='text_left'>扣除金额</text>
  69 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
  70 + </view>
66 </view> 71 </view>
67 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 72 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
68 <view style='height:90rpx;width:100%;clear:both;'> 73 <view style='height:90rpx;width:100%;clear:both;'>
@@ -143,143 +148,163 @@ @@ -143,143 +148,163 @@
143 </view> 148 </view>
144 149
145 <!-- 住房 --> 150 <!-- 住房 -->
146 - <view style='padding:30rpx' wx:if="{{cur_status=='house_fund'}}"> 151 + <view wx:if="{{cur_status=='house_fund'}}">
147 <!-- 租赁 --> 152 <!-- 租赁 -->
148 <view wx:if="{{house_type=='house_fund_rent'}}"> 153 <view wx:if="{{house_type=='house_fund_rent'}}">
149 - <view style='height:90rpx;width:100%;clear:both;'>  
150 - <text class='text_left'>主要工作城市</text>  
151 - <text class='text_right_333'>{{datas.work_city_new}}</text>  
152 - </view>  
153 - <view style='height:90rpx;width:100%;clear:both;'>  
154 - <text class='text_left'>出租方类型</text>  
155 - <text class='text_right_333'>{{datas.owner_type}}</text>  
156 - </view>  
157 - <view style='height:90rpx;width:100%;clear:both;'>  
158 - <text class='text_left'>出租方名称</text>  
159 - <text class='text_right_333'>{{datas.owner_name}}</text>  
160 - </view>  
161 - <!-- <view style='height:90rpx;width:100%;clear:both;'> 154 + <view style='padding:30rpx'>
  155 + <view style='height:90rpx;width:100%;clear:both;'>
  156 + <text class='text_left'>主要工作城市</text>
  157 + <text class='text_right_333'>{{datas.work_city_new}}</text>
  158 + </view>
  159 + <view style='height:90rpx;width:100%;clear:both;'>
  160 + <text class='text_left'>出租方类型</text>
  161 + <text class='text_right_333'>{{datas.owner_type}}</text>
  162 + </view>
  163 + <view style='height:90rpx;width:100%;clear:both;'>
  164 + <text class='text_left'>出租方名称</text>
  165 + <text class='text_right_333'>{{datas.owner_name}}</text>
  166 + </view>
  167 + <!-- <view style='height:90rpx;width:100%;clear:both;'>
162 <view style='height:90rpx;float:left;display:flex;flex-direction:column'> 168 <view style='height:90rpx;float:left;display:flex;flex-direction:column'>
163 <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text> 169 <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>
164 </view> 170 </view>
165 <text class='text_right_333'>{{datas.owner_credit_no}}</text> 171 <text class='text_right_333'>{{datas.owner_credit_no}}</text>
166 </view> --> 172 </view> -->
167 - <view wx:if="{{datas.owner_type=='个人'}}"> 173 + <view wx:if="{{datas.owner_type=='个人'}}">
  174 + <view style='height:90rpx;width:100%;clear:both;'>
  175 + <text class='text_left'>证照类型</text>
  176 + <text class='text_right_333'>{{datas.owner_id_cartd_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text>
  177 + </view>
  178 + <view style='height:90rpx;width:100%;clear:both;'>
  179 + <text class='text_left'>证照号码</text>
  180 + <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
  181 + </view>
  182 + </view>
  183 + <view wx:if="{{datas.owner_type=='企业'}}">
  184 + <view style='height:90rpx;width:100%;clear:both;'>
  185 + <text class='text_left'>统一社会信用代码</text>
  186 + <text class='text_right_333'>{{datas.owner_credit_no}}</text>
  187 + </view>
  188 + </view>
  189 + </view>
  190 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  191 + <view style='padding:30rpx'>
168 <view style='height:90rpx;width:100%;clear:both;'> 192 <view style='height:90rpx;width:100%;clear:both;'>
169 - <text class='text_left'>证照类型</text>  
170 - <text class='text_right_333'>{{datas.owner_id_cartd_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text> 193 + <text class='text_left'>租赁房屋坐落地址</text>
  194 + <text class='text_right_333'>{{datas.house_address_new}}</text>
  195 + </view>
  196 + <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
  197 + <text class='text_right_333'>{{datas.house_detail_address}}</text>
171 </view> 198 </view>
172 <view style='height:90rpx;width:100%;clear:both;'> 199 <view style='height:90rpx;width:100%;clear:both;'>
173 - <text class='text_left'>证照号码</text>  
174 - <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text> 200 + <text class='text_left'>租赁合同编号</text>
  201 + <text class='text_right_333'>{{datas.rent_contract_no}}</text>
175 </view> 202 </view>
176 - </view>  
177 - <view wx:if="{{datas.owner_type=='企业'}}">  
178 <view style='height:90rpx;width:100%;clear:both;'> 203 <view style='height:90rpx;width:100%;clear:both;'>
179 - <text class='text_left'>统一社会信用代码</text>  
180 - <text class='text_right_333'>{{datas.owner_credit_no}}</text> 204 + <text class='text_left'>租赁期起</text>
  205 + <text class='text_right_333'>{{datas.rent_start}}</text>
  206 + </view>
  207 + <view style='height:90rpx;width:100%;clear:both;'>
  208 + <text class='text_left'>租赁期止</text>
  209 + <text class='text_right_333'>{{datas.rent_end}}</text>
  210 + </view>
  211 + <view style='height:90rpx;width:100%;clear:both;'>
  212 + <text class='text_left'>扣除方式</text>
  213 + <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
  214 + </view>
  215 + <view style='height:90rpx;width:100%;clear:both;'>
  216 + <text class='text_left'>扣除金额</text>
  217 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
181 </view> 218 </view>
182 </view> 219 </view>
183 220
184 - <view style='width:100%;height:20rpx;background:#f9f9f9'></view>  
185 - <view style='height:90rpx;width:100%;clear:both;'>  
186 - <text class='text_left'>租赁房屋坐落地址</text>  
187 - <text class='text_right_333'>{{datas.house_address_new}}</text>  
188 - </view>  
189 - <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>  
190 - <text class='text_right_333'>{{datas.house_detail_address}}</text>  
191 - </view>  
192 - <view style='height:90rpx;width:100%;clear:both;'>  
193 - <text class='text_left'>租赁合同编号</text>  
194 - <text class='text_right_333'>{{datas.rent_contract_no}}</text>  
195 - </view>  
196 - <view style='height:90rpx;width:100%;clear:both;'>  
197 - <text class='text_left'>租赁期起</text>  
198 - <text class='text_right_333'>{{datas.rent_start}}</text>  
199 - </view>  
200 - <view style='height:90rpx;width:100%;clear:both;'>  
201 - <text class='text_left'>租赁期止</text>  
202 - <text class='text_right_333'>{{datas.rent_end}}</text>  
203 - </view>  
204 </view> 221 </view>
205 <!-- //贷款 --> 222 <!-- //贷款 -->
206 <view wx:if="{{house_type=='house_fund_loan'}}"> 223 <view wx:if="{{house_type=='house_fund_loan'}}">
207 - <view style='height:90rpx;width:100%;clear:both;'>  
208 - <text class='text_left'>房屋坐落地址</text>  
209 - <text class='text_right_333'>{{datas.house_address_new}}</text>  
210 - </view>  
211 - <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>  
212 - <text class='text_right_333'>{{datas.house_detail_address}}</text>  
213 - </view>  
214 - <view style='height:90rpx;width:100%;clear:both;'>  
215 - <text class='text_left'>证书类型</text>  
216 - <text class='text_right_333'>{{datas.certification_type}}</text>  
217 - </view>  
218 - <view style='height:90rpx;width:100%;clear:both;'>  
219 - <text class='text_left'>证书号码</text>  
220 - <text class='text_right_333'>{{datas.certification_no}}</text>  
221 - </view>  
222 - <view style='height:90rpx;width:100%;clear:both;'>  
223 - <text class='text_left'>是否首套婚前贷款且婚后各自扣除：</text>  
224 - <text class='text_right_333'>{{item.loan_before_marry=='y'?"是":"否"}}</text>  
225 - </view>  
226 - <view style='height:90rpx;width:100%;clear:both;'>  
227 - <text class='text_left'>是否本人借款</text>  
228 - <text class='text_right_333'>{{datas.certification_type}}</text> 224 + <view style='padding:30rpx'>
  225 + <view style='height:90rpx;width:100%;clear:both;'>
  226 + <text class='text_left'>房屋坐落地址</text>
  227 + <text class='text_right_333'>{{datas.house_address_new}}</text>
  228 + </view>
  229 + <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
  230 + <text class='text_right_333'>{{datas.house_detail_address}}</text>
  231 + </view>
  232 + <view style='height:90rpx;width:100%;clear:both;'>
  233 + <text class='text_left'>证书类型</text>
  234 + <text class='text_right_333'>{{datas.certification_type}}</text>
  235 + </view>
  236 + <view style='height:90rpx;width:100%;clear:both;'>
  237 + <text class='text_left'>证书号码</text>
  238 + <text class='text_right_333'>{{datas.certification_no}}</text>
  239 + </view>
  240 + <view style='height:90rpx;width:100%;clear:both;'>
  241 + <text class='text_left'>是否首套婚前贷款且婚后各自扣除：</text>
  242 + <text class='text_right_333'>{{item.loan_before_marry=='y'?"是":"否"}}</text>
  243 + </view>
  244 + <view style='height:90rpx;width:100%;clear:both;'>
  245 + <text class='text_left'>是否本人借款</text>
  246 + <text class='text_right_333'>{{datas.certification_type}}</text>
  247 + </view>
229 </view> 248 </view>
  249 +
230 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 250 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
231 - <view style='height:90rpx;width:100%;clear:both;'>  
232 - <text class='text_left'>贷款类型</text>  
233 - <text class='text_right_333'>{{datas.loan_type}}</text>  
234 - </view>  
235 - <view style='height:90rpx;width:100%;clear:both;'>  
236 - <text class='text_left'>贷款合同编号</text>  
237 - <text class='text_right_333'>{{datas.loan_contract_no}}</text>  
238 - </view>  
239 - <view style='height:90rpx;width:100%;clear:both;'>  
240 - <text class='text_left'>首次还款日期</text>  
241 - <text class='text_right_333'>{{datas.loan_start}}</text>  
242 - </view>  
243 - <view style='height:90rpx;width:100%;clear:both;'>  
244 - <text class='text_left'>贷款期限(月数)</text>  
245 - <text class='text_right_333'>{{datas.loan_months}}</text> 251 + <view style='padding:30rpx'>
  252 + <view style='height:90rpx;width:100%;clear:both;'>
  253 + <text class='text_left'>贷款类型</text>
  254 + <text class='text_right_333'>{{datas.loan_type}}</text>
  255 + </view>
  256 + <view style='height:90rpx;width:100%;clear:both;'>
  257 + <text class='text_left'>贷款合同编号</text>
  258 + <text class='text_right_333'>{{datas.loan_contract_no}}</text>
  259 + </view>
  260 + <view style='height:90rpx;width:100%;clear:both;'>
  261 + <text class='text_left'>首次还款日期</text>
  262 + <text class='text_right_333'>{{datas.loan_start}}</text>
  263 + </view>
  264 + <view style='height:90rpx;width:100%;clear:both;'>
  265 + <text class='text_left'>贷款期限(月数)</text>
  266 + <text class='text_right_333'>{{datas.loan_months}}</text>
  267 + </view>
  268 + <view style='height:90rpx;width:100%;clear:both;'>
  269 + <text class='text_left'>扣除方式</text>
  270 + <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
  271 + </view>
  272 + <view style='height:90rpx;width:100%;clear:both;'>
  273 + <text class='text_left'>扣除金额</text>
  274 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>
  275 + </view>
246 </view> 276 </view>
  277 +
247 </view> 278 </view>
248 - <view style='height:90rpx;width:100%;clear:both;'>  
249 - <text class='text_left'>扣除方式</text>  
250 - <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>  
251 - </view>  
252 - <view style='height:90rpx;width:100%;clear:both;'>  
253 - <text class='text_left'>扣除金额</text>  
254 - <text class='text_right_orange'>￥{{datas.deduction_amount}}/{{reducetype[datas.deduction_type]}}</text>  
255 - </view> 279 +
256 <view style='width:100%;height:20rpx;background:#f9f9f9'></view> 280 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
257 - <view style='height:90rpx;width:100%;clear:both;'>  
258 - <text class='text_left'>是否有配偶</text>  
259 - <text class='text_right_333'>{{datas.has_spouse=='y'?"是":"否"}}</text>  
260 - </view>  
261 - <view wx:if="{{datas.has_spouse=='y'}}"> 281 + <view style='padding:30rpx'>
262 <view style='height:90rpx;width:100%;clear:both;'> 282 <view style='height:90rpx;width:100%;clear:both;'>
263 - <text class='text_left'>配偶姓名</text>  
264 - <text class='text_right_333'>{{datas.spouse_name}}</text> 283 + <text class='text_left'>是否有配偶</text>
  284 + <text class='text_right_333'>{{datas.has_spouse=='y'?"是":"否"}}</text>
265 </view> 285 </view>
266 - <view style='height:90rpx;width:100%;clear:both;'>  
267 - <text class='text_left'>配偶证照类型</text>  
268 - <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>  
269 - </view>  
270 - <view style='height:90rpx;width:100%;clear:both;'>  
271 - <text class='text_left'>配偶身份证照号码</text>  
272 - <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>  
273 - </view>  
274 - <view style='height:90rpx;width:100%;clear:both;'>  
275 - <text class='text_left'>出生日期</text>  
276 - <text class='text_right_333'>{{datas.birthday}}</text>  
277 - </view>  
278 - <view style='height:90rpx;width:100%;clear:both;'>  
279 - <text class='text_left'>国籍</text>  
280 - <text class='text_right_333'>中国</text> 286 + <view wx:if="{{datas.has_spouse=='y'}}">
  287 + <view style='height:90rpx;width:100%;clear:both;'>
  288 + <text class='text_left'>配偶姓名</text>
  289 + <text class='text_right_333'>{{datas.spouse_name}}</text>
  290 + </view>
  291 + <view style='height:90rpx;width:100%;clear:both;'>
  292 + <text class='text_left'>配偶证照类型</text>
  293 + <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
  294 + </view>
  295 + <view style='height:90rpx;width:100%;clear:both;'>
  296 + <text class='text_left'>配偶身份证照号码</text>
  297 + <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
  298 + </view>
  299 + <view style='height:90rpx;width:100%;clear:both;'>
  300 + <text class='text_left'>出生日期</text>
  301 + <text class='text_right_333'>{{datas.birthday}}</text>
  302 + </view>
  303 + <view style='height:90rpx;width:100%;clear:both;'>
  304 + <text class='text_left'>国籍</text>
  305 + <text class='text_right_333'>中国</text>
  306 + </view>
281 </view> 307 </view>
282 </view> 308 </view>
283 -  
284 </view> 309 </view>
285 </scroll-view> 310 </scroll-view>
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 house_type: "", 14 house_type: "",
15 person_total_amount:0, 15 person_total_amount:0,
16 remaining_amount: 0, 16 remaining_amount: 0,
  17 + input_disable:false,
17 declareStatus: { 18 declareStatus: {
18 "to_declare": "待申报", 19 "to_declare": "待申报",
19 "declaring": "申报中", 20 "declaring": "申报中",
@@ -57,6 +58,7 @@ Page({ @@ -57,6 +58,7 @@ Page({
57 bindtype: 'issingle_child', 58 bindtype: 'issingle_child',
58 selected: '', 59 selected: '',
59 isblack: '', 60 isblack: '',
  61 + disabled: false,
60 placeholder: '请选择是否独生子女', 62 placeholder: '请选择是否独生子女',
61 values: ["是", "否"], 63 values: ["是", "否"],
62 onChange: 'onPickerSelect' 64 onChange: 'onPickerSelect'
@@ -66,6 +68,7 @@ Page({ @@ -66,6 +68,7 @@ Page({
66 bindtype: 'share_method', 68 bindtype: 'share_method',
67 selected: '', 69 selected: '',
68 isblack: '', 70 isblack: '',
  71 + disabled: false,
69 values: ["赡养人平均分摊", "赡养人约定分摊", "被赡养人指定分摊"], 72 values: ["赡养人平均分摊", "赡养人约定分摊", "被赡养人指定分摊"],
70 placeholder: '请选择分摊方式', 73 placeholder: '请选择分摊方式',
71 onChange: 'onPickerSelect' 74 onChange: 'onPickerSelect'
@@ -162,6 +165,22 @@ Page({ @@ -162,6 +165,22 @@ Page({
162 165
163 handleAddition: function(data) { 166 handleAddition: function(data) {
164 var newdata = data.items 167 var newdata = data.items
  168 + if (newdata && newdata.length>0){
  169 + var issinglechild_Data = this.data.issinglechildData;
  170 + issinglechild_Data.disabled = true;
  171 + issinglechild_Data.selected = data.is_single=='y'?"是":"否";
  172 +
  173 + var shareMethod_Data = this.data.shareMethodData;
  174 + shareMethod_Data.disabled = true;
  175 + shareMethod_Data.selected = data.share_method;
  176 +
  177 + this.setData({
  178 + issinglechildData: issinglechild_Data,
  179 + shareMethodData: shareMethod_Data,
  180 + reduce_amount: data.month_deduction_amount,
  181 + input_disable:true
  182 + })
  183 + }
165 for (var i = 0; i < newdata.length; i++) { 184 for (var i = 0; i < newdata.length; i++) {
166 if (newdata[i].education_start) { 185 if (newdata[i].education_start) {
167 newdata[i].education_start = this.formatDate(newdata[i].education_start) 186 newdata[i].education_start = this.formatDate(newdata[i].education_start)
@@ -21,9 +21,9 @@ @@ -21,9 +21,9 @@
21 <template is="picker_cell_normal" data="{{...shareMethodData}}" /> 21 <template is="picker_cell_normal" data="{{...shareMethodData}}" />
22 <view class='divide_line_f5f5f5'></view> 22 <view class='divide_line_f5f5f5'></view>
23 <view style='height:90rpx'> 23 <view style='height:90rpx'>
24 - <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666'>本年度月扣除金额</text> 24 + <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;margin-left:26rpx'>本年度月扣除金额</text>
25 <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text> 25 <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
26 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput'></input> 26 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput' disabled='{{input_disable}}' value='{{reduce_amount>0?reduce_amount:""}}'></input>
27 </view> 27 </view>
28 </view> 28 </view>
29 <view wx:elif="{{issinglechildData.selected=='是'}}"> 29 <view wx:elif="{{issinglechildData.selected=='是'}}">
@@ -330,13 +330,20 @@ @@ -330,13 +330,20 @@
330 <view style='padding-right: 30rpx'> 330 <view style='padding-right: 30rpx'>
331 <view class='divide_line_f5f5f5'></view> 331 <view class='divide_line_f5f5f5'></view>
332 <view style='display:flex;flex-direction:row'> 332 <view style='display:flex;flex-direction:row'>
333 - <view wx:if="{{house_type=='house_fund_rent'}}" class='text_999_28 float_left' style='line-height:70rpx;width:248rpx;text-align:left'>租赁房屋坐落地址：</view>  
334 - <text wx:if="{{house_type=='house_fund_loan'}}" class='text_999_28 float_left' style='line-height:70rpx;width:192rpx;text-align:left'>房屋坐落地址：</text>  
335 - <view style='display:flex;flex-direction:column'>  
336 - <text class='text_333_28 text_singleline' style='line-height:70rpx;margin-left:20rpx;'>{{item.house_address_new}}</text>  
337 - <text class='text_999_28 text_singleline' style='line-height:70rpx;margin-left:20rpx;text-align:left'>{{item.house_detail_address}}</text> 333 + <view wx:if="{{house_type!='house_fund_rent'}}">
  334 + <view class='text_999_28 float_left' style='line-height:70rpx;width:248rpx;text-align:left;white-space:nowrap;'>租赁房屋坐落地址：</view>
  335 + <view style='display:flex;flex-direction:column;max-width:392rpx;'>
  336 + <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
  337 + <text class='text_999_28 text_singleline' style='line-height:70rpx:text-align:left'>{{item.house_detail_address}}</text>
  338 + </view>
  339 + </view>
  340 + <view wx:if="{{house_type!='house_fund_loan'}}">
  341 + <text class='text_999_28 float_left' style='line-height:70rpx;width:192rpx;text-align:left;white-space:nowrap;'>房屋坐落地址：</text>
  342 + <view style='display:flex;flex-direction:column;max-width:450rpx;'>
  343 + <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
  344 + <text class='text_999_28 text_singleline' style='line-height:70rpx:text-align:left'>{{item.house_detail_address}}</text>
  345 + </view>
338 </view> 346 </view>
339 -  
340 </view> 347 </view>
341 <!-- <view wx:if="{{house_type=='house_fund_loan'}}"> 348 <!-- <view wx:if="{{house_type=='house_fund_loan'}}">
342 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text> 349 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 } 132 }
133 133
134 .input_wrap { 134 .input_wrap {
135 - width: 360rpx; 135 + width: 350rpx;
136 height: 90rpx; 136 height: 90rpx;
137 font-size: 30rpx; 137 font-size: 30rpx;
138 color: #333; 138 color: #333;
@@ -28,16 +28,16 @@ @@ -28,16 +28,16 @@
28 </view> 28 </view>
29 </view> 29 </view>
30 <view wx:for="{{datas}}" style='background:#fff'> 30 <view wx:for="{{datas}}" style='background:#fff'>
31 - <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view> 31 + <view style='height:20rpx;background:#FCFCFC'></view>
32 <view class='view_bg_wrap' bindtap='godetail' id='index'> 32 <view class='view_bg_wrap' bindtap='godetail' id='index'>
33 <view style='flex:2;text-align:center;'> 33 <view style='flex:2;text-align:center;'>
34 <text style='font-size: 28rpx;color: #999'>{{index+1}}月</text> 34 <text style='font-size: 28rpx;color: #999'>{{index+1}}月</text>
35 </view> 35 </view>
36 <view style='flex:3;display:flex;flex-direction:column;padding-top:12rpx'> 36 <view style='flex:3;display:flex;flex-direction:column;padding-top:12rpx'>
37 <text style='font-size: 24rpx;color: #999;'>工资薪金</text> 37 <text style='font-size: 24rpx;color: #999;'>工资薪金</text>
38 - <text style='font-size: 28rpx;color: #999;'>30000.00</text> 38 + <text style='font-size: 28rpx;color: #999;'>10000.00</text>
39 <text style='font-size: 24rpx;color: #999;margin-top:8rpx'>薪酬所得</text> 39 <text style='font-size: 24rpx;color: #999;margin-top:8rpx'>薪酬所得</text>
40 - <text style='font-size: 28rpx;color: #999;'>29100.00</text> 40 + <text style='font-size: 28rpx;color: #999;'>9100.00</text>
41 </view> 41 </view>
42 <view style='flex:3;display:flex;flex-direction:column;padding-top:12rpx'> 42 <view style='flex:3;display:flex;flex-direction:column;padding-top:12rpx'>
43 <text style='font-size: 28rpx;color: #999;'>500.00</text> 43 <text style='font-size: 28rpx;color: #999;'>500.00</text>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </view> 50 </view>
51 </view> 51 </view>
52 </view> 52 </view>
53 - <view style='height:2rpx;width:100%;background:#f5f5f5;margin-top:20rpx'></view> 53 + <view style='height:20rpx;width:100%;background:#f5f5f5;'></view>
54 54
55 <view class='view_bg_wrap' style='height:90rpx;background:#fff;padding-bottom:100rpx'> 55 <view class='view_bg_wrap' style='height:90rpx;background:#fff;padding-bottom:100rpx'>
56 <view style='flex:2;padding-top:12rpx;text-align:center'> 56 <view style='flex:2;padding-top:12rpx;text-align:center'>
请 注册 或 登录 后发表评论