优化

@@ -8,11 +8,13 @@ Page({
    * Page initial data
    * Page initial data
    */
    */
   data: {
   data: {
-    support_duty_id: "",
+    legal_entity_id: "",
+    supporter_id:"",
     name: "",
     name: "",
     nation: "",
     nation: "",
     id_card_no: "",
     id_card_no: "",
     birthday:"",
     birthday:"",
+    datas:"",
     birthday_datelong: -1,
     birthday_datelong: -1,
   },
   },
 
 
@@ -21,9 +23,24 @@ Page({
    */
    */
   onLoad: function(options) {
   onLoad: function(options) {
     console.log("onLoad", options)
     console.log("onLoad", options)
-    this.setData({
-      support_duty_id: options.id
-    })
+    if (options.id){
+      this.setData({
+        legal_entity_id: options.id,
+      })
+    }
+  
+    if (options.datas && JSON.parse(options.datas)){
+      var curdata = JSON.parse(options.datas) 
+      this.setData({
+        datas: curdata,
+        supporter_id: curdata.id,
+        name: curdata.co_supporter,
+        id_card_no: curdata.id_card_no,
+        birthday: curdata.birthday,
+        birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000
+      })
+    }
+
   },
   },
 
 
   /**
   /**
@@ -109,7 +126,8 @@ Page({
     wx.request({
     wx.request({
       url: baseUrl + 'persontax/v1/co-supporters',
       url: baseUrl + 'persontax/v1/co-supporters',
       data: {
       data: {
-        "support_duty_id": that.data.support_duty_id,
+        "id": that.data.supporter_id,
+        "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,
         "co_supporter": formdata.name,
         "id_card_type": "1",
         "id_card_type": "1",
         "id_card_no": formdata.id_card_no,
         "id_card_no": formdata.id_card_no,

@@ -36,12 +36,14 @@ Page({
     var pages = getCurrentPages();
     var pages = getCurrentPages();
     //获取上一个页面的所有的方法和data中的数据
     //获取上一个页面的所有的方法和data中的数据
     var lastpage = pages[pages.length - 2]
     var lastpage = pages[pages.length - 2]
+    var info = options.datas ? JSON.parse(options.datas) : {}
+
     console.log("lastpage", lastpage.data);
     console.log("lastpage", lastpage.data);
     // this.handleData(options.datas)
     // this.handleData(options.datas)
     this.setData({
     this.setData({
       cur_status: options.status,
       cur_status: options.status,
       house_type: lastpage.data.house_type,
       house_type: lastpage.data.house_type,
-      datas: options.datas?JSON.parse(options.datas):{}
+      datas: info
     })
     })
     wx.setNavigationBarTitle({
     wx.setNavigationBarTitle({
       title: that.data.additiontitle[options.status],
       title: that.data.additiontitle[options.status],

@@ -199,7 +199,7 @@
         <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
         <view wx:if="{{datas.house_detail_address.length>0}}" style='height:90rpx;clear:both;'>
           <text class='text_right_333' style='line-height:40rpx;'>{{datas.house_detail_address}}</text>
           <text class='text_right_333' style='line-height:40rpx;'>{{datas.house_detail_address}}</text>
         </view>
         </view>
-        <view style='height:90rpx;width:100%;clear:both;'>
+        <view wx:if="{{datas.rent_contract_no&&datas.rent_contract_no.length>0}}" style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>租赁合同编号</text>
           <text class='text_left'>租赁合同编号</text>
           <text class='text_right_333'>{{datas.rent_contract_no}}</text>
           <text class='text_right_333'>{{datas.rent_contract_no}}</text>
         </view>
         </view>
@@ -225,7 +225,7 @@
     <!-- //贷款 -->
     <!-- //贷款 -->
     <view wx:if="{{house_type=='house_fund_loan'}}">
     <view wx:if="{{house_type=='house_fund_loan'}}">
       <view style='padding:0 30rpx'>
       <view style='padding:0 30rpx'>
-        <view style='height:90rpx;width:100%;clear:both;'>
+        <view wx:if="{{datas.house_address_new&&datas.house_address_new.length>0}}" style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>房屋坐落地址</text>
           <text class='text_left'>房屋坐落地址</text>
           <text class='text_right_333'>{{datas.house_address_new}}</text>
           <text class='text_right_333'>{{datas.house_address_new}}</text>
         </view>
         </view>
@@ -241,7 +241,7 @@
           <text class='text_right_333'>{{datas.certification_no}}</text>
           <text class='text_right_333'>{{datas.certification_no}}</text>
         </view>
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;width:100%;clear:both;'>
-          <text class='text_left'>是否首套婚前贷款且婚后各自扣除</text>
+          <text class='text_left'>是否首套婚前贷款且婚后分别扣除50%</text>
           <text class='text_right_333'>{{datas.loan_before_marry=='y'?"是":"否"}}</text>
           <text class='text_right_333'>{{datas.loan_before_marry=='y'?"是":"否"}}</text>
         </view>
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;width:100%;clear:both;'>

@@ -25,7 +25,7 @@
                 <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
                 <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
                   <view wx:if="{{index==0}}">
                   <view wx:if="{{index==0}}">
                     <text wx:if='{{itemData.majors.length>1}}' style='font-size:28rpx;color:#666'>学历(学位)继续教育 ({{itemData.majors.length}})</text>
                     <text wx:if='{{itemData.majors.length>1}}' style='font-size:28rpx;color:#666'>学历(学位)继续教育 ({{itemData.majors.length}})</text>
-                    <text wx:else style='font-size:28rpx;color:#666'>学历教育</text>
+                    <text wx:else style='font-size:28rpx;color:#666'>学历(学位)继续教育</text>
                     <view style='width:100%;display:flex;flex-direction:row '>
                     <view style='width:100%;display:flex;flex-direction:row '>
                       <view class='float_left' style='flex:1'>
                       <view class='float_left' style='flex:1'>
                         <text class='text_999_24 '>扣除方式</text>
                         <text class='text_999_24 '>扣除方式</text>
@@ -41,7 +41,7 @@
                 <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">  
                 <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">  
                   <view wx:if="{{index==0}}">
                   <view wx:if="{{index==0}}">
                     <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>职业资格继续教育 ({{itemData.professions.length}})</text>
                     <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>职业资格继续教育 ({{itemData.professions.length}})</text>
-                    <text wx:else style='font-size:28rpx;color:#666'>非学历教育</text>
+                    <text wx:else style='font-size:28rpx;color:#666'>职业资格继续教育</text>
                     <text style='font-size:28rpx;color:#666' hidden='{{profession.detail_count<2}}'>（{{profession.detail_count}}）</text>
                     <text style='font-size:28rpx;color:#666' hidden='{{profession.detail_count<2}}'>（{{profession.detail_count}}）</text>
                     <view style='width:100%;display:flex;flex-direction:row '>
                     <view style='width:100%;display:flex;flex-direction:row '>
                       <view class='float_left' style='flex:1'>
                       <view class='float_left' style='flex:1'>

@@ -185,17 +185,17 @@ Page({
         var titlelist = newdata[0].title_items
         var titlelist = newdata[0].title_items
         for (var i = 0; i < titlelist.length > 0; i++) {
         for (var i = 0; i < titlelist.length > 0; i++) {
           if (titlelist[i].education_start) {
           if (titlelist[i].education_start) {
-            titlelist[i].education_start = this.formatDate(titlelist[i].education_start)
+            titlelist[i].education_start = this.formatDate(titlelist[i].education_start).substring(0, 7)
           }
           }
           if (titlelist[i].education_end) {
           if (titlelist[i].education_end) {
-            titlelist[i].education_end = this.formatDate(titlelist[i].education_end)
+            titlelist[i].education_end = this.formatDate(titlelist[i].education_end).substring(0, 7)
           }
           }
         }
         }
         // this.setData({
         // this.setData({
         //   issinglechildData: issinglechild_Data,
         //   issinglechildData: issinglechild_Data,
         //   shareMethodData: shareMethod_Data
         //   shareMethodData: shareMethod_Data
         // })
         // })
-      } else {
+      } else if (that.data.cur_status == "support_duty") {
         var issinglechild_Data = this.data.issinglechildData;
         var issinglechild_Data = this.data.issinglechildData;
         issinglechild_Data.disabled = true;
         issinglechild_Data.disabled = true;
         issinglechild_Data.selected = data.is_single == 'y' ? "是" : "否";
         issinglechild_Data.selected = data.is_single == 'y' ? "是" : "否";
@@ -204,12 +204,33 @@ Page({
         shareMethod_Data.disabled = true;
         shareMethod_Data.disabled = true;
         shareMethod_Data.selected = data.share_method ? data.share_method : "";
         shareMethod_Data.selected = data.share_method ? data.share_method : "";
 
 
+        var supportlist = newdata[0].support_duties
+        if (supportlist && supportlist.length > 0) {
+          for (var i = 0; i < supportlist.length; i++) {
+            if (supportlist[i].birthday) {
+              supportlist[i].birthday = this.formatDate(supportlist[i].birthday)
+            }
+          }
+        }
+        var cosupportlist = newdata[0].co_supporters
+        if (cosupportlist && cosupportlist.length > 0) {
+          for (var i = 0; i < cosupportlist.length; i++) {
+            if (cosupportlist[i].birthday) {
+              cosupportlist[i].birthday = this.formatDate(cosupportlist[i].birthday)
+            }
+          }
+        }
+        this.setData({
+          issinglechildData: issinglechild_Data,
+          shareMethodData: shareMethod_Data,
+        })
+      } else {
         for (var i = 0; i < newdata.length; i++) {
         for (var i = 0; i < newdata.length; i++) {
           if (newdata[i].education_start) {
           if (newdata[i].education_start) {
-            newdata[i].education_start = this.formatDate(newdata[i].education_start)
+            newdata[i].education_start = this.formatDate(newdata[i].education_start).substring(0, 7)
           }
           }
           if (newdata[i].education_end) {
           if (newdata[i].education_end) {
-            newdata[i].education_end = this.formatDate(newdata[i].education_end)
+            newdata[i].education_end = this.formatDate(newdata[i].education_end).substring(0, 7)
           }
           }
           if (newdata[i].patient_birthday) {
           if (newdata[i].patient_birthday) {
             newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday)
             newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday)
@@ -274,15 +295,11 @@ Page({
           housetype_new = newdata[0].type == 'loan' ? "house_fund_loan" : "house_fund_rent"
           housetype_new = newdata[0].type == 'loan' ? "house_fund_loan" : "house_fund_rent"
         }
         }
         console.log("housetype_new", housetype_new)
         console.log("housetype_new", housetype_new)
-        
+
         this.setData({
         this.setData({
-          issinglechildData: issinglechild_Data,
-          shareMethodData: shareMethod_Data,
           house_type: housetype_new,
           house_type: housetype_new,
         })
         })
       }
       }
-
-
       this.setData({
       this.setData({
         reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
         reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
         input_disable: true,
         input_disable: true,
@@ -294,12 +311,16 @@ Page({
       })
       })
       console.log("newdata", newdata)
       console.log("newdata", newdata)
       wx.hideLoading()
       wx.hideLoading()
+    }else{
+      this.setData({
+        additionInfo: newdata
+      })
     }
     }
   },
   },
 
 
   goaddSupporter: function() {
   goaddSupporter: function() {
     wx.navigateTo({
     wx.navigateTo({
-      url: '../adddupporters/adddupporters?id=' + this.data.additionInfo[0].id,
+      url: '../adddupporters/adddupporters?id='+this.data.legal_entity_id,
     })
     })
 
 
   },
   },
@@ -319,22 +340,49 @@ Page({
 
 
   showdetail: function(e) {
   showdetail: function(e) {
     if (this.data.additionInfo && this.data.additionInfo.length > 0) {
     if (this.data.additionInfo && this.data.additionInfo.length > 0) {
-      console.log("showdetail", JSON.stringify(this.data.additionInfo[e.currentTarget.id]))
+      var info
+      if (this.data.cur_status == "support_duty") {
+        info = JSON.stringify(this.data.additionInfo[0].support_duties[e.currentTarget.id])
+      } else {
+        info = JSON.stringify(this.data.additionInfo[e.currentTarget.id])
+      }
+      console.log("showdetail", info)
+
       wx.navigateTo({
       wx.navigateTo({
-        url: '../additiondetail/additiondetail?datas=' +
-          JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + "&status=" + this.data.cur_status,
+        url: '../additiondetail/additiondetail?datas=' + info + "&status=" + this.data.cur_status,
       })
       })
     }
     }
   },
   },
 
 
   godelete: function(e) { //删除
   godelete: function(e) { //删除
     var that = this;
     var that = this;
+    console.log("godelete", e)
+    var new_id
+    var statustype = this.data.cur_status
+    if (this.data.cur_status == "continuing_education") {
+      if (e.currentTarget.id.indexOf('title') != -1) {
+        new_id = this.data.additionInfo[0].title_items[e.currentTarget.id.replace('title', '')].id
+      }
+      if (e.currentTarget.id.indexOf('profession') != -1) {
+        new_id = this.data.additionInfo[0].profession_items[e.currentTarget.id.replace('profession', '')].id
+      }
+    } else if (this.data.cur_status == "support_duty") {
+      if (e.currentTarget.id.indexOf('support_duty') != -1) {
+        new_id = this.data.additionInfo[0].support_duties[e.currentTarget.id.replace('support_duty', '')].id
+      }
+      if (e.currentTarget.id.indexOf('co_supporter') != -1) {
+        statustype = "co_supporter"
+        new_id = this.data.additionInfo[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')].id
+      }
+    } else {
+      new_id = this.data.additionInfo[e.currentTarget.id].id
+    }
     var Authorization = getApp().globalData.Authorization;
     var Authorization = getApp().globalData.Authorization;
     wx.request({
     wx.request({
       url: baseUrl + 'persontax/v1/op/delete',
       url: baseUrl + 'persontax/v1/op/delete',
       data: {
       data: {
-        item_type: that.data.cur_status,
-        id: that.data.legal_entity_id
+        item_type: statustype,
+        id: new_id
       },
       },
       header: {
       header: {
         'content-type': 'application/json',
         'content-type': 'application/json',
@@ -342,19 +390,38 @@ Page({
       },
       },
       method: "POST",
       method: "POST",
       success: function(res) {
       success: function(res) {
-        if (res && res.data) {
-          console.log("res", res)
-
-        }
+        that.getAdditionInfo()
       }
       }
     })
     })
   },
   },
 
 
   goedit: function(e) { //编辑
   goedit: function(e) { //编辑
     console.log("goedit", e)
     console.log("goedit", e)
+    var new_info
+    if (this.data.cur_status == "continuing_education") {
+      if (e.currentTarget.id.indexOf('title') != -1) {
+        new_info = this.data.additionInfo[0].title_items[e.currentTarget.id.replace('title', '')]
+      }
+      if (e.currentTarget.id.indexOf('profession') != -1) {
+        new_info = this.data.additionInfo[0].profession_items[e.currentTarget.id.replace('profession', '')]
+      }
+    } else if (this.data.cur_status == "support_duty") {
+      if (e.currentTarget.id.indexOf('support_duty') != -1) {
+        new_info = this.data.additionInfo[0].support_duties[e.currentTarget.id.replace('support_duty', '')]
+      }
+      if (e.currentTarget.id.indexOf('co_supporter') != -1) {
+        new_info = this.data.additionInfo[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')]
+        wx.navigateTo({
+          url: '../adddupporters/adddupporters?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + "&id="+this.data.legal_entity_id ,
+        })
+        return;
+      }
+    } else {
+      new_info = this.data.additionInfo[e.currentTarget.id]
+    }
     if (this.data.additionInfo && this.data.additionInfo.length > 0) {
     if (this.data.additionInfo && this.data.additionInfo.length > 0) {
       wx.navigateTo({
       wx.navigateTo({
-        url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
+        url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
       })
       })
     }
     }
   },
   },
@@ -503,7 +570,7 @@ Page({
     this.setData({
     this.setData({
       showModal_img: false,
       showModal_img: false,
       showModal_reducetype: false,
       showModal_reducetype: false,
-      showModal_addtype:false
+      showModal_addtype: false
     })
     })
   },
   },
 
 

@@ -77,8 +77,8 @@
               </view>
               </view>
               <view class='divide_line_f5f5f5'></view>
               <view class='divide_line_f5f5f5'></view>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
-              <view class='float_right' wx:if="{{item.status=='failed'}}">
-                <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+              <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
+                <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{index}}" bindtap='godelete'>删除</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
               </view>
               </view>
             </view>
             </view>
@@ -92,15 +92,16 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
               <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
+              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
             </view>
             </view>
             <view wx:for="{{additionInfo[0].title_items}}">
             <view wx:for="{{additionInfo[0].title_items}}">
               <view style='padding-right:right'>
               <view style='padding-right:right'>
                 <view style="background:#f5f5f5;height:2rpx;width:94%"></view>
                 <view style="background:#f5f5f5;height:2rpx;width:94%"></view>
                 <view>
                 <view>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;'>{{item.education_period}}</text>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;'>{{item.education_period}}</text>
-                  <view wx:if="{{item.status=='failed'}}" class='declare_style_new red_bg'> {{declareStatus[item.status]}}</view>
-                  <view wx:if="{{item.status=='success'}}" class='declare_style_new blue_bg'> {{declareStatus[item.status]}}</view>
-                  <view wx:else class='declare_style_new orange_bg'> {{declareStatus[item.status]}}</view>
+
                 </view>
                 </view>
                 <view style='height:70rpx'>
                 <view style='height:70rpx'>
                   <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
@@ -110,6 +111,10 @@
                   <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
                   <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
                   <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
                 </view>
                 </view>
+                <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
+                  <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='goedit'>编辑</text>
+                  <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'title'+index}}" bindtap='godelete'>删除</text>
+                </view>
               </view>
               </view>
             </view>
             </view>
             <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
             <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
@@ -121,10 +126,6 @@
               <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
               <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
               <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].title_items[0].deduction_amount}}/{{reducetype[additionInfo[0].title_items[0].deduction_type]}}</text>
               <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].title_items[0].deduction_amount}}/{{reducetype[additionInfo[0].title_items[0].deduction_type]}}</text>
             </view>
             </view>
-            <view  wx:if="{{item.status=='failed'}}">
-              <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
-              <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-            </view>
           </view>
           </view>
         </view>
         </view>
         <!-- 非学历 -->
         <!-- 非学历 -->
@@ -132,6 +133,9 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
               <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
+              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
             </view>
             </view>
             <view wx:for="{{additionInfo[0].profession_items}}">
             <view wx:for="{{additionInfo[0].profession_items}}">
               <view style='padding-right:right'>
               <view style='padding-right:right'>
@@ -139,11 +143,9 @@
                 <view>
                 <view>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='major'}}">专业人员职业资格</text>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='major'}}">专业人员职业资格</text>
-                  <view wx:if="{{item.status=='failed'}}" class='declare_style_new red_bg'> {{declareStatus[item.status]}}</view>
-                  <view wx:if="{{item.status=='success'}}" class='declare_style_new blue_bg'> {{declareStatus[item.status]}}</view>
-                  <view wx:else class='declare_style_new orange_bg'> {{declareStatus[item.status]}}</view>
+
                 </view>
                 </view>
-                <view >
+                <view>
                   <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期：</text>
                   <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
                   <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
                 </view>
                 </view>
@@ -159,6 +161,10 @@
                   <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
                   <view class='float_right' style='font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:70rpx;max-width:500rpx'>{{item.certification_authority}}</view>
                   <view class='float_right' style='font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:70rpx;max-width:500rpx'>{{item.certification_authority}}</view>
                 </view>
                 </view>
+                <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
+                  <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text>
+                  <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='godelete'>删除</text>
+                </view>
               </view>
               </view>
             </view>
             </view>
             <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
             <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
@@ -170,97 +176,92 @@
               <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
               <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
               <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].profession_items[0].deduction_amount}}/{{reducetype[additionInfo[0].profession_items[0].deduction_type]}}</text>
               <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].profession_items[0].deduction_amount}}/{{reducetype[additionInfo[0].profession_items[0].deduction_type]}}</text>
             </view>
             </view>
-            <view  wx:if="{{item.status=='failed'}}">
-              <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
-              <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-            </view>
+
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
 
 
       <view wx:if="{{cur_status=='support_duty'}}">
       <view wx:if="{{cur_status=='support_duty'}}">
-        <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}">
+        <view wx:if="{{additionInfo[0].support_duties&&additionInfo[0].support_duties.length>0}}">
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
-              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
-            </view>
-            <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'>{{item.supported_name}}</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'>{{item.relationship}}</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'>{{item.percent}}%</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'>{{reducetype[item.deduction_type]}}度</text>
-              </view>
-              <view style='height:70rpx'>
-                <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-                <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}/{{reducetype[item.deduction_type]}}</text>
-              </view> -->
-              <view class='divide_line_f5f5f5'></view>
-              <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
-              <view class='float_right' wx:if="{{item.status=='failed'}}">
-                <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-                <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
-              </view>
+              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
             </view>
             </view>
+            <view wx:for="{{additionInfo[0].support_duties}}">
 
 
-          </view>
-          <view wx:if="{{item.co_supporters&&item.co_supporters.length>0}}">
-            <view wx:for="{{item.co_supporters}}" style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column' wx:for-item="itemdetail">
-              <view style='height:110rpx'>
-                <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
-              </view>
               <view style='padding-right:30rpx'>
               <view style='padding-right:30rpx'>
                 <view class='divide_line_f5f5f5'></view>
                 <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'>{{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'>居民身份证</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_no}}</text>
+                  <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>
                 <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'>{{itemdetail.birthday}}</text>
+                  <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
+                  <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.relationship}}</text>
                 </view>
                 </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'>中国</text>
+                <view class='divide_line_f5f5f5'></view>
+                <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+                <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
+                  <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'support_duty'+index}}" bindtap='godelete'>删除</text>
+                  <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'support_duty'+index}}" bindtap='goedit'>编辑</text>
                 </view>
                 </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.relationship}}</text>
+              </view>
+            </view>
+          </view>
+          <view style='background:#FFF;padding:30rpx'>
+            <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id="{{index}}" bindtap='goadd'>
+              添加
+            </view>
+          </view>
+          <view wx:if="{{additionInfo[0].co_supporters&&additionInfo[0].co_supporters.length>0}}">
+            <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
+              <view style='height:110rpx'>
+                <text class='text_gray_36 float_left' style='line-height:110rpx'>共同赡养人</text>
+              </view>
+              <view wx:for="{{additionInfo[0].co_supporters}}" wx:for-item="itemdetail">
+
+                <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>
+                  <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'>居民身份证</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_no}}</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.birthday}}</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'>中国</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.relationship}}</text>
+                  </view>
+                  <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>
                 </view>
                 </view>
               </view>
               </view>
             </view>
             </view>
+
           </view>
           </view>
           <view>
           <view>
-            <!-- <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
-              <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
-                添加
-              </view>
-            </view> -->
-            <view style='margin-left:30rpx' wx:if="{{issinglechildData.selected=='否'&&(!item.co_supporters||item.co_supporters.length<1)}}">
-              <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
-              <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
+            <view style='margin-left:30rpx' wx:if="{{issinglechildData.selected!='是'}}">
+              <!-- <text class='text_999_28'>您还没有添加继续共同赡养人，</text> -->
+              <text class='text_blue_28' bindtap='goaddSupporter'>添加共同赡养人</text>
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>
@@ -320,7 +321,7 @@
                 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
                 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
                 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
                 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
               </view>
               </view>
-              <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
                 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
                 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
               </view>
               </view>
@@ -356,11 +357,6 @@
                   </view>
                   </view>
                 </view>
                 </view>
               </view>
               </view>
-              <!-- <view wx:if="{{house_type=='house_fund_loan'}}">
-                <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
-                <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
-              </view> -->
               <view style='height:70rpx'>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
@@ -371,7 +367,7 @@
               </view>
               </view>
               <view class='divide_line_f5f5f5'></view>
               <view class='divide_line_f5f5f5'></view>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
-              <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <view class='float_right' wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
                 <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
                 <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
               </view>
               </view>
@@ -379,14 +375,13 @@
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
-
     </view>
     </view>
     <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}">
     <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}">
       <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
       <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
     </view>
     </view>
   </view>
   </view>
 
 
-  <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
+  <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}">
     <view class='btn_blue_radius' bindtap="goadd">
     <view class='btn_blue_radius' bindtap="goadd">
       <view class='text_white_34'>添加</view>
       <view class='text_white_34'>添加</view>
     </view>
     </view>
@@ -398,7 +393,7 @@
 <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
 <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
 <!-- 申报说明 -->
 <!-- 申报说明 -->
 <view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
 <view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
-  <image class='modal_img' src="{{modal_images[cur_status]}}" ></image>
+  <image class='modal_img' src="{{modal_images[cur_status]}}"></image>
   <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
   <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
   <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
   <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
     <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
     <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>