专项附加开始非居民逻辑

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/editinfo/editinfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @264504c
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @264504c
@@ -65,7 +65,7 @@ Page({
     lovercardtypeData: {
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
-      selected: '居民身份证',
+      // selected: '居民身份证',
       disabled: true,
       placeholder: '请选择证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
@@ -506,6 +506,16 @@ Page({
       placeholder: '中国',
       onChange: 'onPickerSelect',
     },
+    countryData: {
+      label: '国籍',
+      bindtype: 'country',
+      isrequre: true,
+      disabled: true,
+      selected: '中国',
+      // range_key:'name',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
     // bankInfo: {
     //   label: '公积金贷款银行',
     //   bindtype: 'bank',
@@ -708,10 +718,18 @@ Page({
           if (data.name && data.name.length) {
             setData.spouse_name = data.name
           }
+          that.data.lovercardtypeData.selected = data.id_card_type
+          setData.lovercardtypeData = that.data.lovercardtypeData
           if (data.id_card_no && data.id_card_no.length) {
             setData.spouse_id_card_no = data.id_card_no
-            that.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+            if ('居民身份证' == data.id_card_type) {
+              that.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+            }
           }
+          that.data.loverbirthDate.selected = format.formatTime_date(data.birth_date)
+          that.data.loverbirthDate.datelong = data.birth_date
+          setData.loverbirthDate = that.data.loverbirthDate
+          setData.lover_country = data.native
           that.setData(setData)
         }
       },
@@ -785,6 +803,8 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
+        this.data.countryData.selected = data.native
+        setData.countryData = this.data.countryData
         if (data.relationship && data.relationship.length) {
           this.data.taxperson_relativeData.selected = data.relationship
           setData.taxperson_relativeData = this.data.taxperson_relativeData
@@ -817,7 +837,9 @@ Page({
         setData.deduction_amount = data.deduction_amount
         if (data.children_id_card_no && data.children_id_card_no.length) {
           setData.children_id_card_no = data.children_id_card_no
-          this.dealIdInfo(data.children_id_card_no, 'children_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.children_id_card_no, 'children_id_card_no_input')
+          }
         }
         if (data.children_name && data.children_name.length) {
           setData.children_name = data.children_name
@@ -850,7 +872,9 @@ Page({
         }
         if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
           setData.spouse_id_card_no = data.spouse_id_card_no
-          this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input')
+          }
         }
         this.setData(setData)
         break;
@@ -922,7 +946,9 @@ Page({
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.id_card_no = data.id_card_no
-          this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
+          }
         }
         if (data.relationship && data.relationship.length) {
           var older_relativeData = this.data.older_relativeData
@@ -968,7 +994,9 @@ Page({
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.spouse_id_card_no = data.id_card_no
-          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+          }
         }
         if (this.data.house_type == 'house_fund_rent'){
           var workingcityInfo = this.data.workingcityInfo
@@ -1097,13 +1125,17 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
+        this.data.countryData.selected = data.native
+        setData.countryData = this.data.countryData
         var commonbirthDate = this.data.commonbirthDate
         commonbirthDate.selected = format.formatTime_date(data.birth_date)
         commonbirthDate.datelong = data.birth_date
         setData.commonbirthDate = commonbirthDate
         if (data.id_card_no && data.id_card_no.length) {
           setData.children_id_card_no = data.id_card_no
-          this.dealIdInfo(data.id_card_no, 'children_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.id_card_no, 'children_id_card_no_input')
+          }
         }
         if (data.name && data.name.length) {
           setData.children_name = data.name
@@ -1126,7 +1158,9 @@ Page({
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.id_card_no = data.id_card_no
-          this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
+          }
         }
         if (data.family_ties && data.family_ties.length) {
           var older_relativeData = this.data.older_relativeData
@@ -1146,7 +1180,9 @@ Page({
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.id_card_no = data.id_card_no
-          this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input')
+          if ('居民身份证' == data.id_card_type) {
+            this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input')
+          }
         }
         if (data.family_ties && data.family_ties.length) {
           var taxperson_relativeData = this.data.taxperson_relativeData
@@ -1441,13 +1477,13 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
-          newdata.spouse_id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
+          newdata.spouse_id_card_type = this.data.lovercardtypeData.selected
           newdata.spouse_birthday = this.data.loverbirthDate.datelong
         }
         newdata.has_spouse = this.data.hasLover?'y':'n'
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.percent = this.data.childrenpercentData.selected.replace("%","")
-        newdata.children_id_card_type = '居民身份证' //this.data.childrencardtypeData.selected
+        newdata.children_id_card_type = this.data.childrencardtypeData.selected
         newdata.children_birthday = this.data.commonbirthDate.datelong
         newdata.education_period_end = this.data.studyPeriodDate.datelong
         newdata.education_end = this.data.studyEndDate.datelong
@@ -1787,7 +1823,7 @@ Page({
             return
           }
           newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
-          newdata.id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
+          newdata.id_card_type = this.data.lovercardtypeData.selected
           newdata.birthday = this.data.loverbirthDate.datelong
           newdata.nation = "中国"
         }
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @264504c
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @264504c
@@ -28,11 +28,12 @@
         <view class='divide_line_30'></view>
         <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
         <view class='divide_line_30'></view>
-        <view style='height:90rpx'>
+        <template is="picker_cell_normal" data="{{...countryData}}" />
+        <!-- <view style='height:90rpx'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
-        </view>
+        </view> -->
         <view class='divide_line_30'></view>
         <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
       </view>
@@ -243,7 +244,7 @@
       <view style='height:90rpx'>
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>公积金贷款银行</text>
-        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_bank' value='{{loan_bank}}'></input>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入公积金贷款银行' name='loan_bank' value='{{loan_bank}}'></input>
       </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
@@ -374,7 +375,7 @@
     <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>国籍</text>
-      <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right;' name='lover_country'>中国</text>
+      <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right;' name='lover_country'>{{lover_country}}</text>
     </view>
   </view>
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @264504c
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @264504c
@@ -40,12 +40,13 @@
         <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...genderData}}" />
-          <view class="divide_line_30"></view>
-          <view class='item_body'>
-            <text class='red_star_right_10'>*</text>
-            <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text>
-            <input class='input_wrap' name='age' type='number'  placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input>
-          </view>
+        <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...birthDate}}" />
+        <!-- <view class='item_body'>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text>
+          <input class='input_wrap' name='age' type='number'  placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input>
+        </view> -->
         <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...countryData}}" />
         <!-- <view class='item_body'>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @264504c
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @264504c
@@ -422,7 +422,7 @@ Page({
       this.data.birthDate.selected = ''
     } else {
       // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
-      this.data.birthDate.selected = format.birth_date_str //formatTime_date(tax_info.birth_date) 
+      this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) 
     }
 //非必填
     if (tax_info.join_date > 1000) {