wangyu / naturalPersonTax · 提交

提交 9fe9e05451d65b5a0f08ea695c9a70525afa0bb0

作者 wangyu
2 个父辈 639fb641 ca58c53d
构建： 未知

Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

内嵌 并排对比
正在显示 4 个修改的文件 包含 18 行增加 和 17 行删除
@@ -32,12 +32,9 @@ Page({ @@ -32,12 +32,9 @@ Page({
32 }, 32 },
33 success: function (result) { 33 success: function (result) {
34 console.log('成功', result) 34 console.log('成功', result)
35 - if (result.personal_income){  
36 - self.setData({  
37 - taxDatas: result.data  
38 - })  
39 - }  
40 - 35 + self.setData({
  36 + taxDatas: result.data
  37 + })
41 }, 38 },
42 fail: function (res) { 39 fail: function (res) {
43 console.log('失败', res) 40 console.log('失败', res)
@@ -62,12 +62,12 @@ @@ -62,12 +62,12 @@
62 <view class='view_bg_wrap' style='margin-top: 44rpx;'> 62 <view class='view_bg_wrap' style='margin-top: 44rpx;'>
63 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 63 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
64 <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text> 64 <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
65 - <text class='text_text_wrap'>累计应预扣预缴税额</text> 65 + <text class='text_text_wrap'>累计应扣缴税额</text>
66 </view> 66 </view>
67 <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> 67 <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
68 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 68 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
69 <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text> 69 <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
70 - <text class='text_text_wrap'>已预扣预缴税额</text> 70 + <text class='text_text_wrap'>已扣缴税额</text>
71 </view> 71 </view>
72 72
73 </view> 73 </view>
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <view class='view_bg_wrap' style='margin-top: 180rpx;'> 75 <view class='view_bg_wrap' style='margin-top: 180rpx;'>
76 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> 76 <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
77 <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text> 77 <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
78 - <text class='text_text_wrap'>本期应预扣预缴税额</text> 78 + <text class='text_text_wrap'>本期应缴税额</text>
79 </view> 79 </view>
80 80
81 <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> 81 <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
@@ -87,13 +87,16 @@ Page({ @@ -87,13 +87,16 @@ Page({
87 var item = items[i] 87 var item = items[i]
88 var method 88 var method
89 if (item.taxation_method == '0101'){ 89 if (item.taxation_method == '0101'){
90 - if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){  
91 - method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]  
92 - } 90 + method = '工资薪金'
  91 + // if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){
  92 + // method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]
  93 + // }
93 } else if (item.taxation_method == '0401') { 94 } else if (item.taxation_method == '0401') {
94 method = '劳务报酬' 95 method = '劳务报酬'
95 - }  
96 - item.method 96 + } else if (item.taxation_method == '0103') {
  97 + method = '全年一次性奖金'
  98 + }
  99 + item.method = method
97 } 100 }
98 return items; 101 return items;
99 }, 102 },
@@ -20,15 +20,16 @@ @@ -20,15 +20,16 @@
20 <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view> 20 <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view>
21 </view> 21 </view>
22 <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'> 22 <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
23 - <view class='card_rectangle_bg_column' style='padding:30rpx' id='{s{item.id}}' bindtap='goItemDetails'>  
24 - <text class='text_blue_36'>所得项目:{{item.method}}</text> 23 + <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
  24 + <text class='text_blue_36'>扣缴义务人: {{item.declaring_unit}}</text>
  25 + <text class='text_blue_36'>所得项目: {{item.method}}</text>
25 <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view> 26 <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
26 <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</text> --> 27 <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</text> -->
27 <text class='text_999_28'>当期收入额:<text class='text_333_28 left_360'>¥{{item.personal_income}}</text></text> 28 <text class='text_999_28'>当期收入额:<text class='text_333_28 left_360'>¥{{item.personal_income}}</text></text>
28 <text class='text_999_28'>累计应缴纳所得额:<text class='text_333_28 left_360'>¥{{item.accumulated_taxable_income}}</text></text> 29 <text class='text_999_28'>累计应缴纳所得额:<text class='text_333_28 left_360'>¥{{item.accumulated_taxable_income}}</text></text>
29 <text class='text_999_28'>累计应扣缴税额:<text class='text_333_28 left_360'>¥{{item.accumulated_withholding_tax}}</text></text> 30 <text class='text_999_28'>累计应扣缴税额:<text class='text_333_28 left_360'>¥{{item.accumulated_withholding_tax}}</text></text>
30 <text class='text_999_28'>已预交税额:<text class='text_333_28 left_360'>¥{{item.prepay_tax}}</text></text> 31 <text class='text_999_28'>已预交税额:<text class='text_333_28 left_360'>¥{{item.prepay_tax}}</text></text>
31 - <text class='text_999_28'>本期应缴税额:<text class='text_333_28 text_color_28 left_360'>¥{{item.personal_tax}}</text></text> 32 + <text class='text_999_28'>本期应缴税额:<text class='text_333_28 text_color_28 left_360'>¥{{item.refund_tax}}</text></text>
32 </view> 33 </view>
33 </view> 34 </view>
34 </view> 35 </view>
请 注册 或 登录 后发表评论