Merge branch 'dev2.0' into dev_py

@@ -11,7 +11,7 @@ Page({
     cur_status: "",
     legal_entity_id: "",
     legal_entity: "",
-    house_type:"",
+    house_type: "",
     declareStatus: {
       "to_declare": "待申报",
       "declaring": "申报中",
@@ -49,6 +49,24 @@ Page({
       "month": "月",
       "year": "年"
     },
+    issinglechildData: {
+      label: '是否独生子女',
+      bindtype: 'issingle_child',
+      selected: '',
+      isblack: '',
+      placeholder: '请选择是否独生子女',
+      values: ["是", "否"],
+      onChange: 'onPickerSelect'
+    },
+    shareMethodData: {
+      label: '分摊方式',
+      bindtype: 'share_method',
+      selected: '',
+      isblack: '',
+      values: ["赡养人平均分摊", "赡养人约定分摊", "被赡养人指定分摊"],
+      placeholder: '请选择分摊方式',
+      onChange: 'onPickerSelect'
+    },
     additionInfo: [],
     reducetypeData: ["月度", "年度"],
     modalData: {},
@@ -70,6 +88,7 @@ Page({
       lefttext: "添加家庭成员并申报",
       righttext: "确定为该选择的人申报",
     },
+    reduce_amount:0,
     selected_reduceindex: 0,
     selected_addindex: 0
   },
@@ -81,7 +100,7 @@ Page({
     var that = this
     var housetype, housestatus
     console.log("options", options);
-     if (options.status == 'house_fund_rent') {
+    if (options.status == 'house_fund_rent') {
       housetype = 'house_fund_rent'
       housestatus = 'house_fund'
     } else if (options.status == 'house_fund_loan') {
@@ -96,12 +115,12 @@ Page({
       house_type: housetype,
       legal_entity_id: options.legal_entity_id,
       legal_entity: options.legal_entity,
-      selected_reduceindex: options.status =='medical_fund'?1:0     
+      selected_reduceindex: options.status == 'medical_fund' ? 1 : 0
     })
     wx.setNavigationBarTitle({
       "title": that.data.additiontitle[this.data.cur_status],
     })
-    
+
   },
 
   /**
@@ -153,15 +172,15 @@ Page({
       if (newdata[i].patient_birthday && newdata[i].patient_birthday > 0) {
         newdata[i].patient_birthday = format.formatTime_date(newdata[i].patient_birthday)
       }
-      if (newdata[i].house_address){
-        if (newdata[i].house_address.province == newdata[i].house_address.city){
-          newdata[i].house_address_new = newdata[i].house_address.city + newdata[i].house_address.district 
-        }else{
-          newdata[i].house_address_new = newdata[i].house_address.province + newdata[i].house_address.city + newdata[i].house_address.district 
+      if (newdata[i].house_address) {
+        if (newdata[i].house_address.province == newdata[i].house_address.city) {
+          newdata[i].house_address_new = newdata[i].house_address.city + newdata[i].house_address.district
+        } else {
+          newdata[i].house_address_new = newdata[i].house_address.province + newdata[i].house_address.city + newdata[i].house_address.district
         }
       }
-      if (newdata[i].co_supporters && newdata[i].co_supporters.length>0){
-        for (var j = 0; j < newdata[i].co_supporters.length;j++){
+      if (newdata[i].co_supporters && newdata[i].co_supporters.length > 0) {
+        for (var j = 0; j < newdata[i].co_supporters.length; j++) {
           if (newdata[i].co_supporters[j].birthday && newdata[i].birthday > 0) {
             newdata[i].co_supporters[j].birthday = format.formatTime_date(newdata[i].co_supporters[j].birthday)
           }
@@ -169,9 +188,9 @@ Page({
       }
     }
 
-    var housetype_new =  this.data.house_type
-    if (newdata.length > 0 && newdata[0].type){
-      housetype_new = newdata[0].type == 'loan' ? "house_fund_loan" :"house_fund_rent"
+    var housetype_new = this.data.house_type
+    if (newdata.length > 0 && newdata[0].type) {
+      housetype_new = newdata[0].type == 'loan' ? "house_fund_loan" : "house_fund_rent"
     }
     console.log("housetype_new", housetype_new)
     this.setData({
@@ -245,6 +264,26 @@ Page({
   goadd: function(e) { //添加
     console.log("goadd", e)
     var that = this
+    if (this.data.cur_status == 'support_duty'){
+      if (this.data.issinglechildData.selected.length < 1) {
+        this.showToast("请选择是否独生子女")
+        return
+      }
+      if (this.data.issinglechildData.selected == "否") {
+        if (this.data.shareMethodData.selected.length < 1) {
+          this.showToast("请选择分摊方式")
+          return
+        }
+        if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
+          this.showToast("请输入合理金额")
+          return
+        }
+      } else {
+        this.setData({
+          reduce_amount: 2000
+        })
+      }
+    }
     var modalinfo, senddata
     if (this.data.cur_status == 'continuing_education' || this.data.cur_status == 'house_fund') {
 
@@ -384,7 +423,7 @@ Page({
       showModal_addtype: false
     })
     var senddata = ""
-    if (this.data.cur_status == 'support_duty' ){
+    if (this.data.cur_status == 'support_duty') {
       // senddata = JSON.stringify(this.data.additionInfo[0]);
     }
     wx.navigateTo({
@@ -419,11 +458,47 @@ Page({
     }
   },
 
+  onPickerSelect: function(e) {
+    console.log('picker发送选择改变，携带值为', e)
+    switch (e.currentTarget.id) {
+      case 'issingle_child':
+        var issinglechildData = this.data.issinglechildData
+        issinglechildData.selected = issinglechildData.values[e.detail.value]
+        this.setData({
+          issinglechildData: issinglechildData
+        })
+        break;
+      case 'share_method':
+        var share_methodData = this.data.shareMethodData
+        share_methodData.selected = share_methodData.values[e.detail.value]
+        this.setData({
+          shareMethodData: share_methodData
+        })
+        break;
+    }
+  },
+
+  bindinput:function(e){
+    console.log("bindinput",e)
+    this.setData({
+      reduce_amount: parseFloat(e.detail.value)
+    })
+  },
+
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none"
+      })
+    }
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */
   onHide: function() {
-
+    
   },
 
   /**

 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
+<import src="../../../common/picker_cell" />
 
 <view style='width:100%;height:100%;background:#FCFCFC;'>
   <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
@@ -8,11 +9,33 @@
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <text class='text_999_30 float_right' style='line-height:100rpx'>年度</text>
     </view>
-    <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' wx:elif="{{cur_status!='continuing_education'}}">
+    <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' wx:elif="{{cur_status!='continuing_education'&&cur_status!='support_duty'}}">
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
       <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:0 30rpx;background:#FFF'>
+      <template is="picker_cell_normal" data="{{...issinglechildData}}" />
+      <view class='divide_line_f5f5f5'></view>
+      <view wx:if="{{issinglechildData.selected=='否'}}">
+        <template is="picker_cell_normal" data="{{...shareMethodData}}" />
+        <view class='divide_line_f5f5f5'></view>
+         <view style='height:90rpx'>
+          <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;'>本年度月扣除金额</text>
+          <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #999;' name='country'>/月</text>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput'></input>
+        </view>
+      </view>
+      <view wx:elif="{{issinglechildData.selected=='是'}}">
+        <view class='divide_line_f5f5f5'></view>
+        <view style='height:90rpx'>
+          <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;'>本年度月扣除金额</text>
+          <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>2000/月</text>
+        </view>
+       
+      </view>
+    </view>
+
 
     <view wx:if="{{additionInfo&&additionInfo.length>0}}">
 
@@ -145,7 +168,7 @@
       </view>
 
       <view wx:if="{{cur_status=='support_duty'}}">
-        <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}" >
+        <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}">
           <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>
@@ -157,7 +180,7 @@
               <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.name}}</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>
@@ -180,7 +203,7 @@
             </view>
 
           </view>
-          <view wx:if="{{item.co_supporters&&item.co_supporters.length>0}}" >
+          <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>

@@ -118,6 +118,21 @@
   bottom: 0;
 }
 
+.input_wrap {
+  width: 380rpx;
+  height: 90rpx;
+  font-size: 30rpx;
+  color: #333;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+
+
+
+
 /* 遮罩层 */
 
 .mask {

@@ -8,7 +8,7 @@ Page({
    */
   data: {
     load_finish: false,
-    text_tip: "自然人信息不完善，立即完善",
+    text_tip: "去查看",
     taxlist: ['']
   },
 
@@ -140,11 +140,7 @@ Page({
 
   getStatus: function (data) {
     console.log('data', data)
-    if (data[0].family_ties.length < 1 && data[0].name.length > 0 && data[0].id_card_type.length > 0 && data[0].id_card_no.length > 0 && data[0].mobile.length > 0) {
-      this.setData({
-        text_tip: '去查看'
-      })
-    } else {
+    if (data[0].family_ties.length < 1 || data[0].name.length < 1 || data[0].id_card_type.length < 1 || data[0].id_card_no.length <1 || data[0].mobile.length < 1) {
       this.setData({
         text_tip: '自然人信息不完善，立即完善'
       })