正在显示
3 个修改的文件
包含
16 行增加
和
13 行删除
@@ -44,13 +44,13 @@ | @@ -44,13 +44,13 @@ | ||
44 | <text class='text_left'>受教育期间起</text> | 44 | <text class='text_left'>受教育期间起</text> |
45 | <text class='text_right_333'>{{datas.education_start}}</text> | 45 | <text class='text_right_333'>{{datas.education_start}}</text> |
46 | </view> | 46 | </view> |
47 | - <!-- <view style='height:90rpx;width:100%;clear:both;'> | 47 | + <view style='height:90rpx;width:100%;clear:both;'> |
48 | <text class='text_left'>受教育期间止</text> | 48 | <text class='text_left'>受教育期间止</text> |
49 | <text class='text_right_333'>{{datas.education_end}}</text> | 49 | <text class='text_right_333'>{{datas.education_end}}</text> |
50 | - </view> --> | 50 | + </view> |
51 | <view wx:if="{{datas.education_end&&datas.education_end.length>1}}" style='height:90rpx;width:100%;clear:both;'> | 51 | <view wx:if="{{datas.education_end&&datas.education_end.length>1}}" 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_period_end}}</text> |
54 | </view> | 54 | </view> |
55 | <view 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> |
@@ -125,7 +125,7 @@ Page({ | @@ -125,7 +125,7 @@ Page({ | ||
125 | } | 125 | } |
126 | this.setData({ | 126 | this.setData({ |
127 | cur_status: housestatus, | 127 | cur_status: housestatus, |
128 | - employee_status: options.employee_status, | 128 | + employee_status: options.employee_status ? options.employee_status:"", |
129 | house_type: housetype, | 129 | house_type: housetype, |
130 | legal_entity_id: options.legal_entity_id, | 130 | legal_entity_id: options.legal_entity_id, |
131 | legal_entity: options.legal_entity, | 131 | legal_entity: options.legal_entity, |
@@ -257,6 +257,9 @@ Page({ | @@ -257,6 +257,9 @@ Page({ | ||
257 | if (newdata[i].education_end) { | 257 | if (newdata[i].education_end) { |
258 | newdata[i].education_end = this.formatDate(newdata[i].education_end).substring(0, 7) | 258 | newdata[i].education_end = this.formatDate(newdata[i].education_end).substring(0, 7) |
259 | } | 259 | } |
260 | + if (newdata[i].education_period_end) { | ||
261 | + newdata[i].education_period_end = this.formatDate(newdata[i].education_period_end).substring(0, 7) | ||
262 | + } | ||
260 | if (newdata[i].patient_birthday) { | 263 | if (newdata[i].patient_birthday) { |
261 | newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday) | 264 | newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday) |
262 | } | 265 | } |
@@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
77 | </view> | 77 | </view> |
78 | <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view> | 78 | <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view> |
79 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | 79 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> |
80 | - <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 80 | + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
81 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{index}}" bindtap='godelete'>删除</text> | 81 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{index}}" bindtap='godelete'>删除</text> |
82 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 82 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> |
83 | </view> | 83 | </view> |
@@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
111 | <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止:</text> | 111 | <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止:</text> |
112 | <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text> | 112 | <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text> |
113 | </view> | 113 | </view> |
114 | - <view wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 114 | + <view wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
115 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='goedit'>编辑</text> | 115 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='goedit'>编辑</text> |
116 | <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='godelete'>删除</text> | 116 | <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='godelete'>删除</text> |
117 | </view> | 117 | </view> |
@@ -161,7 +161,7 @@ | @@ -161,7 +161,7 @@ | ||
161 | <text class='text_999_28 ' style='line-height:70rpx'>发证机关:</text> | 161 | <text class='text_999_28 ' style='line-height:70rpx'>发证机关:</text> |
162 | <view class='float_right' style='padding-top:14rpx; font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{item.certification_authority}}</view> | 162 | <view class='float_right' style='padding-top:14rpx; font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{item.certification_authority}}</view> |
163 | </view> | 163 | </view> |
164 | - <view wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 164 | + <view wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
165 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text> | 165 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text> |
166 | <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='godelete'>删除</text> | 166 | <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='godelete'>删除</text> |
167 | </view> | 167 | </view> |
@@ -204,14 +204,14 @@ | @@ -204,14 +204,14 @@ | ||
204 | </view> | 204 | </view> |
205 | <view class='divide_line_f5f5f5'></view> | 205 | <view class='divide_line_f5f5f5'></view> |
206 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | 206 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> |
207 | - <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 207 | + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
208 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'support_duty'+index}}" bindtap='godelete'>删除</text> | 208 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'support_duty'+index}}" bindtap='godelete'>删除</text> |
209 | <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'support_duty'+index}}" bindtap='goedit'>编辑</text> | 209 | <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'support_duty'+index}}" bindtap='goedit'>编辑</text> |
210 | </view> | 210 | </view> |
211 | </view> | 211 | </view> |
212 | </view> | 212 | </view> |
213 | </view> | 213 | </view> |
214 | - <view style='background:#FFF;padding:30rpx' wx:if="{{employee_status=='active'}}"> | 214 | + <view style='background:#FFF;padding:30rpx' wx:if="{{employee_status!='inactive'}}"> |
215 | <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;border-radius:5px;' id="{{index}}" bindtap='goadd'> | 215 | <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;border-radius:5px;' id="{{index}}" bindtap='goadd'> |
216 | 添加 | 216 | 添加 |
217 | </view> | 217 | </view> |
@@ -249,7 +249,7 @@ | @@ -249,7 +249,7 @@ | ||
249 | <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系:</text> | 249 | <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系:</text> |
250 | <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text> | 250 | <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text> |
251 | </view> | 251 | </view> |
252 | - <view class='float_right' wx:if="{{employee_status=='active'}}"> | 252 | + <view class='float_right' wx:if="{{employee_status!='inactive'}}"> |
253 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text> | 253 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text> |
254 | <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text> | 254 | <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text> |
255 | </view> | 255 | </view> |
@@ -259,7 +259,7 @@ | @@ -259,7 +259,7 @@ | ||
259 | 259 | ||
260 | </view> | 260 | </view> |
261 | <view> | 261 | <view> |
262 | - <view style='margin-left:30rpx' wx:if="{{employee_status=='active'&&issinglechildData.selected!='是'}}"> | 262 | + <view style='margin-left:30rpx' wx:if="{{employee_status!='inactive'&&issinglechildData.selected!='是'}}"> |
263 | <!-- <text class='text_999_28'>您还没有添加继续共同赡养人,</text> --> | 263 | <!-- <text class='text_999_28'>您还没有添加继续共同赡养人,</text> --> |
264 | <text class='text_blue_28' bindtap='goaddSupporter'>添加共同赡养人</text> | 264 | <text class='text_blue_28' bindtap='goaddSupporter'>添加共同赡养人</text> |
265 | </view> | 265 | </view> |
@@ -321,7 +321,7 @@ | @@ -321,7 +321,7 @@ | ||
321 | <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额:</text> | 321 | <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额:</text> |
322 | <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.amount_by_person}}元</text> | 322 | <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.amount_by_person}}元</text> |
323 | </view> | 323 | </view> |
324 | - <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 324 | + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
325 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | 325 | <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> |
326 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 326 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> |
327 | </view> | 327 | </view> |
@@ -367,7 +367,7 @@ | @@ -367,7 +367,7 @@ | ||
367 | </view> | 367 | </view> |
368 | <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view> | 368 | <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view> |
369 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | 369 | <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> |
370 | - <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}"> | 370 | + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}"> |
371 | <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | 371 | <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> |
372 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 372 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> |
373 | </view> | 373 | </view> |
请
注册
或
登录
后发表评论