Merge branch 'dev_无非居民' into dev2.0

# Conflicts:
#	pages/main/taxperson/editinfo/editinfo.js

@@ -37,7 +37,7 @@ Page({
         name: curdata.co_supporter,
         id_card_no: curdata.id_card_no,
         birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
-        birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000
+        birthday_datelong: curdata.birthday
       })
     }
 

@@ -32,10 +32,10 @@
         <text class='text_left'>分配比例</text>
         <text class='text_right_333'>{{datas.percent}}%</text>
       </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_right_333'>{{datas.student_no}}</text>
-      </view>
+      </view> -->
       <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>子女受教育阶段</text>
         <text class='text_right_333'>{{datas.education_period}}</text>

@@ -12,36 +12,38 @@ Page({
     flag_housing02: false,
     legal_entity_id: '',
     legal_entity: '',
-
+    type: "",
+    selectdata: {},
     selectIndex: [{
-      message: '子女教育',
-      disable_change: '',
-      status: "children_education",
-      sureid: false
-    }, {
-      message: '继续教育',
-      disable_change: '',
-      status: "continuing_education",
-      sureid: false
-    }, {
-      message: '赡养老人',
-      disable_change: '',
-      status: "support_duty",
-      sureid: false
-    }, 
-    // {
-    //   message: '大病医疗',
-    //   disable_change: '',
-    //   status: "medical_fund",
-    //   sureid: false
-    // },
-     {
-      message: '住房',
-      sureid: false,
-      disable_change: '',
-      status: "",
-      extra_message: ''
-    }, ],
+        message: '子女教育',
+        disable_change: '',
+        status: "children_education",
+        sureid: false
+      }, {
+        message: '继续教育',
+        disable_change: '',
+        status: "continuing_education",
+        sureid: false
+      }, {
+        message: '赡养老人',
+        disable_change: '',
+        status: "support_duty",
+        sureid: false
+      },
+      // {
+      //   message: '大病医疗',
+      //   disable_change: '',
+      //   status: "medical_fund",
+      //   sureid: false
+      // },
+      {
+        message: '住房',
+        sureid: false,
+        disable_change: '',
+        status: "",
+        extra_message: ''
+      },
+    ],
   },
 
   /**
@@ -51,9 +53,13 @@ Page({
     console.log("onLoad", options)
     this.setData({
       legal_entity_id: options.legal_entity_id,
-      legal_entity: options.legal_entity
+      legal_entity: options.legal_entity,
+      type: options.type,
+      selectdata: 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))
+    }
   },
 
   /**
@@ -70,6 +76,52 @@ Page({
 
   },
 
+  handleData: function(data) {
+    var selectarray = data.addition_items;
+    console.log("handleData", data)
+    var selectIndex = this.data.selectIndex;
+
+    if (selectarray.length > 0) {
+      wx.showLoading({
+        title: '',
+      })
+      for (var i = 0; i < selectarray.length; i++) {
+        if (selectarray[i].addition_category == 'children_education') { //子女教育
+          selectIndex[0].sureid = true
+          selectIndex[0].disable_change = true
+        }
+        if (selectarray[i].addition_category == 'continuing_education') { //继续教育
+          selectIndex[1].sureid = true
+          selectIndex[1].disable_change = true
+        }
+        if (selectarray[i].addition_category == 'support_duty') { //赡养老人
+          selectIndex[2].sureid = true
+          selectIndex[2].disable_change = true
+        }
+        if (selectarray[i].addition_category == 'house_fund_rent') { //住房（租房）
+          selectIndex[3].sureid = true
+          selectIndex[3].disable_change = true
+          this.setData({
+            flag_housing01: false,
+            flag_housing02: true,
+          })
+        }
+        if (selectarray[i].addition_category == 'house_fund_loan') { //住房（租房）
+          selectIndex[3].sureid = true
+          selectIndex[3].disable_change = true
+          this.setData({
+            flag_housing01: true,
+            flag_housing02: false,
+          })
+        }
+      }
+      this.setData({
+        selectIndex: selectIndex
+      })
+      wx.hideLoading()
+    }
+  },
+
   selectRep: function(e) {
     let index = e.currentTarget.dataset.selectindex;
     let selectIndex = this.data.selectIndex; //取到data里的selectIndex 
@@ -136,7 +188,7 @@ Page({
       } else {
         wx.showToast({
           title: '请选择住房类型',
-          icon:"none"
+          icon: "none"
         })
         return;
       }
@@ -155,8 +207,12 @@ Page({
       })
       return;
     }
-    this.goDeclare(stuatusarray)
-
+    if (this.data.type == '0') {
+      this.goDeclare(stuatusarray)
+    } else if (this.data.type == '1'){
+      this.goUpdate(stuatusarray)
+      // this.goDeclare(stuatusarray)
+    }
   },
 
   goDeclare: function(array) {
@@ -175,11 +231,46 @@ Page({
         "Authorization": Authorization
       },
       success: function(res) {
-        if (res && res.data) {
-          console.log("res", res)
+        if (res.statusCode == 200) {
           wx.redirectTo({
             url: '../godetail/godetail?datas=' + JSON.stringify(res.data)
           })
+        } else {
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
+        }
+      }
+    })
+  },
+
+  goUpdate: function (array) {
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/update-addition-setting',
+      data: {
+        "legal_entity_id": that.data.legal_entity_id,
+        "id": that.data.selectdata?that.data.selectdata.id:'',
+        "options": array
+      },
+      method: "PUT",
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log("res", res)
+        if (res.statusCode==200) {
+          wx.redirectTo({
+            url: '../godetail/godetail?datas=' + JSON.stringify(res.data.item)
+          })
+        }else{
+          wx.showToast({
+            title: res.data.message,
+            icon:'none'
+          })
         }
       }
     })

@@ -12,7 +12,7 @@
     <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
 
     <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx'>
-      <view data-selectIndex="{{index}}" bindtap="selectRep">
+      <view data-selectIndex="{{index}}" bindtap="selectRep" >
         <view class='float_left'>
           <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" style='margin-top:20rpx' />
         </view>

@@ -8,36 +8,76 @@ Page({
    * Page initial data
    */
   data: {
+    additiontitle: {
+      "children_education": "子女教育",
+      "continuing_education": "继续教育",
+      "support_duty": "赡养老人",
+      "medical_fund": "大病医疗",
+      "house_fund_rent": "住房",
+      "house_fund_loan": "住房",
+      "house_fund": "住房"
+    },
+    reducetype: {
+      "": "月",
+      "month": "月",
+      "year": "年"
+    },
     additiondata: {}
   },
 
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
-    console.log("onLoad", options.datas)
-    this.setData({
-      additiondata: JSON.parse(options.datas)
-    })
+  onLoad: function(options) {
+    console.log("onLoad", options)
+    if (options.datas) {
+      this.setData({
+        additiondata: this.handleData(JSON.parse(options.datas))
+      })
+    }
   },
 
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
 
   },
 
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
+
+  },
 
