更新状态

wangyu
pages/main/finalpay/addUnitInfo/addUnitInfo.js
pages/main/finalpay/addUnitInfo/addUnitInfo.wxml
pages/main/finalpay/home.wxml
pages/main/finalpay/incomeDetail/incomeDetail.wxml
--- a/pages/main/finalpay/addUnitInfo/addUnitInfo.js
查看文件 @b1509e0
+++ b/pages/main/finalpay/addUnitInfo/addUnitInfo.js
查看文件 @b1509e0
@@ -30,7 +30,7 @@ Page({
   formSubmit: function(e) { //提交
     console.log("formSubmit", e);
     var formdata = e.detail.value
-    if (formdata.total_salary || formdata.total_salary || formdata.remuneration_labor || formdata.author_payment || formdata.special_manage_cost || formdata.other_free_income || formdata.personal_endowment || formdata.personal_medical || formdata.personal_unemployment || formdata.personal_house_fund || formdata.childrens_education || formdata.continuing_education || formdata.housing_loan_interest || formdata.housing_rent || formdata.caring_old_people || formdata.serious_illness_medical || formdata.annuity || formdata.commercial_insurance || formdata.tax_extension || formdata.other_fee || formdata.donation_deducted || formdata.years_bouns || formdata.tax_savings || formdata.accumulated_withholding_tax){
+    if (formdata.total_salary || formdata.total_salary || formdata.remuneration_labor || formdata.author_payment || formdata.special_manage_cost || formdata.other_free_income || formdata.personal_endowment || formdata.personal_medical || formdata.personal_unemployment || formdata.personal_house_fund || formdata.childrens_education || formdata.continuing_education || formdata.housing_loan_interest || formdata.housing_rent || formdata.caring_old_people || formdata.serious_illness_medical || formdata.annuity || formdata.commercial_insurance || formdata.tax_extension || formdata.other_fee || formdata.donation_deducted || formdata.year_donation_deducted || formdata.years_bouns || formdata.tax_savings || formdata.accumulated_withholding_tax){
       this.submitRequest(formdata)
     }else{
       this.showToast("其他收入内容不能为空")
@@ -51,7 +51,7 @@ Page({
         "declaring_unit_id":that.data.unit_id,
         "item": {
           "total_salary": that.parseToFloat(request_data.total_salary),  //工资薪金,
-          "remuneration_labor": that.parseToFloat(request_data.setData),  //劳务报酬,
+          "remuneration_labor": that.parseToFloat(request_data.remuneration_labor),  //劳务报酬,
           "author_payment": that.parseToFloat(request_data.author_payment),  //稿酬,
           "special_manage_cost": that.parseToFloat(request_data.special_manage_cost),  //特许经营权使用费,
           "other_free_income": that.parseToFloat(request_data.other_free_income),  //其他免税收入,
@@ -71,9 +71,9 @@ Page({
           "commercial_insurance": that.parseToFloat(request_data.commercial_insurance),  //商业健康保险
           "tax_extension": that.parseToFloat(request_data.tax_extension),   //税延养老保险
           "other_fee": that.parseToFloat(request_data.other_fee),//其他税前扣除额
-          "donation_deducted": that.parseToFloat(request_data.donation_deducted),  //准予扣除的捐赠
+          "year_donation_deducted": that.parseToFloat(request_data.year_donation_deducted),  //准予扣除的捐赠
           "years_bouns": that.parseToFloat(request_data.years_bouns),  //全年一次性奖金
-
+          "donation_deducted": that.parseToFloat(request_data.donation_deducted),  //准予扣除的捐赠
           "tax_savings": that.parseToFloat(request_data.tax_savings),  //减免税额
           "accumulated_withholding_tax": that.parseToFloat(request_data.accumulated_withholding_tax),  //应扣缴税额
         },
--- a/pages/main/finalpay/addUnitInfo/addUnitInfo.wxml
查看文件 @b1509e0
+++ b/pages/main/finalpay/addUnitInfo/addUnitInfo.wxml
查看文件 @b1509e0
@@ -136,7 +136,7 @@
         <view class='divide_line_30'></view>
         <view style="height:104rpx;padding:0 30rpx">
           <text class="text_gray7_34" style="line-height:104rpx">准予扣除的捐赠额</text>
-          <input class='input_wrap' style='text-align: right;color:#000;' type="digit" placeholder='请输入' name='donation_deducted'></input>
+          <input class='input_wrap' style='text-align: right;color:#000;' type="digit" placeholder='请输入' name='year_donation_deducted'></input>
         </view>
         <view style="height:104rpx;padding:0 30rpx;margin-top:20rpx">
           <text class="text_gray7_34" style="line-height:104rpx">全年一次性奖金</text>
--- a/pages/main/finalpay/home.wxml
查看文件 @b1509e0
+++ b/pages/main/finalpay/home.wxml
查看文件 @b1509e0
@@ -60,7 +60,7 @@
         <view class="divide_line_f5f5f5"></view>
         <view style="margin:20rpx 0">
           <text class="text_black_bold">{{uniqual_title01}}:</text>
-          <text wx:if="{{declare_status=='1'}}" class="text_gray3_28 float_right" style="line-height:50rpx">计算中</text>
+          <text wx:if="{{declare_status=='2'}}" class="text_orange_28 float_right" style="line-height:50rpx">计算中</text>
           <text wx:else class="text_orange_28 float_right" style="line-height:50rpx">￥{{new_refund_tax}}</text>
           <view wx:if="{{uniqual_content01=='已放弃'}}" class="light_gray_bg">
             <text style="font-size:11px;color:rgba(0,0,0,0.35);margin: 0 auto">{{uniqual_content01}}</text>
--- a/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @b1509e0
+++ b/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @b1509e0
@@ -129,7 +129,7 @@
       </view>
       <view>
         <text class="text_black6_32">准予扣除的捐赠额</text>
-        <text class="text_black6_32 float_right">{{incomeInfo.donation_deducted}}</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.year_donation_deducted}}</text>
       </view>
     </view>
     <!-- 减免/已缴纳税额 -->