Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

@@ -2,11 +2,14 @@
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund_rent': '住房' }
+const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund_rent':''}
+const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund_rent': '' }
+
 Page({
   idcard_belong:null,//照片信息获取返回时判断所属
-  /**
-   * Page initial data
-   */
+  legal_entity_id: "",
+  legal_entity:"",
   data: {
     deduction_amount:'',
     lable: 0,
@@ -14,7 +17,7 @@ Page({
     title: '',
     isIdCard:true,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
-    cur_index: 0,
+    cur_index: 'children_education',
     lovercardtypeData: {
       label: '身份证件类型',
       bindtype: 'lovercardtype',
@@ -77,7 +80,7 @@ Page({
     childedudegreeData: {
       label: '子女受教育阶段',
       isrequre: true,
-      bindtype: 'edu_degree',
+      bindtype: 'child_edu_degree',
       selected: '',
       isblack: 'true',
       values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育","硕士研究生教育","博士研究生教育"],
@@ -317,22 +320,36 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
-    var that = this
+
+    var pages = getCurrentPages()
+    var frontPage = pages[pages.length - 2]
+    console.log('---------frontPage', frontPage.data)
     console.log("options", options);
-    wx.setNavigationBarTitle({
-      title: this.data.title,
-    })
+    const nameKey = options.status
+
+    this.legal_entity_id = frontPage.data.legal_entity_id
+    this.legal_entity = frontPage.data.legal_entity
+
     var reduce_typeData = this.data.reducetypeData
-    var deduction_amount = 1200
-    reduce_typeData.selected = '月度扣除'
+    var deduction_amount
+    if (options.reducetype == '月度'){
+      reduce_typeData.selected = '月度扣除'
+      deduction_amount = Deduce_amounts_month[nameKey]
+    }else {
+      deduction_amount = Deduce_amounts_year[nameKey]
+      reduce_typeData.selected = '年度扣除'
+    }
+
+    var title = '添加' + (options.title ? options.title : AddTypeNames[nameKey])
     this.setData({
-      title: '添加' + options.title,
-      cur_index: options.index,
+      title: title,
+      cur_index: nameKey,
       reducetypeData: reduce_typeData,
       deduction_amount: deduction_amount
     })
-
-
+    wx.setNavigationBarTitle({
+      title: title,
+    })
     this.initOSS()
   },
 
@@ -446,7 +463,7 @@ Page({
     var formdata = e.detail.value
     var newdata = formdata;
     switch (this.data.cur_index + '') {
-      case '0':
+      case 'children_education':
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
           this.showToast('请填写子女证件号码')
           return
@@ -462,6 +479,8 @@ Page({
         if (!formdata.percent || formdata.percent.length < 1) {
           this.showToast('请填写扣除分配比例')
           return
+        }else{
+          newdata.percent = parseFloat(formdata.percent)
         }
         if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
           this.showToast('请填写学籍号')
@@ -491,25 +510,24 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
-          if (this.data.taxperson_relativeData.selected.length < 1) {
-            this.showToast('请选择与纳税人关系')
-            return
-          }
+          // if (this.data.taxperson_relativeData.selected.length < 1) {
+          //   this.showToast('请选择与纳税人关系')
+          //   return
+          // }
 
         }
-     
-        newdata.spouse_id_card_type = '1'//this.data.lovercardtypeData.selected
-        newdata.spouse_birthday = this.data.loverbirthDate.selected
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.children_id_card_type = '1'//this.data.childrencardtypeData.selected
-        newdata.children_birthday = this.data.childrenbirthDate.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.selected
         newdata.nation = "中国"
         break;
-      case '1':
+      case 'continuing_education':
         if (this.data.edutypeData.selected.length < 1) {
           this.showToast('请选择教育类型')
           return
@@ -555,7 +573,7 @@ Page({
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
         break;
-      case '2':
+      case 'support_duty':
         if (this.data.supporttypeData.selected.length < 1) {
           this.showToast('请选择赡养类型')
           return
@@ -585,7 +603,7 @@ Page({
         newdata.support_type = this.data.supporttypeData.selected
         newdata.older_cardtype = this.data.oldercardtypeData.selected
         break;
-      case '3':
+      case 'medical_fund':
         if (!formdata.name || formdata.name.length < 1) {
           this.showToast('请填写姓名')
           return
@@ -608,7 +626,7 @@ Page({
         newdata.cardtype = this.data.cardtypeData.selected
         newdata.taxperson_relative = this.data.taxperson_relativeData.selected
         break;
-      case '4':
+      case 'house_fund_rent':
         console.log('TITLE', this.data.title)
         if (!formdata.lover_name || formdata.lover_name.length < 1) {
           this.showToast('请填写配偶姓名')
@@ -698,8 +716,8 @@ Page({
     // }
     newdata.deduction_type = this.data.reducetypeData.selected
     newdata.deduction_amount = this.data.deduction_amount//formdata.reduce_money 
-    newdata.legal_entity = ""
-    newdata.legal_entity_id = ""
+    newdata.legal_entity_id = this.legal_entity_id
+    newdata.legal_entity = this.legal_entity
     this.addDatas(newdata)
   },
 
@@ -769,6 +787,7 @@ Page({
       case 'childrenbirthday':
         var children_birthDate = this.data.childrenbirthDate
         children_birthDate.selected = e.detail.value
+        children_birthDate.datelong = (Date.parse(new Date(e.detail.value)) / 1000)
         this.setData({
           childrenbirthDate: children_birthDate
         })
@@ -789,6 +808,13 @@ Page({
           studyenddate: study_enddate
         })
         break;
+      case 'child_edu_degree':
+        var childedudegreeData = this.data.childedudegreeData
+        childedudegreeData.selected = childedudegreeData.values[e.detail.value]
+        this.setData({
+          childedudegreeData: childedudegreeData
+        })
+        break;
       case 'edu_degree':
         var edudegree_data = this.data.edudegreeData
         edudegree_data.selected = edudegree_data.values[e.detail.value]
@@ -820,7 +846,12 @@ Page({
         break;
       case 'reduce_type':
         var reduce_typeData = this.data.reducetypeData
-        var deduction_amount = 1200
+        var deduction_amount
+        if (e.detail.value == '0') {
+          deduction_amount = Deduce_amounts_month[this.data.cur_index]
+        } else {
+          deduction_amount = Deduce_amounts_year[this.data.cur_indexfan]
+        }
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         this.setData({
           reducetypeData: reduce_typeData,

@@ -4,7 +4,7 @@
 <view class='page'>
   <form bindsubmit='formSubmit'>
       <!-- 添加子女 -->
-      <view wx:if="{{cur_index==0}}">
+      <view wx:if="{{cur_index=='children_education'}}">
         <view style='padding:0 30rpx;'>
           <template is="picker_cell_normal" data="{{...childrencardtypeData}}" />
           <view class='divide_line_f5f5f5'></view>
@@ -41,14 +41,14 @@
           <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='请输入分配比例' name='reduce_ratio'></input>
+          <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'></input>
         </view>
 
         <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>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_schoolno'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no'></input>
         </view>
         <view class='divide_line_f5f5f5'></view>
 
@@ -63,7 +63,7 @@
         </view>
       </view>
       <!-- 继续教育 -->
-      <view wx:if="{{cur_index==1}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='continuing_education'}}" style='padding:0 30rpx;'>
 
         <template is="picker_cell_normal" data="{{...edutypeData}}" />
         <view class='divide_line_f5f5f5'></view>
@@ -100,7 +100,7 @@
 
       </view>
       <!-- 赡养老人 -->
-      <view wx:if="{{cur_index==2}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
         <template is="picker_cell_normal" data="{{...supporttypeData}}" />
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
@@ -133,7 +133,7 @@
         </view> -->
       </view>
       <!-- 大病医疗 -->
-      <view wx:if="{{cur_index==3}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
         <view style='height:90rpx'>
           <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' placeholder='请输入姓名' name='name'></input>
@@ -160,7 +160,7 @@
         </view>
       </view>
       <!-- 住房 -->
-      <view wx:if="{{cur_index==4}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='house_fund_rent'}}" style='padding:0 30rpx;'>
 
         <view wx:if="{{title=='添加住房贷款利息'}}">
 
@@ -235,7 +235,7 @@
 
       <view style='padding:0 30rpx;'>
 
-        <view wx:if="{{cur_index==0}}">
+        <view wx:if="{{cur_index=='children_education'}}">
           <view style='height:90rpx'>
             <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' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
@@ -267,7 +267,7 @@
           </view>
         </view>
 
-         <view wx:if="{{cur_index==4}}">
+         <view wx:if="{{cur_index=='house_fund_rent'}}">
           <view style='height:90rpx'>
             <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' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>

@@ -49,7 +49,7 @@ Page({
     console.log("lookandadd", e);
     if (this.data.additiondata.options && this.data.additiondata.options.length>0){
       wx.navigateTo({
-        url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id,
+        url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
       })
     }
   

@@ -61,7 +61,7 @@ Page({
     console.log("lookandadd", str);
 
     wx.navigateTo({
-      url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&legal_entity_id=" + data[str[0]].legal_entity_id,
+      url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&legal_entity_id=" + data[str[0]].legal_entity_id + "&legal_entity=" + data[str[0]].legal_entity,
     })
   },
 

@@ -10,6 +10,7 @@ Page({
   data: {
     cur_status: "",
     legal_entity_id: "",
+    legal_entity:"",
     declareStatus: {
       "to_declare ": "待申报",
       "declaring": "申报中",
@@ -80,7 +81,8 @@ Page({
     console.log("options", options);
     this.setData({
       cur_status: options.status,
-      legal_entity_id: options.legal_entity_id
+      legal_entity_id: options.legal_entity_id,
+      legal_entity: options.legal_entity
     })
     wx.setNavigationBarTitle({
       "title": that.data.additiontitle[options.status],

@@ -302,11 +302,10 @@ Page({
     console.log("form_data", formdata);
     var Authorization = app.globalData.Authorization;
     var url = baseUrl + 'persontax/v1/personal-taxes', method = "POST"
-    if (this.cur_id.length){
+    if (this.cur_id && this.cur_id.length){
       url = baseUrl + 'persontax/v1/personal-taxes/' + this.cur_id
       method = "PUT"
     }
-    console.log('this.cur_id', this.cur_id)
     wx.showLoading({
       title: '',
     })