Merge branch 'dev_py' into dev2.0

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @de8d108
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @de8d108
@@ -8,6 +8,7 @@ Page({
    * Page initial data
    */
   data: {
+    deduction_amount:'',
     lable: 0,
     datas02: [],
     title: '',
@@ -174,7 +175,7 @@ Page({
     reducetypeData: {
       label: '扣除方式',
       bindtype: 'reduce_type',
-      selected: '月度扣除',
+      selected: '',
       isblack: 'true',
       values: ["月度扣除", "年度扣除"],
       placeholder: '请选择扣除方式',
@@ -318,14 +319,18 @@ Page({
   onLoad: function(options) {
     var that = this
     console.log("options", options);
-    this.setData({
-      title: '添加' + options.title,
-      cur_index: options.index
-    })
     wx.setNavigationBarTitle({
       title: this.data.title,
     })
-
+    var reduce_typeData = this.data.reducetypeData
+    var deduction_amount = 1200
+    reduce_typeData.selected = '月度扣除'
+    this.setData({
+      title: '添加' + options.title,
+      cur_index: options.index,
+      reducetypeData: reduce_typeData,
+      deduction_amount: deduction_amount
+    })
     this.initOSS()
@@ -503,11 +508,6 @@ Page({
         newdata.education_period = this.data.childedudegreeData.selected
         newdata.children_nation = "中国"
         newdata.nation = "中国"
-        newdata.deduction_type = this.data.reducetypeData.selected
-        newdata.deduction_amount = '1000' 
-        if ('年度扣除' == newdata.deduction_type){
-          newdata.deduction_amount = '12000'  
-        }
         break;
       case '1':
         if (this.data.edutypeData.selected.length < 1) {
@@ -554,11 +554,6 @@ Page({
         newdata.education_type = this.data.edutypeData.selected
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
-        newdata.deduction_type = this.data.reducetypeData.selected
-        newdata.deduction_amount = ''
-        if ('年度扣除' == newdata.deduction_type) {
-          newdata.deduction_amount = ''
-        }
         break;
       case '2':
         if (this.data.supporttypeData.selected.length < 1) {
@@ -589,11 +584,6 @@ Page({
         newdata.support_type = this.data.supporttypeData.selected
         newdata.older_cardtype = this.data.oldercardtypeData.selected
-        newdata.deduction_type = this.data.reducetypeData.selected
-        newdata.deduction_amount = ''
-        if ('年度扣除' == newdata.deduction_type) {
-          newdata.deduction_amount = ''
-        }
         break;
       case '3':
         if (!formdata.name || formdata.name.length < 1) {
@@ -617,11 +607,6 @@ Page({
         }
         newdata.cardtype = this.data.cardtypeData.selected
         newdata.taxperson_relative = this.data.taxperson_relativeData.selected
-        newdata.deduction_type = this.data.reducetypeData.selected
-        newdata.deduction_amount = ''
-        if ('年度扣除' == newdata.deduction_type) {
-          newdata.deduction_amount = ''
-        }
         break;
       case '4':
         console.log('TITLE', this.data.title)
@@ -700,23 +685,19 @@ Page({
         }
         newdata.lover_cardtype = this.data.lovercardtypeData.selected
         newdata.lover_birthdate = this.data.loverbirthDate.selected
-        newdata.deduction_type = this.data.reducetypeData.selected
-        newdata.deduction_amount = ''
-        if ('年度扣除' == newdata.deduction_type) {
-          newdata.deduction_amount = ''
-        }
         break;
     }
     if (this.data.reducetypeData.selected.length < 1) {
       this.showToast('请选择扣除方式')
       return
-    } else if (!formdata.reduce_money || formdata.reduce_money.length < 1) {
-      this.showToast('请填写扣除金额')
-      return
-    }
-    // newdata.deduction_type = this.data.reducetypeData.selected
-    // newdata.deduction_amount = formdata.reduce_money 
+    } 
+    // else if (!formdata.reduce_money || formdata.reduce_money.length < 1) {
+    //   this.showToast('请填写扣除金额')
+    //   return
+    // }
+    newdata.deduction_type = this.data.reducetypeData.selected
+    newdata.deduction_amount = this.data.deduction_amount//formdata.reduce_money 
     newdata.legal_entity = ""
     newdata.legal_entity_id = ""
     this.addDatas(newdata)
@@ -839,9 +820,11 @@ Page({
         break;
       case 'reduce_type':
         var reduce_typeData = this.data.reducetypeData
+        var deduction_amount = 1200
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         this.setData({
-          reducetypeData: reduce_typeData
+          reducetypeData: reduce_typeData,
+          deduction_amount: deduction_amount
         })
         break;
       case 'edu_type':
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @de8d108
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @de8d108
@@ -223,8 +223,8 @@
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text class='text_black_30 float_left'>扣除金额</text>
-          <text wx:if="{{reducetypeData.selected=='月度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥1000/月</text>
-          <text wx:if="{{reducetypeData.selected=='年度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥12000/年</text>
+          <text wx:if="{{reducetypeData.selected=='月度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
+          <text wx:if="{{reducetypeData.selected=='年度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
           <!-- <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
         </view>
         <view class='divide_line_f5f5f5'></view>