wangyu / naturalPersonTax · 提交

提交 b41cc0dfec5e47ca856b8d226c232c7f6e32729a

作者 wangyu
2 个父辈 230fd5e3 a054e61c
构建： 未知

Merge branch 'dev_wy' into 机器人dev

内嵌 并排对比
正在显示 1 个修改的文件 包含 16 行增加 和 16 行删除
@@ -50,17 +50,17 @@ @@ -50,17 +50,17 @@
50 </view> 50 </view>
51 <view style='height:90rpx;width:100%;clear:both;'> 51 <view style='height:90rpx;width:100%;clear:both;'>
52 <text class='text_left'>受教育时间止</text> 52 <text class='text_left'>受教育时间止</text>
53 - <text class='text_right_333'>{{datas.education_end}}</text> 53 + <text class='text_right_333'>{{datas.education_end.length>0?datas.education_end:"--"}}</text>
54 </view> 54 </view>
55 - <view wx:if="{{datas.education_period_end&&datas.education_period_end.length>1}}" style='height:90rpx;width:100%;clear:both;'> 55 + <view style='height:90rpx;width:100%;clear:both;'>
56 <text class='text_left'>教育终止时间</text> 56 <text class='text_left'>教育终止时间</text>
57 - <text class='text_right_333'>{{datas.education_period_end}}</text> 57 + <text class='text_right_333'>{{datas.education_period_end.length>0?datas.education_period_end:"--"}}</text>
58 </view> 58 </view>
59 - <view wx:if="{{datas.school_country&&datas.school_country.length>1}}" style='height:90rpx;width:100%;clear:both;'> 59 + <view style='height:90rpx;width:100%;clear:both;'>
60 <text class='text_left'>就读国家(地区)</text> 60 <text class='text_left'>就读国家(地区)</text>
61 <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国'}}</text> 61 <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国'}}</text>
62 </view> 62 </view>
63 - <view wx:if="{{datas.school_name&&datas.school_name.length>1}}" style='width:100%;clear:both;'> 63 + <view style='width:100%;clear:both;'>
64 <text class='text_left'>就读学校名称</text> 64 <text class='text_left'>就读学校名称</text>
65 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.school_name}}</view> 65 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.school_name}}</view>
66 <!-- <text class='text_right_333'>{{datas.school_name}}</text> --> 66 <!-- <text class='text_right_333'>{{datas.school_name}}</text> -->
@@ -172,9 +172,9 @@ @@ -172,9 +172,9 @@
172 <text class='text_left'>出租方类型</text> 172 <text class='text_left'>出租方类型</text>
173 <text class='text_right_333'>{{datas.owner_type}}</text> 173 <text class='text_right_333'>{{datas.owner_type}}</text>
174 </view> 174 </view>
175 - <view wx:if="{{datas.owner_name&&datas.owner_name.length>1}}" style='width:100%;clear:both;'> 175 + <view style='width:100%;clear:both;'>
176 <text class='text_left'>出租方名称</text> 176 <text class='text_left'>出租方名称</text>
177 - <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.owner_name}}</view> 177 + <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.owner_name.length>0?datas.owner_name:"--"}}</view>
178 <!-- <text class='text_right_333'>{{datas.owner_name}}</text> --> 178 <!-- <text class='text_right_333'>{{datas.owner_name}}</text> -->
179 </view> 179 </view>
180 <!-- <view style='height:90rpx;width:100%;clear:both;'> 180 <!-- <view style='height:90rpx;width:100%;clear:both;'>
@@ -186,17 +186,17 @@ @@ -186,17 +186,17 @@
186 <view wx:if="{{datas.owner_type=='个人'}}"> 186 <view wx:if="{{datas.owner_type=='个人'}}">
187 <view wx:if="{{datas.owner_id_card_type&&datas.owner_id_card_type.length>1}}" style='height:90rpx;width:100%;clear:both;'> 187 <view wx:if="{{datas.owner_id_card_type&&datas.owner_id_card_type.length>1}}" style='height:90rpx;width:100%;clear:both;'>
188 <text class='text_left'>证照类型</text> 188 <text class='text_left'>证照类型</text>
189 - <text class='text_right_333'>{{datas.owner_id_card_type=='1'?"居民身份证":datas.owner_id_card_type}}</text> 189 + <text class='text_right_333'>{{datas.owner_id_card_type.length>0?datas.owner_id_card_type:"--"}}</text>
190 </view> 190 </view>
191 - <view wx:if="{{datas.owner_id_card_no&&datas.owner_id_card_no.length>1}}" style='height:90rpx;width:100%;clear:both;'> 191 + <view style='height:90rpx;width:100%;clear:both;'>
192 <text class='text_left'>证照号码</text> 192 <text class='text_left'>证照号码</text>
193 - <text class='text_right_333'>{{datas.owner_id_card_no}}</text> 193 + <text class='text_right_333'>{{datas.owner_id_card_no.length>0?datas.owner_id_card_no:"--"}}</text>
194 </view> 194 </view>
195 </view> 195 </view>
196 <view wx:if="{{datas.owner_type=='组织'}}"> 196 <view wx:if="{{datas.owner_type=='组织'}}">
197 <view style='height:90rpx;width:100%;clear:both;'> 197 <view style='height:90rpx;width:100%;clear:both;'>
198 <text class='text_left'>统一社会信用代码</text> 198 <text class='text_left'>统一社会信用代码</text>
199 - <text class='text_right_333'>{{datas.owner_credit_no}}</text> 199 + <text class='text_right_333'>{{datas.owner_credit_no.length>0?datas.owner_credit_no:"--"}}</text>
200 </view> 200 </view>
201 </view> 201 </view>
202 </view> 202 </view>
@@ -204,15 +204,15 @@ @@ -204,15 +204,15 @@
204 <view style='padding:0 30rpx'> 204 <view style='padding:0 30rpx'>
205 <view style='height:90rpx;width:100%;clear:both;'> 205 <view style='height:90rpx;width:100%;clear:both;'>
206 <text class='text_left'>租赁房屋坐落地址</text> 206 <text class='text_left'>租赁房屋坐落地址</text>
207 - <text class='text_right_333'>{{datas.house_address_new}}</text> 207 + <text class='text_right_333'>{{datas.house_address_new.length>0?datas.house_address_new:"--"}}</text>
208 </view> 208 </view>
209 <view wx:if="{{datas.house_detail_address.length>0}}" style='clear:both;'> 209 <view wx:if="{{datas.house_detail_address.length>0}}" style='clear:both;'>
210 <!-- <text class='text_right_333' style='line-height:40rpx;'>{{datas.house_detail_address}}</text> --> 210 <!-- <text class='text_right_333' style='line-height:40rpx;'>{{datas.house_detail_address}}</text> -->
211 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;'>{{datas.house_detail_address}}</view> 211 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;'>{{datas.house_detail_address}}</view>
212 </view> 212 </view>
213 - <view wx:if="{{datas.rent_contract_no&&datas.rent_contract_no.length>0}}" style='height:90rpx;width:100%;clear:both;'> 213 + <view style='height:90rpx;width:100%;clear:both;'>
214 <text class='text_left'>租赁合同编号</text> 214 <text class='text_left'>租赁合同编号</text>
215 - <text class='text_right_333'>{{datas.rent_contract_no}}</text> 215 + <text class='text_right_333'>{{datas.rent_contract_no.length>0?datas.rent_contract_no:"--"}}</text>
216 </view> 216 </view>
217 <view style='height:90rpx;width:100%;clear:both;'> 217 <view style='height:90rpx;width:100%;clear:both;'>
218 <text class='text_left'>租赁期起</text> 218 <text class='text_left'>租赁期起</text>
@@ -236,9 +236,9 @@ @@ -236,9 +236,9 @@
236 <!-- //贷款 --> 236 <!-- //贷款 -->
237 <view wx:if="{{house_type=='house_fund_loan'}}"> 237 <view wx:if="{{house_type=='house_fund_loan'}}">
238 <view style='padding:0 30rpx'> 238 <view style='padding:0 30rpx'>
239 - <view wx:if="{{datas.house_address_new&&datas.house_address_new.length>0}}" style='height:90rpx;width:100%;clear:both;'> 239 + <view style='height:90rpx;width:100%;clear:both;'>
240 <text class='text_left'>房屋坐落地址</text> 240 <text class='text_left'>房屋坐落地址</text>
241 - <text class='text_right_333'>{{datas.house_address_new}}</text> 241 + <text class='text_right_333'>{{datas.house_address_new.length>0?datas.house_address_new:"--"}}</text>
242 </view> 242 </view>
243 <view style='clear:both;'> 243 <view style='clear:both;'>
244 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;'>{{datas.house_detail_address}}</view> 244 <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;'>{{datas.house_detail_address}}</view>
请 注册 或 登录 后发表评论