优化

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
--- a/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @f351c38
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.js
查看文件 @f351c38
@@ -40,6 +40,8 @@ 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
@@ -154,9 +156,9 @@ Page({
       this.showToast("请选择证照类型")
       return;
     }else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
-      this.showToast("请输入身份证号")
+      this.showToast("请输入证件号码")
       return;
-    } else if (!format.isIDCardNum(formdata.id_card_no)) {
+    } else if (this.data.cardtype=='居民身份证'&&!format.isIDCardNum(formdata.id_card_no)) {
       this.showToast("证件号码有误")
       return;
     }
@@ -165,7 +167,7 @@ Page({
       return;
     }
     if (this.data.nation.length < 1) {
-      this.showToast("请选择出生日期")
+      this.showToast("请选择国籍")
       return;
     }
     this.goAdd(formdata)
--- a/pages/main/addtionalreduce/adddupporters/adddupporters.wxml
查看文件 @f351c38
+++ b/pages/main/addtionalreduce/adddupporters/adddupporters.wxml
查看文件 @f351c38
@@ -32,7 +32,7 @@
       </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>
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @f351c38
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @f351c38
@@ -56,11 +56,11 @@
         <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> -->
@@ -172,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> -->
@@ -184,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
查看文件 @f351c38
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @f351c38
@@ -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>
@@ -226,8 +230,8 @@
                 <view style='padding-right:30rpx'>
                   <view class='divide_line_f5f5f5'></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'>{{itemdetail.co_supporter}}</text>
+                    <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>
@@ -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>