预扣预缴。非居民

@@ -11,13 +11,15 @@ Page({
     currentTab: 0,
     taxDatas: {},
     choosed_date: '',
-    long_date: 0
+    long_date: 0,
+    isForeign:false
   },
   onLoad: function (options) {
     if (options.date){
       var mydate = new Date();
       this.setData({
         choosed_date: options.date,
+        isForeign: options.taxpayer_type == 'non-resident'
       })
     }
     if (!options.id) return
@@ -33,7 +35,7 @@ Page({
       success: function (result) {
         console.log('成功', result)
         self.setData({
-          taxDatas: result.data
+          taxDatas: that.handleTaxData(result.data)
         })
       },
       fail: function (res) {
@@ -46,7 +48,21 @@ Page({
     })
   },
 
-
+  handleTaxData: function (items) {
+    for (var i = 0; i < items.length; ++i) {
+      var item = items[i]
+      var donation_way
+      if (item.donation_way == 'quota') {
+        method = '限额扣除'
+      } else if (item.donation_way == 'full') {
+        method = '全额扣除'
+      } else if (item.donation_way == 'mix') {
+        method = '混合'
+      }
+      item.method = method
+    }
+    return items;
+  },
 
 
 })
\ No newline at end of file

 <!--pages/main/advancepayment/adPayDetails/adPayDetails.wxml-->
 <view>
   <scroll-view style='margin-bottom:40rpx'>
-    <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
+    <view wx:if="{{!isForeign}}" style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
       <view>
         <text class='text_blue_32'>{{choosed_date}}</text>
         <view class='float_right'>
@@ -91,28 +91,96 @@
         </view>
       </view>
     </view>
-
-    <!-- <view style='padding-left:30rpx;background:#ffffff'>
-      <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
-      <text style='padding-left:20rpx' class='text_gray_32'>工资明细</text>
-    </view>
-    <view style='margin-top:2rpx;background:#ffffff;padding-bottom:30rpx'>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>公司名称</text>
-        <text class='text_wrap_right'>北京小爱智能科技</text>
+    <view wx:else style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
+      <view>
+        <text class='text_blue_32'>{{choosed_date}}</text>
+        <view class='float_right'>
+          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+        </view>
       </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>计薪时间</text>
-        <text class='text_wrap_right'>2018/09/09 20:10</text>
+      <!-- <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
+      </picker> -->
+      <view class='divide_line_f5f5f5'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>收入额</text>
+        <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>免税收入</text>
+        <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>其他扣除</text>
+        <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>实际捐赠额</text>
+        <text class='text_number float_right'>{{taxDatas.actual_donation}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>捐赠方式</text>
+        <text class='text_number float_right'>{{taxDatas.donation_way}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>减免税额</text>
+        <text class='text_number float_right'>{{taxDatas.tax_savings}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>应纳税所得额</text>
+        <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>      
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>税率</text>
+        <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
       </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>发薪时间</text>
-        <text class='text_wrap_right'>2018/09/10 09:00 </text>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>速算扣除数</text>
+        <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
       </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>实发工资</text>
-        <text class='text_wrap_right'>13860.00</text>
+    </view>
+    <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
+      <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+      <view>
+        <view class='view_bg_wrap' style='margin-top: 44rpx;'>
+          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+            <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
+            <text class='text_text_wrap'>应扣缴税额</text>
+          </view>
+          <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
+          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+            <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
+            <text class='text_text_wrap'>已扣缴税额</text>
+          </view>
+          
+        </view>
+
+        <view class='view_bg_wrap' style='margin-top: 180rpx;'>
+          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+            <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
+            <text class='text_text_wrap'>应补（退）税额</text>
+          </view>
+          
+          <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
+          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+            <text class='text_num_wrap'>30.8%</text>
+            <text class='text_text_wrap'>使用税率</text>
+          </view>
+          <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
+          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+            <text class='text_num_wrap'>19106.91</text>
+            <text class='text_text_wrap'>速算扣除数</text>
+          </view> -->
+        </view>
       </view>
-    </view> -->
+    </view>
+   
   </scroll-view>
 </view>

@@ -96,7 +96,11 @@ Page({
       } else if (item.taxation_method == '0103') {
         method = '全年一次性奖金'
       } 
-      item.method = method
+      if (item.taxpayer_type == 'non-resident'){//非居民
+        item.method = '外籍人' + method
+      }else{
+        item.method = method
+      }
     }
     return items;
   },
@@ -196,8 +200,9 @@ Page({
   },
 
   goItemDetails: function (e) {
+    var item =  this.data.taxDatas[e.currentTarget.id]
     wx.navigateTo({
-      url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id + "&date=" + this.data.choosed_date
+      url: "adPayDetails/adPayDetails?id=" + item.id + "&date=" + this.data.choosed_date + "&taxpayer_type=" + item.taxpayer_type
     })
   },
 })
\ No newline at end of file

@@ -20,7 +20,7 @@
         <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view>
       </view>
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
-        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
+        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{index}}' bindtap='goItemDetails'>
           <text class='text_blue_36'>扣缴义务人: {{item.declaring_unit}}</text>          
           <text class='text_blue_36'>所得项目: {{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>