Merge branch 'dev2.0' into dev_wy

wangyu
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/advancepayment/adPayDetails/adPayDetails.js
pages/main/advancepayment/adPayHome.js
pages/main/advancepayment/adPayHome.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @05d213a
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @05d213a
@@ -4,8 +4,8 @@ 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': '', 'medical_fund': '','house_fund':''}
-const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': 4800, '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,//照片信息获取返回时判断所属
@@ -18,7 +18,7 @@ Page({
     title: '',
     isIdCard:true,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
-    cur_index: 'children_education',
+    cur_index: 'support_duty',
     lovercardtypeData: {
       label: '身份证件类型',
       bindtype: 'lovercardtype',
@@ -43,13 +43,24 @@ Page({
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
+    older_relativeData: {
+      label: '与纳税人的关系',
+      isrequre: true,
+      bindtype: 'older_relative',
+      selected: '',
+      isblack: 'true',
+      placeholder: '请选择与纳税人的关系',
+      values: ["父母", "祖父母", "外祖父母"],
+      onChange: 'onPickerSelect'
+    },
     taxperson_relativeData: {
       label: '与纳税人的关系',
+      isrequre: true,
       bindtype: 'taxperson_relative',
       selected: '',
       isblack: 'true',
       placeholder: '请选择与纳税人的关系',
-      values: ["父子", "父女", "母子", "母女"],
+      values: ["本人", "配偶", "子女"],
       onChange: 'onPickerSelect'
     },
     childrencardtypeData: {
@@ -129,6 +140,7 @@ Page({
     },
     supporttypeData: {
       label: '赡养类型',
+      isrequre: true,
       bindtype: 'support_type',
       selected: '',
       isblack: 'true',
@@ -138,8 +150,10 @@ Page({
     },
     oldercardtypeData: {
       label: '被赡养人证件类型',
+      isrequre: true,
+      disabled:true,
       bindtype: 'oldercardtype',
-      selected: '',
+      selected: '居民身份证',
       isblack: 'true',
       placeholder: '请选择被赡养人证件类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
@@ -148,9 +162,11 @@ Page({
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
-      label: '证件类型',
+      label: '身份证件类型',
+      isrequre: true,
       bindtype: 'cardtype',
-      selected: '',
+      selected: '居民身份证',
+      disabled: true,
       isblack: 'true',
       placeholder: '请选择证件类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
@@ -160,6 +176,7 @@ Page({
     },
     olderbirthDate: {
       label: '被赡养人出生日期',
+      isrequre: true,
       bindtype: 'olderbirthday',
       selected: '',
       isblack: 'true',
@@ -413,6 +430,21 @@ Page({
         // }
         this.setData(setData)
       break;
+      case 'medical_fund':
+        var setData = {}
+        if (data.name && data.name.length) {
+          setData.name = data.name
+        }
+        if (data.id_card_no && data.id_card_no.length) {
+          setData.id_card_no = data.id_card_no
+        }
+        if (data.family_ties && data.family_ties.length) {
+          var taxperson_relativeData = this.data.taxperson_relativeData
+          taxperson_relativeData.selected = data.family_ties
+          setData.taxperson_relativeData = taxperson_relativeData
+        }
+        this.setData(setData)
+        break;
     }
   },
@@ -529,8 +561,10 @@ Page({
     console.log("formSubmit", e);
     var formdata = e.detail.value
     var newdata = formdata;
+    var subUrl = ''
     switch (this.data.cur_index + '') {
       case 'children_education':
+        subUrl = 'persontax/v1/children-educations'
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
           this.showToast('请填写子女证件号码')
           return
@@ -595,6 +629,7 @@ Page({
         newdata.nation = "中国"
         break;
       case 'continuing_education':
+        subUrl = 'persontax/v1/continuing-educations'
         if (this.data.edutypeData.selected.length < 1) {
           this.showToast('请选择教育类别')
           return
@@ -639,6 +674,7 @@ Page({
         }
         break;
       case 'support_duty':
+        subUrl = 'persontax/v1/support-duties'
         if (this.data.supporttypeData.selected.length < 1) {
           this.showToast('请选择赡养类型')
           return
@@ -652,46 +688,48 @@ Page({
           this.showToast('请填写赡养人证件号')
           return
         }
-        if (this.data.oldersupport_lable == 'single') {
-          if (this.data.olderbirthDate.selected.length < 1) {
-            this.showToast('请选择赡养人出生日期')
-            return
-          }
-          if (this.data.taxperson_relativeData.selected.length < 1) {
-            this.showToast('请选择与纳税人关系')
-            return
-          }
-          newdata.older_birthday = this.data.olderbirthDate.selected
-          newdata.older_relative = this.data.taxperson_relativeData.selected
+        if (this.data.olderbirthDate.selected.length < 1) {
+          this.showToast('请选择赡养人出生日期')
+          return
         }
-
+        if (this.data.older_relativeData.selected.length < 1) {
+          this.showToast('请选择与纳税人关系')
+          return
+        }
+        newdata.older_birthday = this.data.olderbirthDate.datelong
+        newdata.older_relative = this.data.older_relativeData.selected
         newdata.support_type = this.data.supporttypeData.selected
         newdata.older_cardtype = this.data.oldercardtypeData.selected
         break;
       case 'medical_fund':
+        subUrl = 'persontax/v1/medical-funds'
         if (!formdata.name || formdata.name.length < 1) {
           this.showToast('请填写姓名')
           return
         } else if (this.data.cardtypeData.selected.length < 1) {
-          this.showToast('请选择赡养人证件类型')
+          this.showToast('请选择证件类型')
           return
-        } else if (!formdata.idno || formdata.idno.length < 1) {
+        } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
           this.showToast('请填写证件号码')
           return
         } else if (this.data.taxperson_relativeData.selected.length < 1) {
           this.showToast('请选择与纳税人关系')
           return
-        } else if (!formdata.total_money || formdata.reduce_money < 0) {
+        } else if (!formdata.total_amount || formdata.total_amount < 0) {
           this.showToast('请填写医疗支出总金额')
           return
-        } else if (!formdata.personal_money || formdata.personal_money < 0) {
+        } else if (!formdata.amount_by_person || formdata.amount_by_person < 0) {
           this.showToast('请填写个人负担金额')
           return
         }
-        newdata.cardtype = this.data.cardtypeData.selected
-        newdata.taxperson_relative = this.data.taxperson_relativeData.selected
+
+        newdata.total_amount = parseFloat(formdata.total_amount)
+        newdata.amount_by_person = parseFloat(formdata.amount_by_person)
+        newdata.id_card_type = this.data.cardtypeData.selected
+        newdata.relationship = this.data.taxperson_relativeData.selected
         break;
       case 'house_fund':
+        // subUrl = 'persontax/v1/medical-funds'
         console.log('TITLE', this.data.title)
         if (!formdata.lover_name || formdata.lover_name.length < 1) {
           this.showToast('请填写配偶姓名')
@@ -779,14 +817,16 @@ Page({
     //   this.showToast('请填写扣除金额')
     //   return
     // }
-    newdata.deduction_type = this.data.reducetypeData.selected
-    newdata.deduction_amount = this.data.deduction_amount//formdata.reduce_money 
+    if (this.data.cur_index != 'medical_fund'){
+      newdata.deduction_type = this.data.reducetypeData.selected
+      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)
+    this.addDatas(newdata, subUrl)
   },
-  addDatas: function (newdata){
+  addDatas: function (newdata,subUrl){
     wx.showModal({
       title: '确认要提交申报吗？',
       content: '确认后将不能修改',
@@ -798,7 +838,7 @@ Page({
           var that = this;
           var Authorization = app.globalData.Authorization;
           wx.request({
-            url: baseUrl + 'persontax/v1/children-educations',
+            url: baseUrl + subUrl,
             method: "POST",
             header: {
               'content-type': 'application/json',
@@ -847,6 +887,13 @@ Page({
           loverbirthDate: lover_birthDate
         })
         break;
+      case 'older_relative':
+        var older_relativeData = this.data.older_relativeData
+        older_relativeData.selected = older_relativeData.values[e.detail.value]
+        this.setData({
+          older_relativeData: older_relativeData
+        })
+        break;
       case 'taxperson_relative':
         var taxperson_relativedata = this.data.taxperson_relativeData
         taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]
@@ -918,6 +965,7 @@ Page({
       case 'olderbirthday':
         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
         })
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @05d213a
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @05d213a
@@ -107,6 +107,7 @@
         <template is="picker_cell_normal" data="{{...supporttypeData}}" />
         <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='older_name'></input>
         </view>
@@ -114,20 +115,21 @@
         <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
         <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='请输入证件号码' type='idcard' name='older_idno' value='{{older_idno}}'></input>
+          <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>
         <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
         <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_333_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
+          <text class='text_black_30 float_left'>被赡养人国籍(地区)</text>
+          <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
         </view>
         <view class='divide_line_f5f5f5'></view>
-        <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
+        <template is="picker_cell_normal" data="{{...older_relativeData}}" />
         <!-- <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
@@ -138,28 +140,32 @@
       <!-- 大病医疗 -->
       <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
         <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='name'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input>
         </view>
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...cardtypeData}}" />
         <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='idno'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='id_card_no' value='{{id_card_no}}'></input>
         </view>
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...taxperson_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>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_money'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_amount' value='{{total_amount}}'></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='请输入金额' type='digit' name='personal_money'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入金额' type='digit' name='amount_by_person' value='{{total_amount}}'></input>
         </view>
       </view>
       <!-- 住房 -->
@@ -220,7 +226,7 @@
         </view>
       </view>
-      <view style='padding:0 30rpx;'>  
+      <view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund'}}">  
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...reducetypeData}}" />
         <view class='divide_line_f5f5f5'></view>
--- a/pages/main/advancepayment/adPayDetails/adPayDetails.js
查看文件 @05d213a
+++ b/pages/main/advancepayment/adPayDetails/adPayDetails.js
查看文件 @05d213a
@@ -9,36 +9,7 @@ Page({
     // tab切换  
     isshow: false,
     currentTab: 0,
-    taxDatas: {
-      "id": "154024896031100928",
-      "created_at": 1511525284,
-      "updated_at": 1511525284,
-      "tenant_id": "122371433052508160",
-      "taxation_method": "salary",   // 个税申报类型："0101"-工资薪金  "0401"-劳务报酬
-      "sub_taxation_method": "salary",   // 正常工资薪金子类型："0101"-正常工资薪金  "0107"-内退一次性补偿 "0108"-解除劳动合同一次性补偿 "0109"-个人股票期权行权收入 "0110"-企业年金 "0111"-提前退休一次性补贴 "0103"-全年一次性奖金收入
-      "province": "北京市",
-      "province_code": "110000",
-      "city": "市辖区",
-      "city_code": "110100",
-      "district": "东城",
-      "district_code": "110101",
-      "name": "徐恒堂",  //姓名
-      "credential_type": "居民身份证",
-      "credential_number": "110221198301270632", //证件号码 
-      "option_date": 152135596800,
-      "personal_income": 475.6,  //当期收入额
-      "tax_free_income": 475.6,  //当期免税收入
-      "special_deduction": 475.6,  //累计专项扣除（专项扣除合计）
-      "reduction_cost": 475.6,  //累计基本减除（减除费用）
-      "special_additional_deduction": 475.6,  //累计专项附加扣除（专项附加扣除合计）
-      "other_deduction": 475.6,  //累计法定扣除（其他扣除合计）
-      "accumulated_taxable_income": 475.6,  //累计应纳税所得额
-      "tax_rate": 0.6,  //税率
-      "deduction_number": 475.6,  //速算扣除数
-      "accumulated_withholding_tax": 475.6,  //累计应扣缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "refund_tax": 475.6,  //本期应缴税额（应补退税额）
-    },
+    taxDatas: {},
     choosed_date: '',
     long_date: 0
   },
@@ -63,7 +34,7 @@ Page({
         console.log('成功', result)
         if (result.personal_income){
           self.setData({
-            taxDatas: result
+            taxDatas: result.data
           })
         }
--- a/pages/main/advancepayment/adPayHome.js
查看文件 @05d213a
+++ b/pages/main/advancepayment/adPayHome.js
查看文件 @05d213a
@@ -2,7 +2,7 @@
 var format = require('../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
-
+const Sub_taxation_method = {"0101":'正常工资薪金',  "0107": "内退一次性补偿" ,"0108": "解除劳动合同一次性补偿", "0109": "个人股票期权行权收入", "0110": "企业年金", "0111": "提前退休一次性补贴", "0103": "全年一次性奖金收入"}
 Page({
   loadCount:0,
   timestamp: 0,
@@ -11,29 +11,7 @@ Page({
     // tab切换  
     isshow : false,
     currentTab: 0,
-    taxDatas: [{
-      "id": "154024896031100928",
-      "created_at": 1511525284,
-      "updated_at": 1511525284,
-      "tenant_id": "122371433052508160",
-      "taxation_method": "salary",   // 个税申报类型："0101"-工资薪金  "0401"-劳务报酬
-      "sub_taxation_method": "salary",   // 正
-      "province": "北京市",
-      "province_code": "110000",
-      "city": "市辖区",
-      "city_code": "110100",
-      "district": "东城",
-      "district_code": "110101",
-      "name": "徐恒堂",  //姓名
-      "credential_type": "身份证",
-      "credential_number": "110221198301270632", //证件号码
-      "personal_tax": 475.6,  //本期应缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "accumulated_taxable_income": 475.6,  //累计应纳税所得额
-      "accumulated_withholding_tax": 475.6,  //累计应扣缴税额
-      "prepay_tax": 475.6,  //已预交税额
-      "option_date": 152135596800
-    }],
+    taxDatas: [],
     salaryDatas: {},
     choosed_date: ''
   },
@@ -55,9 +33,10 @@ Page({
       header: {
         'Authorization': this.Authorization
       },
+      data: { 'declare_month': timestamp },
       success: function (result) {
         that.setData({
-          taxDatas: result.items
+          taxDatas: that.handleTaxData(result.data.items)
         })
       },
@@ -95,7 +74,21 @@ Page({
     })
   },
-
+  handleTaxData: function (items) {
+    for (var i = 0; i < items.length; ++i) {
+      var item = items[i]
+      var method
+      if (item.taxation_method == '0101'){
+        if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){
+          method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]
+        }
+      } else if (item.taxation_method == '0401') {
+        method = '劳务报酬'
+      }
+      item.method
+    }
+    return items;
+  },
   handleSalaryData: function (items) {
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]
--- a/pages/main/advancepayment/adPayHome.wxml
查看文件 @05d213a
+++ b/pages/main/advancepayment/adPayHome.wxml
查看文件 @05d213a
@@ -17,10 +17,10 @@
     <view wx:if="{{currentTab==0}}">
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
-          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.taxation_method=='salary'?'工资薪金':'劳务报酬'}}</text>
+          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
-          <!-- <text class='text_666_28'>累计收入额:{{item.}}</text> -->
-          <!-- <text class='text_666_28'>当期收入额:{{item.}}</text> -->
+          <!-- <text class='text_666_28'>累计收入额:{{item.personal_income}}</text> -->
+          <text class='text_666_28'>当期收入额:{{item.personal_income}}</text>
           <text class='text_666_28'>累计应缴纳所得额:{{item.accumulated_taxable_income}}</text>
           <text class='text_666_28'>累计应扣缴税额:{{item.accumulated_withholding_tax}}</text>
           <text class='text_666_28'>已预交税额:{{item.prepay_tax}}</text>