优化

@@ -4,29 +4,47 @@ var countryInfo = require('../../../../utils/country.js');
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
-const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' }
-const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': 400, 'support_duty': 2000, 'medical_fund': 0,'house_fund':0}
-const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, 'support_duty': 24000, 'medical_fund': 0, 'house_fund': 0 }
+const AddTypeNames = {
+  'children_education': '子女教育',
+  'continuing_education': '继续教育',
+  'support_duty': '赡养老人',
+  'medical_fund': '大病医疗',
+  'house_fund': '住房'
+}
+const Deduce_amounts_month = {
+  'children_education': 1000,
+  'continuing_education': 400,
+  'support_duty': 2000,
+  'medical_fund': 0,
+  'house_fund': 0
+}
+const Deduce_amounts_year = {
+  'children_education': 12000,
+  'continuing_education': 4800,
+  'support_duty': 24000,
+  'medical_fund': 0,
+  'house_fund': 0
+}
 
 Page({
-  idcard_belong:null,//照片信息获取返回时判断所属
+  idcard_belong: null, //照片信息获取返回时判断所属
   legal_entity_id: "",
-  legal_entity:"",
+  legal_entity: "",
   data: {
-    deduction_amount:'',
+    house_type: "",
+    deduction_amount: '',
     lable: 0,
-    datas02: [],
     title: '',
-    isIdCard:true,
+    isIdCard: true,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
     cur_index: 'support_duty',
     lovercardtypeData: {
-      label: '身份证件类型',
+      label: '配偶证照类型',
       bindtype: 'lovercardtype',
       selected: '居民身份证',
       disabled: true,
       isblack: 'true',
-      placeholder: '请选择身份证件类型',
+      placeholder: '请选择证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
@@ -51,7 +69,7 @@ Page({
       selected: '',
       isblack: 'true',
       placeholder: '请选择与纳税人的关系',
-      values: ["父母", "祖父母", "外祖父母"],
+      values: ["父母", "祖父母、外祖父母"],
       onChange: 'onPickerSelect'
     },
     taxperson_relativeData: {
@@ -96,7 +114,7 @@ Page({
       bindtype: 'child_edu_degree',
       selected: '',
       isblack: 'true',
-      values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育","硕士研究生教育","博士研究生教育"],
+      values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育", "硕士研究生教育", "博士研究生教育"],
       placeholder: '请选择教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -135,7 +153,7 @@ Page({
       bindtype: 'edu_level',
       selected: '',
       isblack: 'true',
-      values: ["专科", "本科","硕士研究生","博士研究生","其他"],
+      values: ["专科", "本科", "硕士研究生", "博士研究生", "其他"],
       placeholder: '请选择学历教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -152,7 +170,7 @@ Page({
     oldercardtypeData: {
       label: '被赡养人证件类型',
       isrequre: true,
-      disabled:true,
+      disabled: true,
       bindtype: 'oldercardtype',
       selected: '居民身份证',
       isblack: 'true',
@@ -218,11 +236,11 @@ Page({
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
-      datelong:0,
+      datelong: 0,
       start: '1970-01-01',
     },
     studyenddate: {
-      label: '预计受教育日期止',
+      label: '教育终止时间',
       isrequre: true,
       bindtype: 'study_end_date',
       selected: '',
@@ -254,7 +272,7 @@ Page({
       bindtype: 'identify_type',
       selected: '',
       isblack: 'true',
-      values: ["产权证", "不动产权登记证","出售合同号","预售合同号"],
+      values: ["产权证", "不动产权登记证", "出售合同号", "预售合同号"],
       placeholder: '请选择证书类型',
       onChange: 'onPickerSelect'
     },
@@ -346,7 +364,7 @@ Page({
       mode: "date",
       fields: "month",
       start: '1970-01',
-      datelong:0,
+      datelong: 0,
     },
     eduCountryData: {
       label: '就读国家',
@@ -379,19 +397,32 @@ Page({
 
     var reduce_typeData = this.data.reducetypeData
     var deduction_amount
-    if (options.reducetype == '月度'){
+    if (options.reducetype == '月度') {
       reduce_typeData.selected = '月度'
       deduction_amount = Deduce_amounts_month[nameKey]
-    }else {
+    } else {
       deduction_amount = Deduce_amounts_year[nameKey]
       reduce_typeData.selected = '年度'
     }
+    if ("continuing_education" == options.status) {
+      var studystart_date = this.data.studystartdate
+      studystart_date.label = "入学时间起"
+      var studyend_date = this.data.studyenddate
+      studyend_date.label = "(预计)毕业时间"
+
+      this.setData({
+        studystartdate: studystart_date,
+        studyenddate: studyend_date
+      })
+      console.log("studystart_date", this.data.studystartdate);
+    }
+
+    var title = '添加' +  AddTypeNames[nameKey]
 
-    var title = '添加' + (options.title ? options.title : AddTypeNames[nameKey])
-  
     this.setData({
       title: title,
       cur_index: nameKey,
+      house_type : frontPage.data.house_type,
       reducetypeData: reduce_typeData,
       deduction_amount: deduction_amount
     })
@@ -399,13 +430,13 @@ Page({
       title: title,
     })
     this.initOSS()
-    if (options.datas && options.datas.length){
+    if (options.datas && options.datas.length) {
       this.handleTransData(JSON.parse(options.datas))
     }
     this.loadCountry()
   },
 
-  loadCountry:function(){
+  loadCountry: function() {
     countryInfo.init(this)
     var countrylist = this.data.country
     var country_data = this.data.eduCountryData
@@ -416,11 +447,10 @@ Page({
     this.setData({
       eduCountryData: country_data
     })
-    
-  },
 
-  handleTransData: function (data) {
+  },
 
+  handleTransData: function(data) {
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
@@ -430,7 +460,7 @@ Page({
         if (data.name && data.name.length) {
           setData.children_name = data.name
         }
-        if (data.birth_date && data.birth_date>0) {
+        if (data.birth_date && data.birth_date > 0) {
           var childrenbirthDate = this.data.childrenbirthDate
           childrenbirthDate.selected = format.formatTime_date(data.birth_date)
           childrenbirthDate.datelong = data.birth_date
@@ -470,18 +500,10 @@ Page({
         // if (data.relationship && data.relationship.length) {
         // }
         this.setData(setData)
-      break;
-      case 'continuing_education':
-        var setData = {}
-
-        var studystartdate = this.data.studystartdate
-        studystartdate.label = "入学时间起"
-        setData.studystartdate = studystartdate
-
-        this.setData({
-          studystartdate: studystartdate
-        })
-      break;
+        break;
+        // case '':
+        //   var setData = {}
+        // break;
       case 'medical_fund':
         var setData = {}
         if (data.name && data.name.length) {
@@ -542,12 +564,12 @@ Page({
 
   },
 
-  onShow: function () {  
+  onShow: function() {
     var that = this
     var id_error //= this.data.id_error
     wx.getStorage({
       key: 'id_info',
-      success: function (res) {
+      success: function(res) {
         console.log('id_info', res.data)
         if (res.data && res.data.length > 0) {
           var id_info = JSON.parse(res.data)
@@ -560,7 +582,7 @@ Page({
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
           } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
-          }          
+          }
 
           if (that.data.name.length > 0 && id_info.name != that.data.name) {
             that.showtoast("姓名冲突")
@@ -575,12 +597,12 @@ Page({
           // children_id_card_no
           // spouse_id_card_no
           // older_idno
-              // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
+          // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
           // that.data.genderData.selected = id_info.gender
           // that.data.birthDate.selected = birth_day
           console.log('name***card_number', that.data.name + '***' + that.data.card_number)
 
-          if (this.idcard_belong == 'children_id_card_no'){
+          if (this.idcard_belong == 'children_id_card_no') {
             this.data.childrenbirthDate.selected = birth_day
             data = {
               children_id_card_no: id_info.id_card_number,
@@ -603,7 +625,7 @@ Page({
     })
     wx.removeStorage({
       key: 'id_info',
-      success: function (res) {
+      success: function(res) {
         console.log('remove_idinfo', res)
       },
     })
@@ -620,7 +642,7 @@ Page({
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
           this.showToast('请填写子女证件号码')
           return
-        } 
+        }
         if (!formdata.children_name || formdata.children_name.length < 1) {
           this.showToast('请填写子女姓名')
           return
@@ -632,7 +654,7 @@ Page({
         if (!formdata.percent || formdata.percent.length < 1) {
           this.showToast('请填写扣除分配比例')
           return
-        }else{
+        } else {
           newdata.percent = parseFloat(formdata.percent)
         }
         if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
@@ -656,7 +678,7 @@ Page({
           return
         }
 
-        if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected){
+        if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
           if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
             this.showToast('请填写配偶姓名')
             return
@@ -674,14 +696,14 @@ Page({
 
         }
         newdata.relationship = this.data.taxperson_relativeData.selected
-        newdata.children_id_card_type = '1'//this.data.childrencardtypeData.selected
+        newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
         newdata.children_birthday = this.data.childrenbirthDate.datelong
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
         newdata.education_period = this.data.childedudegreeData.selected
         newdata.children_nation = "中国"
-        newdata.spouse_id_card_type = '1'//this.data.lovercardtypeData.selected
-        newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong: 0 
+        newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
+        newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
         newdata.nation = "中国"
         break;
       case 'continuing_education':
@@ -705,7 +727,7 @@ Page({
           }
           newdata.education_start = this.data.studystartdate.datelong
           newdata.education_end = this.data.studyenddate.datelong
-          newdata.education_type = 'title'//学历
+          newdata.education_type = 'title' //学历
           newdata.education_period = this.data.edulevelData.selected
         } else if (this.data.edu_lable == 'tech') {
           if (this.data.edustyleData.selected.length < 1) {
@@ -872,28 +894,28 @@ Page({
     if (this.data.reducetypeData.selected.length < 1) {
       this.showToast('请选择扣除方式')
       return
-    } 
+    }
     // else if (!formdata.reduce_money || formdata.reduce_money.length < 1) {
     //   this.showToast('请填写扣除金额')
     //   return
     // }
-    if (this.data.cur_index != 'medical_fund'){
-      newdata.deduction_type = this.data.reducetypeData.selected=='月度'?"month":"year"
-      newdata.deduction_amount = this.data.deduction_amount//formdata.reduce_money 
+    if (this.data.cur_index != 'medical_fund') {
+      newdata.deduction_type = this.data.reducetypeData.selected == '月度' ? "month" : "year"
+      newdata.deduction_amount = this.data.deduction_amount //formdata.reduce_money 
     }
     newdata.legal_entity_id = this.legal_entity_id
     newdata.legal_entity = this.legal_entity
     this.addDatas(newdata, subUrl)
   },
 
-  addDatas: function (newdata,subUrl){
+  addDatas: function(newdata, subUrl) {
     wx.showModal({
       title: '确认要提交申报吗？',
       content: '确认后将不能修改',
       showCancel: true,
-      confirmColor:'#357AEB',
-      cancelColor:'#999',
-      success: function (res) {
+      confirmColor: '#357AEB',
+      cancelColor: '#999',
+      success: function(res) {
         if (res.confirm) {
           var that = this;
           var Authorization = app.globalData.Authorization;
@@ -913,18 +935,17 @@ Page({
               }
             }
           })
-        } else if (res.cancel) {
-        }
+        } else if (res.cancel) {}
       }
     })
   },
 
-  getIdInfo: function (e) {
+  getIdInfo: function(e) {
     this.idcard_belong = e.currentTarget.id
     if (this.data.isIdCard) {
       wx.navigateTo({
         url: '../../taxperson/idinfo/idinfo',
-        success: function (res) { },
+        success: function(res) {},
       })
     }
   },
@@ -1000,13 +1021,13 @@ Page({
           childedudegreeData: childedudegreeData
         })
         break;
-      // case 'edu_degree':
-      //   var edudegree_data = this.data.edudegreeData
-      //   edudegree_data.selected = edudegree_data.values[e.detail.value]
-      //   this.setData({
-      //     edudegreeData: edudegree_data
-      //   })
-      //   break;
+        // case 'edu_degree':
+        //   var edudegree_data = this.data.edudegreeData
+        //   edudegree_data.selected = edudegree_data.values[e.detail.value]
+        //   this.setData({
+        //     edudegreeData: edudegree_data
+        //   })
+        //   break;
       case 'edu_country':
         var eduCountry_data = this.data.eduCountryData
         eduCountry_data.selected = eduCountry_data.values[e.detail.value]
@@ -1033,9 +1054,9 @@ Page({
         var older_birthDate = this.data.olderbirthDate
         older_birthDate.selected = e.detail.value
         older_birthDate.datelong = Date.parse(new Date(e.detail.value)) / 1000,
-        this.setData({
-          olderbirthDate: older_birthDate
-        })
+          this.setData({
+            olderbirthDate: older_birthDate
+          })
         break;
       case 'reduce_type':
         var reduce_typeData = this.data.reducetypeData
@@ -1159,7 +1180,7 @@ Page({
         var reducedate_data = this.data.reducedateData
         reducedate_data.selected = e.detail.value
         reducedate_data.datelong = Date.parse(new Date(e.detail.value)) / 1000,
-        console.log('reduce_date', Date.parse(new Date(e.detail.value)))
+          console.log('reduce_date', Date.parse(new Date(e.detail.value)))
         this.setData({
           reducedateData: reducedate_data
         })

@@ -127,7 +127,7 @@
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>被赡养人证件号码</text>
+        <text class='text_black_30 float_left'>被赡养人证照号码</text>
         <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='older_idno' value='{{older_idno}}'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
@@ -142,6 +142,13 @@
 
       <template is="picker_cell_normal" data="{{...older_relativeData}}" />
 
+<view class='divide_line_f5f5f5'></view>
+<view style='height:90rpx;'>
+          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+          <text class='text_black_30 float_left'>分摊比例</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percent' value='{{percent}}'></input>
+        </view>
       <!-- <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text class='text_black_30 float_left'>分摊比例</text>
@@ -182,7 +189,7 @@
     <!-- 住房 -->
     <view wx:if="{{cur_index=='house_fund'}}" style='padding:0 30rpx;'>
 
-      <view wx:if="{{title=='添加住房贷款利息'}}">
+      <view wx:if="{{house_type=='house_fund_loan'}}">
 
         <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
         <view class='divide_line_f5f5f5'></view>
@@ -204,7 +211,7 @@
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...loandatelongData}}" />
       </view>
-      <view wx:if="{{title=='添加住房租金'}}">
+      <view wx:if="{{house_type=='house_fund_rent'}}">
         <template is="picker_cell_normal" data="{{...contactLocateInfo}}" />
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...leasetypeData}}" />

@@ -11,6 +11,7 @@ Page({
     cur_status: "",
     legal_entity_id: "",
     legal_entity: "",
+    house_type:"",
     declareStatus: {
       "to_declare": "待申报",
       "declaring": "申报中",
@@ -125,6 +126,7 @@ Page({
 
   handleAddition: function(data) {
     var newdata = data.items
+    var housetype = ""
     for (var i = 0; i < newdata.length; i++) {
       if (newdata[i].education_start && newdata[i].education_start > 0) {
         newdata[i].education_start = format.formatTime_date(newdata[i].education_start)
@@ -133,7 +135,9 @@ Page({
         newdata[i].education_end = format.formatTime_date(newdata[i].education_end)
       }
     }
+
     this.setData({
+      house_type: "house_fund" == this.data.cur_status ? newdata[0].type:"",
       additionInfo: newdata
     })
   },
@@ -204,6 +208,7 @@ Page({
     var that = this
     var modalinfo, senddata
     if (this.data.cur_status == 'continuing_education' || this.data.cur_status == 'house_fund') {
+
       wx.navigateTo({
         url: '../addextrainfo/addextrainfo?datas=' + '' + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
       })
@@ -335,7 +340,7 @@ Page({
     })
   },
 
-  modalLeft: function() { //modal取消(添加)
+  modalLeft: function() { //modal(添加)
     this.setData({
       showModal_addtype: false
     })

@@ -62,14 +62,18 @@
             <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_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_999_28 ' style='line-height:70rpx'>继续教育类型：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</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'>{{2018-09-09}}</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.certification_name}}</text>
               </view>
@@ -101,19 +105,19 @@
             <view style='padding-right:right'>
               <view class='divide_line_f5f5f5'></view>
               <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'>{{item.education_type}}</text>
               </view>
               <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'>{{item.education_period}}</text>
               </view>
               <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'>1234</text>
               </view>
               <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'>123</text>
               </view>
               <view style='height:70rpx'>