完成收入详情5个附表对应的查询添加相关逻辑

wangyu
pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.js
pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
pages/main/finalpay/donationDetail/donationDetail.js
pages/main/finalpay/donationDetail/donationDetail.wxml
pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.js
pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
pages/main/finalpay/incomeDetail/incomeDetail.js
pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
pages/main/finalpay/otherDeductDetail/otherDeductDetail.js
pages/main/finalpay/otherDeductDetail/otherDeductDetail.wxml
--- a/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.js
查看文件 @762b570
@@ -6,9 +6,11 @@ Page({
    * Page initial data
    */
   data: {
+    settlement_record_id: "",
     year: "2019",
     showAddView: false,
     infoList: [{}],
+    total_account:0,
     project: ["正常工资薪金", "劳务报酬", "稿酬", "特许经营权使用费"],
     deductcontent: ["高级专家延长离退休期间工薪免征个人所得税", "解除劳动合同当地工资3倍以内免税", "符合条件的津补贴免征个人所得税", "生育津贴和生育医疗费免税", "工伤保险免税", "符合条件的外交人员免征个人所得税", "外籍个人出差补贴免税", "外籍个人探亲费、语言训练费、子女教育费免税", "外籍个人生活费用免税", "符合条件的外籍来华专家工资薪金所得免征个人所得税", "薪金所得免征个人所得数", "横琴、香港、澳门居民免税", "平潭台湾居民免税", "安家费、退职费、退休工资、离休工资、离休生活补助费免税"],
     deductproperty: ["其他"],
@@ -22,6 +24,9 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function (options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
     this.getInfoList()
   },
@@ -42,11 +47,13 @@ Page({
       },
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
       },
       success: function (result) {
         console.log("infoList", result)
         if (result.statusCode == 200) {
           that.setData({
+            total_account: result.data.total_account,
             infoList: result.data.items,
             income_item: "",
             reduction_item: "",
@@ -150,6 +157,7 @@ Page({
       method: "POST",
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
         "income_item": that.data.income_item,
         "reduction_item": that.data.reduction_item,
         "reduction_nature": that.data.reduction_nature,
--- a/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
查看文件 @762b570
 <view >
   <view style="background:#fff;padding:0 30rpx;">
     <text class="text_gray7_34">减免税额合计</text>
-    <text class="text_black3_34 float_right">{{3000}}</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
   </view>
    <!-- 列表数据，不可修改 -->
--- a/pages/main/finalpay/donationDetail/donationDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/donationDetail/donationDetail.js
查看文件 @762b570
@@ -7,26 +7,39 @@ Page({
    * Page initial data
    */
   data: {
+    settlement_record_id:"",
     year: "2019",
-    infoList:[{}],
-    deductPick:["30%","100%"],
+    showAddView: false,
+    infoList: [{}],
+    total_account: 0,
+    deductPick: ["30%", "100%"],
+    "donated_unit_code": "",
+    "donated_unit_name": "",
+    "donation_code": "",
+    "donation_year": "",
+    "donation_account": "",
+    "deduction_ratio": "", //扣除比例 
+    "comment": "",
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
     this.getInfoList()
   },
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
-  getInfoList: function () {
+  getInfoList: function() {
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -36,12 +49,21 @@ Page({
       },
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
       },
-      success: function (result) {
+      success: function(result) {
         console.log("infoList", result)
         if (result.statusCode == 200) {
           that.setData({
-            infoList: result.data.items
+            total_account: result.data.total_account,
+            infoList: result.data.items,
+            "donated_unit_code": "",
+            "donated_unit_name": "",
+            "donation_code": "",
+            "donation_year": "",
+            "donation_account": "",
+            "deduction_ratio": "", //扣除比例 
+            "comment": "",
           })
         }
       },
@@ -52,21 +74,135 @@ Page({
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-  addItem: function () {//继续添加
-    var info = this.data.infoList;
-    console.log(info);
-    info.push(this.data.infoList.length);
+  getInputInfo:function(e){//
+    console.log("输入框", e.currentTarget.id,e.detail.value)
+    var key = e.currentTarget.id+""
+    if ("donated_unit_code"==key){
+      this.setData({"donated_unit_code": e.detail.value,})
+    }
+    if ("donated_unit_name" == key) {
+      this.setData({ "donated_unit_name": e.detail.value, })
+    }
+    if ("donation_code" == key) {
+      this.setData({ "donation_code": e.detail.value, })
+    }
+    if ("donation_year" == key) {
+      this.setData({ "donation_year": e.detail.value, })
+    }
+    if ("donation_account" == key) {
+      this.setData({ "donation_account": e.detail.value, })
+    }
+    if ("comment" == key) {
+      this.setData({ "comment": e.detail.value, })
+    }
+  },
+
+  deductRatioPicker:function(e){//捐赠比例
+    console.log('picker，携带值为', e.detail.value)
+    var new_data = this.data.deductPick[e.detail.value]
     this.setData({
-      infoList: info
-    });
+      deduction_ratio: new_data ? new_data.replace("%",""):""
+    })
   },
-  goSubmit: function (e) {
-    console.log('form发生了submit事件，携带数据为：', e.detail.value)
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) {//是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.donated_unit_code || this.data.donated_unit_code.length < 1) {
+      this.showToast("请填写受赠单位纳税人识别号")
+      return
+    }
+    if (!this.data.donated_unit_name || this.data.donated_unit_name.length < 1) {
+      this.showToast("请填写受赠单位名称")
+      return
+    }
+    if (!this.data.donation_code || this.data.donation_code.length < 1) {
+      this.showToast("请填写捐赠凭证码")
+      return
+    }
+    if (!this.data.donation_year || this.data.donation_year.length < 1) {
+      this.showToast("请填写捐赠年度")
+      return
+    }
+    if (!this.data.donation_account || this.data.donation_account.length < 1) {
+      this.showToast("请填写扣除金额")
+      return
+    }
+    if (!this.data.deduction_ratio || this.data.deduction_ratio.length < 1) {
+      this.showToast("请选择扣除比例")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function(type) {//type=“1”，继续添加(当前页面)，type=2保存，返回列表
+    if (!this.data.donated_unit_code || this.data.donated_unit_code.length < 1) {
+      this.showToast("请填写受赠单位纳税人识别号")
+      return
+    }
+    if (!this.data.donated_unit_name || this.data.donated_unit_name.length < 1) {
+      this.showToast("请填写受赠单位名称")
+      return
+    }
+    if (!this.data.donation_code || this.data.donation_code.length < 1) {
+      this.showToast("请填写捐赠凭证码")
+      return
+    }
+    if (!this.data.donation_year || this.data.donation_year.length < 1) {
+      this.showToast("请填写捐赠年度")
+      return
+    }
+    if (!this.data.donation_account || this.data.donation_account.length < 1) {
+      this.showToast("请填写扣除金额")
+      return
+    }
+    if (!this.data.deduction_ratio || this.data.deduction_ratio.length < 1) {
+      this.showToast("请选择扣除比例")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/donation-deduction",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "donated_unit_code": that.data.donated_unit_code,
+        "donated_unit_name": that.data.donated_unit_name,
+        "donation_code": that.data.donation_code,
+        "donation_year": that.data.donation_year,
+        "donation_account": parseFloat(that.data.donation_account),
+        "deduction_ratio": parseFloat(that.data.deduction_ratio),
+        "comment":that.data.comment
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delat: 1
+            })
+          }
+        }
+      },
+    })
   },
   /**
@@ -83,24 +219,34 @@ Page({
   },
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/finalpay/donationDetail/donationDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/donationDetail/donationDetail.wxml
查看文件 @762b570
 <view>
   <view style="background:#fff;padding:0 30rpx;">
     <text class="text_gray7_34">准予扣除的捐赠额合计</text>
-    <text class="text_black3_34 float_right">{{300090}}</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
   </view>
+  <!-- 列表数据，不可修改 -->
   <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx;display: flex;">
       <view style="font-size: 32rpx;color: #777777;text-align: center;width:320rpx;display:flex;align-items: center;">受赠单位纳税人识别号(统一社会信用代码)</view>
-      <input style='text-align:right;color:#000;font-size: 30rpx;height:104rpx;width:366rpx' placeholder='请输入' name='name' maxlength="20" bindblur="" value="{{}}"></input>
+      <input style='text-align:right;color:#000;font-size: 30rpx;height:104rpx;width:366rpx' disabled="true" value="{{item.donated_unit_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">受赠单位名称</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donated_unit_name}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">报捐赠凭证号</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">捐赠年度</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_year}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">捐赠金额</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_account}}"></input>
     </view>
     <view class="divide_line_30"></view>
-    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="" range="{{deductPick}}">
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="" range="{{deductPick}}">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">扣除比例</text>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.deduction_ratio}}%"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">备注</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.comment}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx;display: flex;">
+      <view style="font-size: 32rpx;color: #777777;text-align: center;width:320rpx;display:flex;align-items: center;">受赠单位纳税人识别号(统一社会信用代码)</view>
+      <input style='text-align:right;color:#000;font-size: 30rpx;height:104rpx;width:366rpx' placeholder='请输入' id="donated_unit_code" maxlength="20" bindblur="getInputInfo" value="{{donated_unit_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">受赠单位名称</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donated_unit_name" bindblur="getInputInfo" value="{{donated_unit_name}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">报捐赠凭证号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donation_code" bindblur="getInputInfo" value="{{donation_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠年度</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donation_year" type="number" bindblur="getInputInfo" maxlength="4" value="{{donation_year}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="donation_account" bindblur="getInputInfo" value="{{donation_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="deductRatioPicker" range="{{deductPick}}">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">扣除比例</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{deduction_ratio}}%"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">备注</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="comment" bindblur="getInputInfo" value="{{comment}}"></input>
     </view>
   </view>
--- a/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.js
查看文件 @762b570
@@ -6,9 +6,11 @@ Page({
    * Page initial data
    */
   data: {
+    settlement_record_id: "",
     year: "2019",
     showAddView:false,
     infoList: [{}],
+    total_account: 0,
     project: ["正常工资薪金", "劳务报酬", "稿酬", "特许经营权使用费"],
     deductcontent: ["高级专家延长离退休期间工薪免征个人所得税", "解除劳动合同当地工资3倍以内免税", "符合条件的津补贴免征个人所得税", "生育津贴和生育医疗费免税", "工伤保险免税", "符合条件的外交人员免征个人所得税", "外籍个人出差补贴免税", "外籍个人探亲费、语言训练费、子女教育费免税", "外籍个人生活费用免税", "符合条件的外籍来华专家工资薪金所得免征个人所得税", "薪金所得免征个人所得数", "横琴、香港、澳门居民免税", "平潭台湾居民免税", "安家费、退职费、退休工资、离休工资、离休生活补助费免税"],
     deductproperty: ["其他"],
@@ -22,6 +24,9 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
     this.getInfoList()
   },
@@ -42,11 +47,13 @@ Page({
       },
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
       },
       success: function(result) {
         console.log("infoList", result)
         if (result.statusCode == 200) {
           that.setData({
+            total_account: result.data.total_account,
             infoList: result.data.items,
             income_item: "",
             reduction_item: "",
@@ -150,6 +157,7 @@ Page({
       method: "POST",
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
         "income_item": that.data.income_item,
         "reduction_item": that.data.reduction_item,
         "reduction_nature": that.data.reduction_nature,
--- a/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
查看文件 @762b570
 <view>
   <view style="background:#fff;padding:0 30rpx;">
     <text class="text_gray7_34">免税收入合计</text>
-    <text class="text_black3_34 float_right">{{3000}}</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
   </view>
   <!-- 列表数据，不可修改 -->
--- a/pages/main/finalpay/incomeDetail/incomeDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/incomeDetail/incomeDetail.js
查看文件 @762b570
@@ -7,6 +7,7 @@ Page({
    * Page initial data
    */
   data: {
+    settlement_record_id:"",
     currentTab:1,
     year:"2019",
     incomeInfo:{},
@@ -63,6 +64,7 @@ Page({
         console.log("incomeInfo", result)
         if (result.statusCode == 200) {
             that.setData({
+              settlement_record_id:result.data.id,
               incomeInfo:result.data.item
             })
         }
@@ -73,28 +75,28 @@ Page({
 // 免税收入附表
   freeIncomeDetail: function () { 
       wx.navigateTo({
-        url: '../freeIncomeDetail/freeIncomeDetail',
+        url: '../freeIncomeDetail/freeIncomeDetail?id=' + this.data.settlement_record_id,
       })
   },
 // 其他扣除附表
   otherDeductDetail:function(){
     wx.navigateTo({
-      url: '../otherDeductDetail/otherDeductDetail',
+      url: '../otherDeductDetail/otherDeductDetail?id=' + this.data.settlement_record_id + "&health_account=" + this.data.incomeInfo.commercial_insurance + "&endowment_account=" + this.data.incomeInfo.tax_extension,
     })
   },
   // 捐赠明细
   donationDetail:function(){
     wx.navigateTo({
-      url: '../donationDetail/donationDetail',
+      url: '../donationDetail/donationDetail?id=' + this.data.settlement_record_id,
     })
   },
 // 减免/已缴纳税额明细
   deductOrPayedDetail:function(){
     wx.navigateTo({
-      url: '../deductOrPayedDetail/deductOrPayedDetail',
+      url: '../deductOrPayedDetail/deductOrPayedDetail?id=' + this.data.settlement_record_id,
     })
   },
--- a/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
查看文件 @762b570
 // pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
 Page({
   /**
    * Page initial data
    */
   data: {
+    settlement_record_id: "",
     year: "2019",
     infoList: [{}],
+    total_account:0,
+    showAddView: false,
+    option_start_date: "",
+    option_end_date: "",
+
+    "tax_extension_account": "",
+    "option_start_time": "", //申报扣除月份起,
+    "option_end_time": "", //申报扣除月份止,
+    "tax_check_code": "",
+    "year_premium": "", //年度保费,
+    "month_premium": "", //月度保费 
+    "year_deduction": "", //本年扣除金额
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
     this.getInfoList()
   },
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
-  getInfoList: function () {
+  getInfoList: function() {
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -35,70 +52,240 @@ Page({
       },
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
       },
-      success: function (result) {
+      success: function(result) {
         console.log("infoList", result)
         if (result.statusCode == 200) {
           that.setData({
-            infoList: result.data.items
+            total_account: result.data.total_account,
+            infoList: that.handleData(result.data.items),
+
+            option_start_date: "",
+            option_end_date: "",
+            "tax_extension_account": "",
+            "option_start_time": "", //申报扣除月份起,
+            "option_end_time": "", //申报扣除月份止,
+            "tax_check_code": "",
+            "year_premium": "", //年度保费,
+            "month_premium": "", //月度保费 
+            "year_deduction": "", //本年扣除金额
           })
         }
       },
     })
   },
+  handleData: function(items) { //解析列表数据时间戳
+    for (var i = 0; i < items.length; i++) {
+      if (items[i].option_start_time && items[i].option_start_time > 1000) {
+        items[i].option_start_time = format.formatTime_date(items[i].option_start_time)
+      } else {
+        items[i].option_start_time = ""
+      }
+      if (items[i].option_end_time && items[i].option_end_time > 1000) {
+        items[i].option_end_time = format.formatTime_date(items[i].option_end_time)
+      } else {
+        items[i].option_end_time = ""
+      }
+    }
+    return items
+  },
+
+  bindDatePicker: function(e) { //时间选择
+    var datelong = Date.parse(new Date(e.detail.value)) / 1000
+    console.log("picker", e)
+    if ("option_start_time" == e.currentTarget.id) {
+      this.setData({
+        option_start_date: e.detail.value,
+        option_start_time: datelong
+      })
+    } else if ("option_end_time" == e.currentTarget.id) {
+      this.setData({
+        option_end_date: e.detail.value,
+        option_end_time: datelong
+      })
+    }
+
+  },
+
+  getInputInfo: function(e) { //
+    console.log("输入框", e.currentTarget.id, e.detail.value)
+    var key = e.currentTarget.id + ""
+    if ("tax_extension_account" == key) {
+      this.setData({
+        "tax_extension_account": e.detail.value,
+      })
+    }
+    if ("tax_check_code" == key) {
+      this.setData({
+        "tax_check_code": e.detail.value,
+      })
+    }
+    if ("year_premium" == key) {
+      this.setData({
+        "year_premium": e.detail.value,
+      })
+    }
+    if ("month_premium" == key) {
+      this.setData({
+        "month_premium": e.detail.value,
+      })
+    }
+    if ("year_deduction" == key) {
+      this.setData({
+        "year_deduction": e.detail.value,
+      })
+    }
+  },
+
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-  addItem: function () {//继续添加
-    var info = this.data.infoList;
-    console.log(info);
-    info.push(this.data.infoList.length);
-    this.setData({
-      infoList: info
-    });
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) { //是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.tax_extension_account || this.data.tax_extension_account.length < 1) {
+      this.showToast("请填写税延养老账号编号")
+      return
+    }
+    if (!this.data.option_start_time || this.data.option_start_time.length < 1000 || !this.data.option_end_time || this.data.option_end_time.length < 1000) {
+      this.showToast("请选择申报扣除起止月")
+      return
+    }
+    if (!this.data.tax_check_code || this.data.tax_check_code.length < 1) {
+      this.showToast("请填写报税校验码")
+      return
+    }
+    if (!this.data.year_premium || this.data.year_premium.length < 1) {
+      this.showToast("请填写年度保费")
+      return
+    }
+    if (!this.data.month_premium || this.data.month_premium.length < 1) {
+      this.showToast("请填写月度保费")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    this.goSubmit("1")
   },
-  goSubmit: function (e) {
-    console.log('form发生了submit事件，携带数据为：', e.detail.value)
+  goSubmit: function(type) {
+    if (!this.data.tax_extension_account || this.data.tax_extension_account.length < 1) {
+      this.showToast("请填写税延养老账号编号")
+      return
+    }
+    if (!this.data.option_start_time || this.data.option_start_time.length < 1000 || !this.data.option_end_time || this.data.option_end_time.length < 1000) {
+      this.showToast("请选择申报扣除起止月")
+      return
+    }
+    if (!this.data.tax_check_code || this.data.tax_check_code.length < 1) {
+      this.showToast("请填写报税校验码")
+      return
+    }
+    if (!this.data.year_premium || this.data.year_premium.length < 1) {
+      this.showToast("请填写年度保费")
+      return
+    }
+    if (!this.data.month_premium || this.data.month_premium.length < 1) {
+      this.showToast("请填写月度保费")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/tax-extension",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "tax_extension_account": that.data.tax_extension_account,
+        "option_start_time": that.data.option_start_time, //申报扣除月份起,
+        "option_end_time": that.data.option_end_time, //申报扣除月份止,
+        "tax_check_code": that.data.tax_check_code,
+        "year_premium": parseFloat(that.data.year_premium), //年度保费,
+        "month_premium": parseFloat(that.data.month_premium), //月度保费 
+        "year_deduction": parseFloat(that.data.year_deduction), //本年扣除金额
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delta: 2
+            })
+          }
+        }
+      }
+    })
   },
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
   },
+  showToast: function(data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
查看文件 @762b570
@@ -2,50 +2,96 @@
 <view>
   <view style="background:#fff;padding:0 30rpx;">
     <text class="text_gray7_34">税延养老保险合计</text>
-    <text class="text_black3_34 float_right">{{3000}}</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
   </view>
+  <!-- 列表数据，不可修改 -->
   <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">税延养老账号编号</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.tax_extension_account}}"></input>
     </view>
     <view class="divide_line_30"></view>
-    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">申报扣除期起</text>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.option_start_time}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期止</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.option_end_time}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">报税校验码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.tax_check_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_deduction}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税延养老账号编号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_extension_account" bindblur="getInputInfo" value="{{tax_extension_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDatePicker" id="option_start_time">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期起</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_start_date}}"></input>
     </picker>
     <view class="divide_line_30"></view>
-    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDatePicker" id="option_end_time">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">申报扣除期止</text>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_end_date}}"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">报税校验码</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_check_code" bindblur="getInputInfo" value="{{tax_check_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">年度保费</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="year_premium" bindblur="getInputInfo" value="{{year_premium}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">月度保费</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="month_premium" bindblur="getInputInfo" value="{{month_premium}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">本年扣除金额</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="year_deduction" bindblur="getInputInfo" value="{{year_deduction}}"></input>
     </view>
   </view>
--- a/pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
查看文件 @762b570
 // pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
 Page({
   /**
    * Page initial data
    */
   data: {
+    settlement_record_id:"",
     year: "2019",
+    showAddView: false,
     infoList: [{}],
+    total_account:0,
+    effect_date:"",
+
+    "tax_code": "",
+    "date_policy": "", //保单生效日期,
+    "year_premium": "", //年度保费
+    "month_premium": "", //月度保费 
+    "year_deduction": "", //本年扣除金额
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
     this.getInfoList()
   },
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
-  getInfoList: function () {
+  getInfoList: function() {
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -35,71 +49,205 @@ Page({
       },
       data: {
         "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
       },
-      success: function (result) {
+      success: function(result) {
         console.log("infoList", result)
         if (result.statusCode == 200) {
           that.setData({
-            infoList: result.data.items
+            total_account: result.data.total_account,
+            infoList: that.handleData(result.data.items) ,
+            "tax_code": "",
+            "date_policy": "",
+            "year_premium": "",
+            "month_premium": "",
+            "year_deduction": "",
           })
         }
       },
     })
   },
+  handleData: function (items){
+    for (var i = 0; i < items.length; i++) {
+      if (items[i].date_policy && items[i].date_policy>1000){
+        items[i].date_policy = format.formatTime_date(items[i].date_policy)
+      }else{
+        items[i].date_policy = ""
+      }
+    }
+    return items
+  },
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-  addItem: function () {//继续添加
-    var info = this.data.infoList;
-    console.log(info);
-    info.push(this.data.infoList.length);
+  getInputInfo: function(e) { //
+    console.log("输入框", e.currentTarget.id, e.detail.value)
+    var key = e.currentTarget.id + ""
+    if ("tax_code" == key) {
+      this.setData({
+        "tax_code": e.detail.value,
+      })
+    }
+    if ("year_premium" == key) {
+      this.setData({
+        "year_premium": e.detail.value,
+      })
+    }
+    if ("month_premium" == key) {
+      this.setData({
+        "month_premium": e.detail.value,
+      })
+    }
+    if ("year_deduction" == key) {
+      this.setData({
+        "year_deduction": e.detail.value,
+      })
+    }
+  },
+
+  datePolicyPicker: function(e) {
+    var datelong = Date.parse(new Date(e.detail.value)) / 1000
+    console.log("日期", e.detail.value, datelong)
     this.setData({
-      infoList: info
-    });
+      effect_date: e.detail.value,
+      date_policy: datelong
+    })
   },
-  goSubmit: function (e) {
-    console.log('form发生了submit事件，携带数据为：', e.detail.value)
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) {//是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.tax_code || this.data.tax_code.length < 1) {
+      this.showToast("请填写税优识别码")
+      return
+    }
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
+      return
+    }
+    if (!this.data.year_premium || this.data.year_premium.length < 1) {
+      this.showToast("请填写年度保费")
+      return
+    }
+    if (!this.data.month_premium || this.data.month_premium.length < 1) {
+      this.showToast("请填写月度保费")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function (type) {//type=“1”，继续添加(当前页面)，type=2保存，返回列表
+    if (!this.data.tax_code || this.data.tax_code.length < 1) {
+      this.showToast("请填写税优识别码")
+      return
+    }
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
+      return
+    }
+    if (!this.data.year_premium || this.data.year_premium.length < 1) {
+      this.showToast("请填写年度保费")
+      return
+    }
+    if (!this.data.month_premium || this.data.month_premium.length < 1) {
+      this.showToast("请填写月度保费")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/commercial-insurance-tax",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "tax_code": that.data.tax_code,
+        "date_policy": that.data.date_policy , //保单生效日期,
+        "year_premium": parseFloat(that.data.year_premium)  ,//年度保费,
+        "month_premium": parseFloat(that.data.month_premium), //月度保费 
+        "year_deduction": parseFloat(that.data.year_deduction), //本年扣除金额
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delta: 2
+            })
+          }
+        }
+      },
+    })
   },
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
+
+  },
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
   },
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
查看文件 @762b570
 <view>
   <view style="background:#fff;padding:0 30rpx;">
     <text class="text_gray7_34">商业健康保险合计</text>
-    <text class="text_black3_34 float_right">{{3000}}</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
   </view>
+  <!-- 列表数据，不可修改 -->
   <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">税优识别码</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true"  value="{{item.tax_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view class="divide_line_30"></view>
-    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">保单生效日期</text>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.date_policy}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true"value="{{item.year_deduction}}"></input>
+    </view>
+  </view>
+
+ <!-- 添加项，可编辑 -->
+   <view  wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税优识别码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_code" bindblur="getInputInfo" value="{{tax_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="datePolicyPicker">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">保单生效日期</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{effect_date}}"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">年度保费</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="year_premium" bindblur="getInputInfo"  value="{{year_premium}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class="text_gray7_34">月度保费</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="month_premium" bindblur="getInputInfo" value="{{month_premium}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
       <text class='red_star_right_10'>*</text>
       <text class="text_gray7_34">本年扣除金额</text>
-      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' type="digit" bindblur="bindIncome" value="{{}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="year_deduction" bindblur="getInputInfo" value="{{year_deduction}}"></input>
     </view>
   </view>
--- a/pages/main/finalpay/otherDeductDetail/otherDeductDetail.js
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/otherDeductDetail.js
查看文件 @762b570
@@ -5,76 +5,83 @@ Page({
    * Page initial data
    */
   data: {
-
+    settlement_record_id: "",
+    endowment_account: "0",
+    health_account: "0"
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
-
+  onLoad: function(options) {
+    console.log("id", options)
+    this.setData({
+      settlement_record_id: options.id,
+      endowment_account: options.endowment_account,
+      health_account: options.health_account
+    })
   },
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-// 商业健康保险
-  healthInsurDetail:function(){
+  // 商业健康保险
+  healthInsurDetail: function() {
     wx.navigateTo({
-      url: 'healthInsurDetail',
+      url: 'healthInsurDetail?id=' + this.data.settlement_record_id,
     })
   },
-// 税延养老保险
-  endowmentInsurDetail: function () {
+  // 税延养老保险
+  endowmentInsurDetail: function() {
     wx.navigateTo({
-      url: 'endowmentInsurDetail',
+      url: 'endowmentInsurDetail?id=' + this.data.settlement_record_id,
     })
-   },
+  },
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
   },
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/finalpay/otherDeductDetail/otherDeductDetail.wxml
查看文件 @762b570
+++ b/pages/main/finalpay/otherDeductDetail/otherDeductDetail.wxml
查看文件 @762b570
@@ -2,12 +2,12 @@
   <view style="background:#fff;padding:0 30rpx;" bindtap="healthInsurDetail">
     <text class="text_gray7_34">商业健康保险合计</text>
     <image class='arrow_wrap' style='margin-top: 32rpx' src='/images/arrow_right.png'></image>
-    <text class="text_black3_34 float_right">{{3000}}</text>
+    <text class="text_black3_34 float_right">{{health_account}}</text>
   </view>
   <view class="divide_line_30"></view>
   <view style="background:#fff;padding:0 30rpx;" bindtap="endowmentInsurDetail">
     <text class="text_gray7_34">税延养老保险合计</text>
     <image class='arrow_wrap' style='margin-top: 32rpx' src='/images/arrow_right.png'></image>
-    <text class="text_black3_34 float_right">{{5000}}</text>
+    <text class="text_black3_34 float_right">{{endowment_account}}</text>
   </view>
 </view>