Merge branch 'dev_wy' into 机器人dev

# Conflicts: # pages/main/addtionalreduce/adddupporters/adddupporters.js

Merge branch 'dev_wy' into 机器人dev
# Conflicts: # pages/main/addtionalreduce/adddupporters/adddupporters.js
wangyu
pages/main/addtionalreduce/adddupporters/adddupporters.js
pages/main/addtionalreduce/adddupporters/adddupporters.wxml
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
pages/main/taxperson/idinfo/idinfo.js
--- a/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @aa535eb
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @aa535eb
@@ -2,8 +2,6 @@
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 var format = require('../../../../utils/util.js');
-
-const cardTypeArray = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 Page({
   /**
@@ -17,19 +15,11 @@ Page({
     id_card_no: "",
     birthday: "",
     datas: "",
-    cardtypeData: {
-      isrequre: true,
-      label: '证照类型',
-      bindtype: 'cardtype',
-      placeholder: '请选择证照类型',
-      selected: '',
-      values: cardTypeArray,
-      // range_key:'name',
-      // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
-      //   '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
-      // ],
-      onChange: 'onPickerSelect'
-    },
+    cardTypeArray : ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
+    countryArray:[],
+    countryAbleChoosed:false,
+    cardtype:"",
+    nation:"",
     birthday_datelong: -1,
   },
@@ -50,12 +40,14 @@ Page({
         datas: curdata,
         supporter_id: curdata.id,
         name: curdata.co_supporter,
+        cardtype: curdata.id_card_type,
+        nation: curdata.nation,
         id_card_no: curdata.id_card_no,
         birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
         birthday_datelong: curdata.birthday
       })
     }
-
+    this.getCountry()
   },
   /**
@@ -104,6 +96,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'
@@ -117,10 +151,14 @@ Page({
     if (!formdata.name || formdata.name.length < 1) {
       this.showToast("请输入姓名")
       return;
-    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
-      this.showToast("请输入身份证号")
+    } 
+    if (this.data.cardtype.length<1){
+      this.showToast("请选择证照类型")
       return;
-    } else if (!format.isIDCardNum(formdata.id_card_no)) {
+    }else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+      this.showToast("请输入证件号码")
+      return;
+    } else if (this.data.cardtype=='居民身份证'&&!format.isIDCardNum(formdata.id_card_no)) {
       this.showToast("证件号码有误")
       return;
     }
@@ -128,6 +166,10 @@ Page({
       this.showToast("请选择出生日期")
       return;
     }
+    if (this.data.nation.length < 1) {
+      this.showToast("请选择国籍")
+      return;
+    }
     this.goAdd(formdata)
   },
@@ -140,10 +182,14 @@ Page({
         "id": that.data.supporter_id,
         "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,
+<<<<<<< HEAD
         "id_card_type": "居民身份证",
+=======
+        "id_card_type": that.data.cardtype,
+>>>>>>> dev_wy
         "id_card_no": formdata.id_card_no,
         "birthday": that.data.birthday_datelong,
-        "nation": "中国",
+        "nation": that.data.nation,
         "relation_ship": "兄、弟、姐、妹"
       },
       header: {
@@ -178,6 +224,23 @@ Page({
     })
   },
+  bindCardtypeChange:function(e){
+    console.log('bindCardtypeChange', e)
+    var card_type = this.data.cardTypeArray[e.detail.value]
+    this.setData({
+      cardtype: card_type,
+      nation: card_type == "居民身份证" || card_type == "中国护照" ? "中国" : (this.data.nation == "中国" ? "" : this.data.nation),
+      countryAbleChoosed: card_type == "居民身份证" || card_type == "中国护照" ? true : false
+    })
+  },
+
+  bindnationChange: function (e) {
+    console.log('bindnationChange', e)
+    this.setData({
+      nation: this.data.countryArray[e.detail.value]
+    })
+  },
+
   showToast: function(data) {
     if (data && data.length > 0) {
       wx.showToast({
@@ -190,7 +253,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
查看文件 @aa535eb
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.wxml
查看文件 @aa535eb
@@ -10,39 +10,53 @@
       <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>
-    <view style='height:90rpx;padding:0 30rpx'>
+    <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>
-      <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
+      <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
+      <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>
-    <!-- <view style="margin:0 30rpx">
-      <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-    </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">
+    <picker mode="date" value="{{date}}" start="1949-01-01" end="2019-01-01" bindchange="bindDateChange">
       <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'>{{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}}" disabled="{{countryAbleChoosed}}">
+    <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/additiondetail/additiondetail.wxml
查看文件 @aa535eb
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @aa535eb
@@ -22,7 +22,11 @@
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>国籍</text>
-        <text class='text_right_333'>中国</text>
+        <text class='text_right_333'>{{datas.children_nation}}</text>
+      </view>
+      <view style='height:90rpx;width:100%;clear:both;'>
+        <text class='text_left'>与纳税人的关系</text>
+        <text class='text_right_333'>{{datas.relationship}}</text>
       </view>
     </view>
@@ -41,22 +45,22 @@
         <text class='text_right_333'>{{datas.education_period}}</text>
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
-        <text class='text_left'>受教育期间起</text>
+        <text class='text_left'>受教育时间起</text>
         <text class='text_right_333'>{{datas.education_start}}</text>
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
-        <text class='text_left'>受教育期间止</text>
+        <text class='text_left'>受教育时间止</text>
         <text class='text_right_333'>{{datas.education_end}}</text>
       </view>
       <view wx:if="{{datas.education_end&&datas.education_end.length>1}}" style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>教育终止时间</text>
         <text class='text_right_333'>{{datas.education_period_end}}</text>
       </view>
-      <view style='height:90rpx;width:100%;clear:both;'>
+      <view wx:if="{{datas.school_country&&datas.school_country.length>1}}" style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>就读国家(地区)</text>
         <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国'}}</text>
       </view>
-      <view style='width:100%;clear:both;'>
+      <view wx:if="{{datas.school_name&&datas.school_name.length>1}}"  style='width:100%;clear:both;'>
         <text class='text_left'>就读学校名称</text>
         <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.school_name}}</view>
         <!-- <text class='text_right_333'>{{datas.school_name}}</text> -->
@@ -99,7 +103,7 @@
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>国籍</text>
-          <text class='text_right_333'>中国</text>
+          <text class='text_right_333'>{{datas.spouse_nation}}</text>
         </view>
       </view>
@@ -135,7 +139,7 @@
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>被赡养人国籍</text>
-      <text class='text_right_333'>中国</text>
+      <text class='text_right_333'>{{datas.nation}}</text>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>与纳税人关系</text>
@@ -168,7 +172,7 @@
           <text class='text_left'>出租方类型</text>
           <text class='text_right_333'>{{datas.owner_type}}</text>
         </view>
-        <view style='width:100%;clear:both;'>
+        <view wx:if="{{datas.owner_name&&datas.owner_name.length>1}}" style='width:100%;clear:both;'>
           <text class='text_left'>出租方名称</text>
           <view class='float_right' style='padding:12px 0;font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{datas.owner_name}}</view>
           <!-- <text class='text_right_333'>{{datas.owner_name}}</text> -->
@@ -180,11 +184,11 @@
         <text class='text_right_333'>{{datas.owner_credit_no}}</text>
       </view> -->
         <view wx:if="{{datas.owner_type=='个人'}}">
-          <view style='height:90rpx;width:100%;clear:both;'>
+          <view wx:if="{{datas.owner_id_card_type&&datas.owner_id_card_type.length>1}}"  style='height:90rpx;width:100%;clear:both;'>
             <text class='text_left'>证照类型</text>
             <text class='text_right_333'>{{datas.owner_id_card_type=='1'?"居民身份证":datas.owner_id_card_type}}</text>
           </view>
-          <view style='height:90rpx;width:100%;clear:both;'>
+          <view wx:if="{{datas.owner_id_card_no&&datas.owner_id_card_no.length>1}}"  style='height:90rpx;width:100%;clear:both;'>
             <text class='text_left'>证照号码</text>
             <text class='text_right_333'>{{datas.owner_id_card_no}}</text>
           </view>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @aa535eb
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @aa535eb
@@ -59,9 +59,9 @@
             </view>
             <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5' style="margin-bottom:6rpx"></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'>{{item.children_name}}</text>
+              <view>
+                <text class='text_999_28 float_left' style='line-height:70rpx;'>子女姓名：</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx;word-wrap: break-word;'>{{item.children_name}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
@@ -194,9 +194,13 @@
               <view style='padding-right:30rpx'>
                 <view class='divide_line_f5f5f5'></view>
-                <view style='height:70rpx'>
+                <!-- <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'>{{item.supported_name}}</text>
+                </view> -->
+                <view>
+                  <text class='text_999_28 float_left' style='line-height:70rpx;'>被赡养人姓名：</text>
+                  <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx;word-wrap: break-word;'>{{item.supported_name}}</text>
                 </view>
                 <view style='height:70rpx'>
                   <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
@@ -225,13 +229,13 @@
                 <view style='padding-right:30rpx'>
                   <view class='divide_line_f5f5f5'></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.co_supporter}}</text>
+                  <view>
+                    <text class='text_999_28 float_left' style='line-height:70rpx;'>共同赡养人姓名：</text>
+                    <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx;word-wrap: break-word;'>{{itemdetail.co_supporter}}</text>
                   </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>
@@ -249,7 +253,7 @@
                     <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
                     <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
                   </view>
-                  <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}">
+                  <view class='float_right'>
                     <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
                     <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
                   </view>
--- a/pages/main/taxperson/idinfo/idinfo.js
查看文件 @aa535eb
+++ b/pages/main/taxperson/idinfo/idinfo.js
查看文件 @aa535eb
@@ -108,6 +108,7 @@ Page({
         'signature': OSSInit.signature,
         'callback': OSSInit.callback_body,
         'x:access_token': OSSInit.callback_token,
+        // 'x-oss-security-token': OSSInit.security_token,
         'success_action_status': '200',
       },
       success: function(res) {