Merge branch 'dev_wy' into 机器人dev

@@ -58,8 +58,9 @@ Page({
       selectdata: options.select_data ? JSON.parse(options.select_data) : {}
       selectdata: options.select_data ? JSON.parse(options.select_data) : {}
     })
     })
     if (options.type == '1' && options.select_data && JSON.parse(options.select_data)) {
     if (options.type == '1' && options.select_data && JSON.parse(options.select_data)) {
-      this.handleData(JSON.parse(options.select_data))
+      this.handleData(JSON.parse(options.select_data), JSON.parse(options.complete_data))
     }
     }
+    // 
   },
   },
 
 
   /**
   /**
@@ -76,7 +77,7 @@ Page({
 
 
   },
   },
 
 
-  handleData: function(data) {
+  handleData: function(data,completedata) {
     var selectarray = data.addition_items;
     var selectarray = data.addition_items;
     console.log("handleData", data)
     console.log("handleData", data)
     var selectIndex = this.data.selectIndex;
     var selectIndex = this.data.selectIndex;
@@ -88,19 +89,19 @@ Page({
       for (var i = 0; i < selectarray.length; i++) {
       for (var i = 0; i < selectarray.length; i++) {
         if (selectarray[i].addition_category == 'children_education') { //子女教育
         if (selectarray[i].addition_category == 'children_education') { //子女教育
           selectIndex[0].sureid = true
           selectIndex[0].sureid = true
-          selectIndex[0].disable_change = true
+          selectIndex[0].disable_change = completedata.indexOf('children_education')!=-1?true:false
         }
         }
         if (selectarray[i].addition_category == 'continuing_education') { //继续教育
         if (selectarray[i].addition_category == 'continuing_education') { //继续教育
           selectIndex[1].sureid = true
           selectIndex[1].sureid = true
-          selectIndex[1].disable_change = true
+          selectIndex[1].disable_change = completedata.indexOf('continuing_education') != -1 ? true : false
         }
         }
         if (selectarray[i].addition_category == 'support_duty') { //赡养老人
         if (selectarray[i].addition_category == 'support_duty') { //赡养老人
           selectIndex[2].sureid = true
           selectIndex[2].sureid = true
-          selectIndex[2].disable_change = true
+          selectIndex[2].disable_change = completedata.indexOf('support_duty') != -1 ? true : false
         }
         }
         if (selectarray[i].addition_category == 'house_fund_rent') { //住房（租房）
         if (selectarray[i].addition_category == 'house_fund_rent') { //住房（租房）
           selectIndex[3].sureid = true
           selectIndex[3].sureid = true
-          selectIndex[3].disable_change = true
+          selectIndex[3].disable_change = completedata.indexOf('house_fund_rent') != -1 ? true : false
           this.setData({
           this.setData({
             flag_housing01: false,
             flag_housing01: false,
             flag_housing02: true,
             flag_housing02: true,
@@ -108,7 +109,7 @@ Page({
         }
         }
         if (selectarray[i].addition_category == 'house_fund_loan') { //住房（租房）
         if (selectarray[i].addition_category == 'house_fund_loan') { //住房（租房）
           selectIndex[3].sureid = true
           selectIndex[3].sureid = true
-          selectIndex[3].disable_change = true
+          selectIndex[3].disable_change = completedata.indexOf('house_fund_loan') != -1 ? true : false
           this.setData({
           this.setData({
             flag_housing01: true,
             flag_housing01: true,
             flag_housing02: false,
             flag_housing02: false,

@@ -11,6 +11,7 @@ Page({
     is_declared: false,
     is_declared: false,
     hascompleted:false,
     hascompleted:false,
     additionlist: [],
     additionlist: [],
+    complete_item:[],
     declareStatus: {
     declareStatus: {
       "to_declare ": "待申报",
       "to_declare ": "待申报",
       "declaring": "申报中",
       "declaring": "申报中",
@@ -53,7 +54,7 @@ Page({
     console.log("goupdate", e);
     console.log("goupdate", e);
     var newdata = this.data.additionlist[e.currentTarget.id]
     var newdata = this.data.additionlist[e.currentTarget.id]
     wx.navigateTo({
     wx.navigateTo({
-      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&type=1",
+      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&complete_data=" + JSON.stringify(this.data.complete_item) + "&type=1",
     })
     })
   },
   },
 
 
@@ -109,6 +110,7 @@ Page({
         if (res && res.data) {
         if (res && res.data) {
           console.log("res", res)
           console.log("res", res)
           that.setData({
           that.setData({
+            complete_item: res.data.complete_item,
             additionlist: that.handleData(res.data.items) 
             additionlist: that.handleData(res.data.items) 
           })
           })
         }
         }

@@ -9,7 +9,7 @@
           <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
           <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
           立即申报
           立即申报
         </view>
         </view>
-        <view wx:elif="{{item.addition_items&&item.addition_items.length>0&&item.addition_items.length<4}}" class='view_godeclare_wrap' bindtap='goupdate' id='{{idx01}}'>
+        <view wx:elif="{{complete_item.length<4}}" class='view_godeclare_wrap' bindtap='goupdate' id='{{idx01}}'>
           查看并调整
           查看并调整
         </view>
         </view>
       </view>
       </view>