预扣预缴 接口

@@ -9,36 +9,7 @@ Page({
     // tab切换  
     isshow: false,
     currentTab: 0,
-    taxDatas: {
-      "id": "154024896031100928",
-      "created_at": 1511525284,
-      "updated_at": 1511525284,
-      "tenant_id": "122371433052508160",
-      "taxation_method": "salary",   // 个税申报类型："0101"-工资薪金  "0401"-劳务报酬
-      "sub_taxation_method": "salary",   // 正常工资薪金子类型："0101"-正常工资薪金  "0107"-内退一次性补偿 "0108"-解除劳动合同一次性补偿 "0109"-个人股票期权行权收入 "0110"-企业年金 "0111"-提前退休一次性补贴 "0103"-全年一次性奖金收入
-      "province": "北京市",
-      "province_code": "110000",
-      "city": "市辖区",
-      "city_code": "110100",
-      "district": "东城",
-      "district_code": "110101",
-      "name": "徐恒堂",  //姓名
-      "credential_type": "居民身份证",
-      "credential_number": "110221198301270632", //证件号码 
-      "option_date": 152135596800,
-      "personal_income": 475.6,  //当期收入额
-      "tax_free_income": 475.6,  //当期免税收入
-      "special_deduction": 475.6,  //累计专项扣除（专项扣除合计）
-      "reduction_cost": 475.6,  //累计基本减除（减除费用）
-      "special_additional_deduction": 475.6,  //累计专项附加扣除（专项附加扣除合计）
-      "other_deduction": 475.6,  //累计法定扣除（其他扣除合计）
-      "accumulated_taxable_income": 475.6,  //累计应纳税所得额
-      "tax_rate": 0.6,  //税率
-      "deduction_number": 475.6,  //速算扣除数
-      "accumulated_withholding_tax": 475.6,  //累计应扣缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "refund_tax": 475.6,  //本期应缴税额（应补退税额）
-    },
+    taxDatas: {},
     choosed_date: '',
     long_date: 0
   },
@@ -63,7 +34,7 @@ Page({
         console.log('成功', result)
         if (result.personal_income){
           self.setData({
-            taxDatas: result
+            taxDatas: result.data
           })
         }
         

@@ -2,7 +2,7 @@
 var format = require('../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
-
+const Sub_taxation_method = {"0101":'正常工资薪金',  "0107": "内退一次性补偿" ,"0108": "解除劳动合同一次性补偿", "0109": "个人股票期权行权收入", "0110": "企业年金", "0111": "提前退休一次性补贴", "0103": "全年一次性奖金收入"}
 Page({
   loadCount:0,
   timestamp: 0,
@@ -11,29 +11,7 @@ Page({
     // tab切换  
     isshow : false,
     currentTab: 0,
-    taxDatas: [{
-      "id": "154024896031100928",
-      "created_at": 1511525284,
-      "updated_at": 1511525284,
-      "tenant_id": "122371433052508160",
-      "taxation_method": "salary",   // 个税申报类型："0101"-工资薪金  "0401"-劳务报酬
-      "sub_taxation_method": "salary",   // 正
-      "province": "北京市",
-      "province_code": "110000",
-      "city": "市辖区",
-      "city_code": "110100",
-      "district": "东城",
-      "district_code": "110101",
-      "name": "徐恒堂",  //姓名
-      "credential_type": "身份证",
-      "credential_number": "110221198301270632", //证件号码
-      "personal_tax": 475.6,  //本期应缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "accumulated_taxable_income": 475.6,  //累计应纳税所得额
-      "accumulated_withholding_tax": 475.6,  //累计应扣缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "option_date": 152135596800
-    }],
+    taxDatas: [],
     salaryDatas: {},
     choosed_date: ''
   },
@@ -55,9 +33,10 @@ Page({
       header: {
         'Authorization': this.Authorization
       },
+      data: { 'declare_month': timestamp },
       success: function (result) {
         that.setData({
-          taxDatas: result.items
+          taxDatas: that.handleTaxData(result.data.items)
         })
 
       },
@@ -95,7 +74,21 @@ Page({
     })
 
   },
-
+  handleTaxData: function (items) {
+    for (var i = 0; i < items.length; ++i) {
+      var item = items[i]
+      var method
+      if (item.taxation_method == '0101'){
+        if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){
+          method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]
+        }
+      } else if (item.taxation_method == '0401') {
+        method = '劳务报酬'
+      }
+      item.method
+    }
+    return items;
+  },
   handleSalaryData: function (items) {
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]

@@ -17,10 +17,10 @@
     <view wx:if="{{currentTab==0}}">
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
-          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.taxation_method=='salary'?'工资薪金':'劳务报酬'}}</text>
+          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
-          <!-- <text class='text_666_28'>累计收入额:{{item.}}</text> -->
-          <!-- <text class='text_666_28'>当期收入额:{{item.}}</text> -->
+          <!-- <text class='text_666_28'>累计收入额:{{item.personal_income}}</text> -->
+          <text class='text_666_28'>当期收入额:{{item.personal_income}}</text>
           <text class='text_666_28'>累计应缴纳所得额:{{item.accumulated_taxable_income}}</text>
           <text class='text_666_28'>累计应扣缴税额:{{item.accumulated_withholding_tax}}</text>
           <text class='text_666_28'>已预交税额:{{item.prepay_tax}}</text>