wangyu / naturalPersonTax · 提交

提交 492d4e0759ba915bb41c8f2b076276507e8da3ff

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

优化

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

109.5 KB | 宽: | 高:

115.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
... ... @@ -61,7 +61,7 @@ Page({
61 61 console.log("lookandadd", str);
62 62
63 63 wx.navigateTo({
64   - url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&legal_entity_id=" + data[str[0]].legal_entity_id + "&legal_entity=" + data[str[0]].legal_entity,
  64 + url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&employee_status=" + data[str[0]].employee_status + "&legal_entity_id=" + data[str[0]].legal_entity_id + "&legal_entity=" + data[str[0]].legal_entity,
65 65 })
66 66 },
67 67
... ... @@ -89,10 +89,10 @@ Page({
89 89 var Authorization = getApp().globalData.Authorization;
90 90 wx.request({
91 91 url: baseUrl + 'persontax/v1/person-additions',
92   - data: {
93   - limit: 10,
94   - offset: 0
95   - },
  92 + // data: {
  93 + // limit: 10,
  94 + // offset: 0
  95 + // },
96 96 header: {
97 97 'content-type': 'application/json',
98 98 "Authorization": Authorization
... ...
... ... @@ -5,7 +5,7 @@
5 5 <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
6 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
8   - <view wx:if="{{item.status=='init'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
  8 + <view wx:if="{{item.employee_status=='active'&&item.addition_items.length<1&&item.status=='init'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
9 9 <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
10 10 立即申报
11 11 </view>
... ...
... ... @@ -12,6 +12,7 @@ Page({
12 12 legal_entity_id: "",
13 13 legal_entity: "",
14 14 house_type: "",
  15 + employee_status:"",
15 16 btn_show:false,
16 17 person_total_amount: 0,
17 18 remaining_amount: 0,
... ... @@ -124,6 +125,7 @@ Page({
124 125 }
125 126 this.setData({
126 127 cur_status: housestatus,
  128 + employee_status: options.employee_status,
127 129 house_type: housetype,
128 130 legal_entity_id: options.legal_entity_id,
129 131 legal_entity: options.legal_entity,
... ... @@ -227,7 +229,7 @@ Page({
227 229 var issinglechild_Data = this.data.issinglechildData;
228 230 var shareMethod_Data = this.data.shareMethodData;
229 231 if (supportlist.length < 1 && cosupportlist.length<1){
230   - btn_show = true
  232 + btn_show = true
231 233 inputdisable = false
232 234 issinglechild_Data.disabled = false;
233 235 shareMethod_Data.disabled = false;
... ... @@ -338,7 +340,7 @@ Page({
338 340 wx.hideLoading()
339 341 } else {
340 342 this.setData({
341   - btn_show : true,
  343 + btn_show: true,
342 344 additionInfo: newdata
343 345 })
344 346 }
... ...
... ... @@ -77,7 +77,7 @@
77 77 </view>
78 78 <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view>
79 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="{{item.status=='failed'||item.status=='to_declare'}}">
  80 + <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
81 81 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{index}}" bindtap='godelete'>删除</text>
82 82 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
83 83 </view>
... ... @@ -111,7 +111,7 @@
111 111 <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
112 112 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
113 113 </view>
114   - <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  114 + <view wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
115 115 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='goedit'>编辑</text>
116 116 <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='godelete'>删除</text>
117 117 </view>
... ... @@ -161,7 +161,7 @@
161 161 <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
162 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 163 </view>
164   - <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  164 + <view wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
165 165 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text>
166 166 <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='godelete'>删除</text>
167 167 </view>
... ... @@ -204,14 +204,14 @@
204 204 </view>
205 205 <view class='divide_line_f5f5f5'></view>
206 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="{{item.status=='failed'||item.status=='to_declare'}}">
  207 + <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
208 208 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'support_duty'+index}}" bindtap='godelete'>删除</text>
209 209 <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'support_duty'+index}}" bindtap='goedit'>编辑</text>
210 210 </view>
211 211 </view>
212 212 </view>
213 213 </view>
214   - <view style='background:#FFF;padding:30rpx'>
  214 + <view style='background:#FFF;padding:30rpx' wx:if="{{employee_status=='active'}}">
215 215 <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id="{{index}}" bindtap='goadd'>
216 216 添加
217 217 </view>
... ... @@ -249,7 +249,7 @@
249 249 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
250 250 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
251 251 </view>
252   - <view class='float_right'>
  252 + <view class='float_right' wx:if="{{employee_status=='active'}}">
253 253 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
254 254 <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
255 255 </view>
... ... @@ -259,7 +259,7 @@
259 259
260 260 </view>
261 261 <view>
262   - <view style='margin-left:30rpx' wx:if="{{issinglechildData.selected!='是'}}">
  262 + <view style='margin-left:30rpx' wx:if="{{employee_status=='active'&&issinglechildData.selected!='是'}}">
263 263 <!-- <text class='text_999_28'>您还没有添加继续共同赡养人，</text> -->
264 264 <text class='text_blue_28' bindtap='goaddSupporter'>添加共同赡养人</text>
265 265 </view>
... ... @@ -321,7 +321,7 @@
321 321 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
322 322 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
323 323 </view>
324   - <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
  324 + <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
325 325 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
326 326 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
327 327 </view>
... ... @@ -367,7 +367,7 @@
367 367 </view>
368 368 <view class='divide_line_f5f5f5' style="margin-top:6rpx"></view>
369 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="{{item.status=='failed'||item.status=='to_declare'}}">
  370 + <view class='float_right' wx:if="{{employee_status=='active'&&(item.status=='failed'||item.status=='to_declare')}}">
371 371 <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
372 372 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
373 373 </view>
... ... @@ -382,7 +382,7 @@
382 382 </view>
383 383
384 384 <!-- <view class='bottom_btn_wrap' hidden="{{additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}"> -->
385   - <view class='bottom_btn_wrap' wx:if="{{btn_show}}" >
  385 + <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}" >
386 386 <view class='btn_blue_radius' bindtap="goadd">
387 387 <view class='text_white_34'>添加</view>
388 388 </view>
... ...
请 注册 或 登录 后发表评论