Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

@@ -962,6 +962,10 @@ Page({
           this.showToast('请填写子女证照号码')
           return
         }
+        if (!format.isIDCardNum(formdata.children_id_card_no)) {
+          this.showToast('身份证格式有误')
+          return
+        }
         if (!formdata.children_name || formdata.children_name.length < 1) {
           this.showToast('请填写子女姓名')
           return
@@ -1002,7 +1006,10 @@ Page({
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             return
-          } else if (this.data.loverbirthDate.selected.length < 1) {
+          } else if (!format.isIDCardNum(formdata.spouse_id_card_no)) {
+            this.showToast('配偶身份证格式有误')
+            return
+          }else if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             return
           }
@@ -1092,6 +1099,9 @@ Page({
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
           this.showToast('请填写赡养人证照号')
           return
+        } else if (!format.isIDCardNum(formdata.id_card_no)) {
+          this.showToast('赡养人身份证格式有误')
+          return
         }
         if (this.data.olderbirthDate.selected.length < 1) {
           this.showToast('请选择赡养人出生日期')
@@ -1124,6 +1134,9 @@ Page({
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
           this.showToast('请填写证照号码')
           return
+        } else if (!format.isIDCardNum(formdata.id_card_no)) {
+          this.showToast('身份证格式有误')
+          return
         } else if (this.data.commonbirthDate.selected.length < 1) {
           this.showToast('请选择病人出生日期')
           return
@@ -1221,6 +1234,9 @@ Page({
           } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
             this.showToast('请填写证照号码')
             return
+          } else if (!format.isIDCardNum(formdata.owner_id_card_no)) {
+            this.showToast('身份证格式有误')
+            return
           } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择房屋地址')
             return
@@ -1256,6 +1272,9 @@ Page({
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             return
+          } else if (!format.isIDCardNum(formdata.spouse_id_card_no)) {
+            this.showToast('配偶身份证格式有误')
+            return
           } else if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             return

@@ -19,24 +19,24 @@
         <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.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
-          <!-- <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>
-          <text class='text_666_28'>本期应缴税额:{{item.personal_tax}}</text>
+          <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</text> -->
+          <text class='text_999_28'>当期收入额:{{item.personal_income}}</text>
+          <text class='text_999_28'>累计应缴纳所得额:{{item.accumulated_taxable_income}}</text>
+          <text class='text_999_28'>累计应扣缴税额:{{item.accumulated_withholding_tax}}</text>
+          <text class='text_999_28'>已预交税额:{{item.prepay_tax}}</text>
+          <text class='text_999_28'>本期应缴税额:{{item.personal_tax}}</text>
         </view>
       </view>
     </view>
     <view wx:else>     <!-- 工资明细 -->
       <view wx:for="{{salaryDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx'>
-          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:  {{item.program}}</text>
+          <text class='text_blue_36'>薪酬批次工资:  {{item.program}}</text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
-          <text class='text_666_28'>发薪日:{{item.payroll_date}}</text>
-          <text class='text_666_28'>计薪时间:{{item.count_date}}</text>
-          <text class='text_666_28'>应发额度:{{item.pay_salary}}</text>
-          <text class='text_666_28'>实发:{{item.salary}}</text>
+          <text class='text_999_28'>发薪日:<text class='text_333_28'>{{item.payroll_date}}</text></text>
+          <text class='text_999_28'>计薪时间:<text class='text_333_28'>{{item.count_date}}</text></text>
+          <text class='text_999_28'>应发额度:<text class='text_333_28'>{{item.pay_salary}}</text></text>
+          <text class='text_999_28'>实发:<text class='text_333_28 text_color_28'>¥{{item.salary}}</text></text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
           <view wx:if="{{!isshow}}" bindtap='gospan' id='{{item.id}}'>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>

@@ -6,12 +6,23 @@
   line-height: 70rpx;
 }
 
-.text_666_28 {
+.text_999_28 {
   font-size: 28rpx;
-  color: #666;
+  color: #999;
   font-family:  PingFangSC-Regular;
+  line-height: 70rpx;
+  text-align:left;
+}
+.text_333_28 {
+  color: #333;
+  position: absolute;
+  left: 190rpx;
+  line-height: 70rpx;
+}
+.text_color_28{
+  font-family: PingFangSC-Semibold;
+  color: #FF9F00;
 }
-
 .arrow_wrap {
   position: relative;
   width: 20rpx;
@@ -65,6 +76,12 @@
   font-family: PingFangSC-Semibold;
   line-height: 100rpx;
 }
+.text_blue_36 {
+  font-size: 36rpx;
+  color: #6c7596;
+  font-family: PingFangSC-Medium;
+  line-height: 50rpx;
+}
 
 .icon_wrap {
   width: 8rpx;

@@ -110,7 +110,7 @@ Page({
   //对各参数初始赋值
   handleDatas: function (tax_info) {
 
-    var isDisable = tax_info.certification_status != 'active'//已通过拍摄身份证认证过，不能修改
+    var isDisable = tax_info.certification_status == 'active'//已通过拍摄身份证认证过，不能修改
 
     this.data.relativeData.selected = tax_info.family_ties
     // this.data.cardtypeData.selected = tax_info.id_card_type