+  handleData: function(data) {
+    if (data.addition_items && data.addition_items.length>0){
+      for (var j = 0; j < data.addition_items.length; j++) {
+        var midItem = data.addition_items[j]
+        if (midItem.addition_category == 'continuing_education') {
+          var majors = [],
+            professions = []
+          for (var k = 0; k < midItem.detail_items.length; k++) {
+            var smallItem = midItem.detail_items[k]
+            if (smallItem.continue_education_type == 'major') {
+              majors.push(smallItem)
+            } else if (smallItem.continue_education_type == 'nomajor') {
+              professions.push(smallItem)
+            }
+          }
+          data.addition_items[j].majors = majors
+          data.addition_items[j].professions = professions
+          break;
+        }
+      }
+    }
+    return data
   },
 
-  lookandadd:function(e){
+  lookandadd: function(e) {
     console.log("lookandadd", e);
-    if (this.data.additiondata.options && this.data.additiondata.options.length>0){
+    if (this.data.additiondata.options && this.data.additiondata.options.length > 0) {
       var newstatus = this.data.additiondata.options[e.currentTarget.id]
       // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
       //   newstatus = "house_fund"
@@ -48,38 +88,48 @@ Page({
     }
   },
 
+  lookandadd02: function (e) {
+    console.log("lookandadd02", e);
+    if (this.data.additiondata.addition_items && this.data.additiondata.addition_items.length > 0) {
+      var newstatus = this.data.additiondata.addition_items[e.currentTarget.id].addition_category
+      wx.navigateTo({
+        url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
+      })
+    }
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
 
   },
 
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
 
   },
 
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
   },
 
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
   },
 
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
 
   }
 })
\ No newline at end of file

@@ -3,12 +3,12 @@
   <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
 
   <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
-    <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx" >
-      <view wx:if="{{item=='children_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column '  bindtap='lookandadd' id='{{idx}}'>
+    <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx">
+      <view wx:if="{{item=='children_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
         <view style='height:40rpx'>
           <text class='text_333_32 float_left'>子女教育</text>
           <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
-          <text class='text_999_28' style='float:right' >查看</text>
+          <text class='text_999_28' style='float:right'>查看</text>
         </view>
         <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
           <view class='float_left' style='flex:1'>
