调整共同赡养人相关选项

wangyu
pages/main/addtionalreduce/adddupporters/adddupporters.js
pages/main/addtionalreduce/adddupporters/adddupporters.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
--- a/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @2d083df
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @2d083df
@@ -16,7 +16,10 @@ Page({
     birthday: "",
     datas: "",
     cardTypeArray : ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
+    countryArray:[],
+    countryAbleChoosed:true,
     cardtype:"",
+    nation:"",
     birthday_datelong: -1,
   },
@@ -42,7 +45,7 @@ Page({
         birthday_datelong: curdata.birthday
       })
     }
-
+    this.getCountry()
   },
   /**
@@ -91,6 +94,48 @@ Page({
     })
   },
+  //****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading({
+      title: '',
+    })
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        var countrys = res.data.concat()
+        that.data.countryArray = res.data
+        if (countrys.indexOf('中国') > -1) {
+          countrys.splice(countrys.indexOf('中国'), 1);
+        }
+        if (countrys.indexOf('中国台湾') > -1) {
+          countrys.splice(countrys.indexOf('中国台湾'), 1);
+        }
+        if (countrys.indexOf('香港') > -1) {
+          countrys.splice(countrys.indexOf('香港'), 1);
+        }
+        if (countrys.indexOf('澳门') > -1) {
+          countrys.splice(countrys.indexOf('澳门'), 1);
+        }
+        that.setData({
+          countryArray: countrys,
+        })
+      },
+      fail(res) {
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
+  },
+
   getIdInfo: function(e) {
     wx.navigateTo({
       url: '../../taxperson/idinfo/idinfo'
@@ -104,7 +149,11 @@ Page({
     if (!formdata.name || formdata.name.length < 1) {
       this.showToast("请输入姓名")
       return;
-    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+    } 
+    if (this.data.cardtype.length<1){
+      this.showToast("请选择证照类型")
+      return;
+    }else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
       this.showToast("请输入身份证号")
       return;
     } else if (!format.isIDCardNum(formdata.id_card_no)) {
@@ -115,6 +164,10 @@ Page({
       this.showToast("请选择出生日期")
       return;
     }
+    if (this.data.nation.length < 1) {
+      this.showToast("请选择出生日期")
+      return;
+    }
     this.goAdd(formdata)
   },
@@ -127,10 +180,10 @@ Page({
         "id": that.data.supporter_id,
         "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,
-        "id_card_type": "1",
+        "id_card_type": that.data.cardtype,
         "id_card_no": formdata.id_card_no,
         "birthday": that.data.birthday_datelong,
-        "nation": "中国",
+        "nation": that.data.nation,
         "relation_ship": "兄、弟、姐、妹"
       },
       header: {
@@ -167,7 +220,23 @@ Page({
   bindCardtypeChange:function(e){
     console.log('bindCardtypeChange', e)
-    
+    var card_type = this.data.cardTypeArray[e.detail.value]
+    var 
+    var nation = this.data.nation
+    if (card_type=="居民身份证"||card_type=="中国护照"){
+      nation = "中国"
+    }
+    this.setData({
+      cardtype: card_type,
+      nation: nation
+    })
+  },
+
+  bindnationChange: function (e) {
+    console.log('bindnationChange', e)
+    this.setData({
+      nation: this.data.countryArray[e.detail.value]
+    })
   },
   showToast: function(data) {
@@ -182,7 +251,7 @@ Page({
   bindinput: function(e) {
     console.log("bindinput", e.detail.value)
     var idCardNo = e.detail.value
-    if (idCardNo.length == 18) {
+    if (this.data.cardtype=='居民身份证'&&idCardNo.length == 18) {
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
           image: "../../../../images/warn.png",
--- a/pages/main/addtionalreduce/adddupporters/adddupporters.wxml
查看文件 @2d083df
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.wxml
查看文件 @2d083df
@@ -10,23 +10,26 @@
       <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input>
     </view>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
-    
-    <picker bindchange="bindPickerChange" value="{{index}}" range="{{cardTypeArray}}">
-    <view style='height:90rpx;padding:0 30rpx ' bindchange="bindCardtypeChange">
+    <picker bindchange="bindCardtypeChange" value="{{index}}" range="{{cardTypeArray}}">
+    <view style='height:90rpx;padding:0 30rpx '>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照类型</text>
       <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
-      <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{cardtype}}</text>
+      <text wx:if="{{cardtype.length<1}}" class='text_999_30 float_right' style="line-height: 90rpx;">请输入证照类型</text>
+      <text wx:else style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{cardtype}}</text>
     </view>
   </picker>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照号码</text>
-      <view>
+      <view wx:if="{{cardtype=='居民身份证'}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
         <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
+      <view wx:else>
+        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='24' value='{{id_card_no}}' bindinput="bindinput"></input>
+      </view>
     </view>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <picker mode="date" value="{{date}}" start="1919-01-01" end="2017-09-01" bindchange="bindDateChange">
@@ -34,16 +37,26 @@
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人出生日期</text>
         <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
-        <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{birthday}}</text>
+        <text wx:if="{{birthday.length<1}}" class='text_999_30 float_right' style="line-height: 90rpx;">请输入出生日期</text>
+        <text wx:else style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{birthday}}</text>
       </view>
     </picker>
     <!-- <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> -->
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
-    <view style='height:90rpx;padding:0 30rpx'>
+    <!-- <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
       <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>中国</text>
+    </view> -->
+    <picker bindchange="bindnationChange" value="{{index}}" range="{{countryArray}}">
+    <view style='height:90rpx;padding:0 30rpx '>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
+      <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
+      <text wx:if="{{nation.length<1}}" class='text_999_30 float_right' style="line-height: 90rpx;">请选择国籍</text>
+      <text wx:else style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{nation}}</text>
     </view>
+  </picker>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @2d083df
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @2d083df
@@ -231,7 +231,7 @@
                   </view>
                   <view style='height:70rpx'>
                     <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
-                    <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_type=='1'?"居民身份证":itemdetail.id_card_type}}</text>
+                    <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_type}}</text>
                   </view>
                   <view style='height:70rpx'>
                     <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>