附表相关逻辑优化

wangyu
pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
pages/main/finalpay/donationDetail/donationDetail.js
pages/main/finalpay/donationDetail/donationDetail.wxml
pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
pages/main/finalpay/incomeDetail/incomeDetail.js
pages/main/finalpay/incomeDetail/incomeDetail.wxml
pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
--- a/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxml
查看文件 @43da1c0
@@ -35,19 +35,19 @@
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindProjectChange" range="{{project}}">
       <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="{{income_item}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' value="{{income_item}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductContent" range="{{deductcontent}}">
       <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="{{reduction_item}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  value="{{reduction_item}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductProperty" range="{{deductproperty}}">
       <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="{{reduction_nature}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{reduction_nature}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
--- a/pages/main/finalpay/donationDetail/donationDetail.js
查看文件 @43da1c0
+++ b/pages/main/finalpay/donationDetail/donationDetail.js
查看文件 @43da1c0
 // pages/main/finalpay/donationDetail/donationDetail.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+const regex = /^[0-9a-zA-Z]{1,}$/
 Page({
   /**
@@ -116,16 +117,16 @@ Page({
       })
       return
     }
-    if (!this.data.donated_unit_code || this.data.donated_unit_code.length < 1) {
-      this.showToast("请填写受赠单位纳税人识别号")
+    if (this.data.donated_unit_code.length > 0 && !regex.test(this.data.donated_unit_code)) {
+      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("请填写捐赠凭证码")
+    if (this.data.donation_code.length > 0 && !regex.test(this.data.donation_code)) {
+      this.showToast("捐赠凭证码格式有误")
       return
     }
     if (!this.data.donation_year || this.data.donation_year.length < 1) {
--- a/pages/main/finalpay/donationDetail/donationDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/donationDetail/donationDetail.wxml
查看文件 @43da1c0
@@ -62,7 +62,7 @@
     <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>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donation_code" bindblur="getInputInfo" maxlength="20" value="{{donation_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
@@ -74,14 +74,14 @@
     <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>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" maxlength="20" 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>
+      <input class='input_wrap' disabled="true" 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">
@@ -90,7 +90,7 @@
     </view>
   </view>
-  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:84rpx" bindtap="addItem">
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:168rpx" bindtap="addItem">
     <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
     <text style="font-size:28rpx;color:#4986fe">继续添加</text>
   </view>
--- a/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxml
查看文件 @43da1c0
@@ -35,19 +35,19 @@
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindProjectChange" range="{{project}}">
       <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="{{income_item}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' value="{{income_item}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductContent" range="{{deductcontent}}">
       <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="{{reduction_item}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  value="{{reduction_item}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductProperty" range="{{deductproperty}}">
       <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="{{reduction_nature}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{reduction_nature}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
--- a/pages/main/finalpay/incomeDetail/incomeDetail.js
查看文件 @43da1c0
+++ b/pages/main/finalpay/incomeDetail/incomeDetail.js
查看文件 @43da1c0
@@ -11,6 +11,7 @@ Page({
     currentTab:1,
     year:"2019",
     incomeInfo:{},
+    showExtraInfo:false
   },
   /**
@@ -36,7 +37,15 @@ Page({
   */
   swichNav: function (e) {
     var that = this;
-
+    if (e.target.dataset.current==3){
+      that.setData({
+        showExtraInfo: true
+      })
+    }else{
+      that.setData({
+        showExtraInfo: false
+      })
+    }
     if (this.data.currentTab === e.target.dataset.current) {
       return false;
     } else {
--- a/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @43da1c0
@@ -34,7 +34,7 @@
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
         <text class="text_black3_34">免税收入</text>
-        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="freeIncomeDetail">查看附表</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="freeIncomeDetail">查看附表</text>
       </view>
       <view>
         <text class="text_black6_32">其他免税收入</text>
@@ -97,7 +97,7 @@
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
         <text class="text_black3_34">其他扣除</text>
-        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="otherDeductDetail">查看附表</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="otherDeductDetail">查看附表</text>
       </view>
       <view>
         <text class="text_black6_32">年金</text>
@@ -120,11 +120,11 @@
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
         <text class="text_black3_34">捐赠扣除</text>
-        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="donationDetail">查看明细</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="donationDetail">查看明细</text>
       </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 style="margin-top:20rpx">
         <text class="text_black6_32">全年一次性奖金</text>
@@ -132,14 +132,14 @@
       </view>
       <view>
         <text class="text_black6_32">准予扣除的捐赠额</text>
-        <text class="text_black6_32 float_right">{{incomeInfo.year_donation_deducted}}</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.donation_deducted}}</text>
       </view>
     </view>
     <!-- 减免/已缴纳税额 -->
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
         <text class="text_black3_34">减免/已缴纳税额</text>
-        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="deductOrPayedDetail">查看明细</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="deductOrPayedDetail">查看明细</text>
       </view>
       <view>
         <text class="text_black6_32">减免税额</text>
--- a/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
查看文件 @43da1c0
+++ b/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
查看文件 @43da1c0
@@ -2,6 +2,7 @@
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 var format = require('../../../../utils/util.js');
+const regex = /^[0-9a-zA-Z]{1,}$/
 Page({
   /**
@@ -157,6 +158,10 @@ Page({
       this.showToast("请填写税延养老账号编号")
       return
     }
+    if (!regex.test(this.data.tax_extension_account)) {
+      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
@@ -165,12 +170,8 @@ Page({
       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("请填写月度保费")
+    if (!regex.test(this.data.tax_check_code)) {
+      this.showToast("报税校验码格式有误")
       return
     }
     if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
@@ -182,7 +183,11 @@ Page({
   goSubmit: function(type) {
     if (!this.data.tax_extension_account || this.data.tax_extension_account.length < 1) {
-      this.showToast("请填写税延养老账号编号")
+      this.showToast("请填写税延养老账户编号")
+      return
+    }
+    if (!regex.test(this.data.tax_extension_account)) {
+      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) {
@@ -193,12 +198,8 @@ Page({
       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("请填写月度保费")
+    if (!regex.test(this.data.tax_check_code)) {
+      this.showToast("报税校验码格式有误")
       return
     }
     if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
--- a/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml
查看文件 @43da1c0
@@ -9,7 +9,7 @@
   <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>
+      <text class="text_gray7_34">税延养老账户编号</text>
       <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>
@@ -54,28 +54,28 @@
   <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>
+      <text class="text_gray7_34">税延养老账户编号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_extension_account" bindblur="getInputInfo" maxlength="20" 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>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_start_date}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <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='请选择'  value="{{option_end_date}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_end_date}}" disabled="true"></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='请输入' id="tax_check_code" bindblur="getInputInfo" value="{{tax_check_code}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_check_code" bindblur="getInputInfo" maxlength="20" 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">
--- a/pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
查看文件 @43da1c0
+++ b/pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
查看文件 @43da1c0
@@ -2,6 +2,7 @@
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 var format = require('../../../../utils/util.js');
+const regex = /^[0-9a-zA-Z]{1,}$/
 Page({
   /**
@@ -131,16 +132,12 @@ Page({
       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("请填写年度保费")
+    if (!regex.test(this.data.tax_code)) {
+      this.showToast("税优识别码格式有误")
       return
     }
-    if (!this.data.month_premium || this.data.month_premium.length < 1) {
-      this.showToast("请填写月度保费")
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
       return
     }
     if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
@@ -155,16 +152,12 @@ Page({
       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("请填写年度保费")
+    if (!regex.test(this.data.tax_code)) {
+      this.showToast("税优识别码格式有误")
       return
     }
-    if (!this.data.month_premium || this.data.month_premium.length < 1) {
-      this.showToast("请填写月度保费")
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
       return
     }
     if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
--- a/pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
查看文件 @43da1c0
+++ b/pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxml
查看文件 @43da1c0
@@ -9,7 +9,7 @@
     <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_code}}"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" maxlength="20"  value="{{item.tax_code}}"></input>
     </view>
     <view class="divide_line_30"></view>
     <view class="divide_line_30"></view>
@@ -50,7 +50,7 @@
       <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>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{effect_date}}" disabled="true"></input>
     </picker>
     <view class="divide_line_30"></view>
     <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">