@@ -66,7 +66,7 @@
           </view>
         </view> -->
       </view>
-      <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column'  bindtap='lookandadd' id='{{idx}}'>
+      <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column' bindtap='lookandadd' id='{{idx}}'>
         <view style='height:40rpx'>
           <text class='text_333_32 float_left'>大病医疗</text>
           <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
@@ -83,11 +83,11 @@
           </view>
         </view>
       </view>
-      <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '  bindtap='lookandadd' id='{{idx}}'>
+      <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
         <view style='height:40rpx'>
           <text class='text_333_32 float_left'>赡养老人</text>
           <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
-          <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
+          <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
         </view>
         <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
           <view class='float_left' style='flex:1'>
@@ -104,7 +104,7 @@
         <view style='height:40rpx'>
           <text class='text_333_32 float_left'>住房</text>
           <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
-          <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
+          <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
         </view>
         <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
           <view class='float_left' style='flex:1'>
@@ -121,4 +121,65 @@
     </block>
   </view>
 
+  <view wx:elif="{{additiondata.addition_items&&additiondata.addition_items.length>0}}">
+    <block wx:for="{{additiondata.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx">
+      <view wx:if="{{itemData.addition_category!='medical_fund'}}">
+        <view style='margin:0 50rpx;background:#e5e5e5;height:2rpx;'></view>
+        <view style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd02' id='{{idx}}'>
+          <view style='height:40rpx'>
+            <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
+            <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
+            <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
+            <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
+          </view>
+          <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
+            <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
+              <view wx:if="{{index==0}}">
+                <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>
+                <view style='width:100%;display:flex;flex-direction:row '>
+                  <view class='float_left' style='flex:1'>
+                    <text class='text_999_24 '>扣除方式</text>
+                    <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[major.deduction_type]}}度</text>
+                  </view>
+                  <view class='float_right' style='flex:1'>
+                    <text class='text_999_24 '>可扣除金额</text>
+                    <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{major.deduction_amount}}/{{reducetype[major.deduction_type]}}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">
+              <view wx:if="{{index==0}}">
+                <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 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 class='float_left' style='flex:1'>
+                    <text class='text_999_24 '>扣除方式</text>
+                    <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[profession.deduction_type]}}度</text>
+                  </view>
+                  <view class='float_right' style='flex:1'>
+                    <text class='text_999_24 '>可扣除金额</text>
+                    <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{profession.deduction_amount}}/{{reducetype[profession.deduction_type]}}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
+            <view class='float_left' style='flex:1'>
+              <text class='text_999_24 '>扣除方式</text>
+              <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
+            </view>
+            <view class='float_right' style='flex:1'>
+              <text class='text_999_24 '>可扣除金额</text>
+              <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </block>
+  </view>
+
 </view>
\ No newline at end of file

@@ -45,7 +45,15 @@ Page({
     console.log("godeclare", e);
     var newdata = this.data.additionlist[e.currentTarget.id]
     wx.navigateTo({
-      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity,
+      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&type=0",
+    })
+  },
+
+  goupdate: function (e) {
+    console.log("goupdate", e);
+    var newdata = this.data.additionlist[e.currentTarget.id]
+    wx.navigateTo({
+      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&type=1",
     })
   },
 

@@ -9,6 +9,9 @@
           <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
           立即申报
         </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>
       </view>
       <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
         <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">

@@ -20,7 +20,7 @@
       <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
     </view> -->
     <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
-      <template is="picker_cell_normal" data="{{...issinglechildData}}" />
+      <template wx:if="{{employee_status!='inactive'}}" is="picker_cell_normal" data="{{...issinglechildData}}" />
       <view wx:if="{{issinglechildData.selected=='否'}}">
         <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
         <template is="picker_cell_normal" data="{{...shareMethodData}}" />
@@ -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'>居民身份证</text>
+                    <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_type=='1'?"居民身份证":itemdetail.id_card_type}}</text>
                   </view>
                   <view style='height:70rpx'>
                     <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
@@ -376,7 +376,7 @@
         </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)||(additionInfo[0].support_duties&&additionInfo[0].support_duties.length<1)}}">
       <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
     </view>
   </view>

 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"minified": true,
-		"newFeature": true
-	},
-	"compileType": "miniprogram",
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true
+  },
+  "compileType": "miniprogram",
   "libVersion": "2.2.2",
   "appid": "wxe91c67adba6ac02d",
   "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
-	"isGameTourist": false,
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": []
-		}
-	}
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  }
 }
\ No newline at end of file