文案调整。数字限制。教育年月

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/addinfo/addinfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @f2d9323
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @f2d9323
@@ -81,16 +81,17 @@ Page({
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
-    // older_relativeData: {
-    //   label: '与纳税人关系',
-    //   isrequre: true,
-    //   bindtype: 'older_relative',
-    //   selected: '',
-    //   isblack: 'true',
-    //   placeholder: '请选择与纳税人关系',
-    //   values: ["父母", "祖父母、外祖父母"],
-    //   onChange: 'onPickerSelect'
-    // },
+    older_relativeData: {
+      label: '与纳税人关系',
+      isrequre: true,
+      disabled: true,
+      bindtype: 'older_relative',
+      selected: "",
+      isblack: 'true',
+      placeholder: '请选择与纳税人关系',
+      values: ["父母", "其他"],
+      onChange: 'onPickerSelect'
+    },
     taxperson_relativeData: {
       label: '与纳税人的关系',
       isrequre: true,
@@ -143,7 +144,8 @@ Page({
       bindtype: 'child_edu_degree',
       selected: '',
       isblack: 'true',
-      values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育", "硕士研究生教育", "博士研究生教育"],
+      // values: ["学前教育(满3岁)", "小学教育", "初中教育", "普通高中教育", "中等职业教育", "大学专科教育", "大学本科教育", "硕士研究生教育", "博士研究生教育"],
+      values: ["学前教育阶段", "义务教育", "高中阶段教育", "高等教育"],
       placeholder: '请选择教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -182,7 +184,8 @@ Page({
       bindtype: 'edu_level',
       selected: '',
       isblack: 'true',
-      values: ["专科", "本科", "硕士研究生", "博士研究生", "其他"],
+      // values: ["专科", "本科", "硕士研究生", "博士研究生", "其他"],
+      values: ["大学专科", "大学本科", "硕士研究生", "博士研究生", "其他"],
       placeholder: '请选择学历教育阶段',
       onChange: 'onPickerSelect'
     },
@@ -285,7 +288,7 @@ Page({
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
-      fields: "day",
+      fields: "month",
       datelong: 0,
       start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-09-01',//'1970-01-01',
@@ -302,7 +305,7 @@ Page({
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
-      fields: "day",
+      fields: "month",
       start: '1970-01-01',
       // start: (new Date()).getFullYear() + '-07-31',//'1970-01-01',
       // end: (new Date()).getFullYear() + '-07-31',
@@ -1199,10 +1202,10 @@ Page({
           this.showToast('请选择被赡养人出生日期')
           return
         }
-        // if (this.data.older_relativeData.selected.length < 1) {
-        //   this.showToast('请选择与纳税人关系')
-        //   return
-        // }
+        if (this.data.older_relativeData.selected.length < 1) {
+          this.showToast('请选择与纳税人关系')
+          return
+        }
         // if (!formdata.percentage || formdata.percentage.length < 1 || formdata.percentage > 100) {
         //   this.showToast('请填写合理分摊比例')
         //   return
@@ -1215,7 +1218,7 @@ Page({
           newdata.share_method = this.share_method
         }
         newdata.birthday = this.data.olderbirthDate.datelong
-        // newdata.relationship = this.data.older_relativeData.selected
+        newdata.relationship = this.data.older_relativeData.selected
         newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
         newdata.nation = "中国"
         break;
@@ -1513,26 +1516,38 @@ Page({
     }
   },
   loan_input: function (e) {
-    console.log('-------', e.detail.value)
+    var value = e.detail.value
     switch (e.currentTarget.id) {
       case 'loan_contract_no':
         this.setData({
-          loan_contract_no: e.detail.value
+          loan_contract_no: value
         })
         break;
       case 'loan_months':
+        if (value.length && value <= 0) {
+          value = 1
+        } else if (value > 240) {
+          value = 240
+          this.showToast('月数不得大于240')
+        }
         this.setData({
-          loan_months: e.detail.value
+          loan_months: value
         })
         break;
       case 'sec_loan_contract_no':
         this.setData({
-          sec_loan_contract_no: e.detail.value
+          sec_loan_contract_no: value
         })
         break;
       case 'sec_loan_months':
+        if (value.length && value <= 0) {
+          value = 1
+        }else if (value>240){
+          value = 240
+          this.showToast('月数不得大于240')
+        }
         this.setData({
-          sec_loan_months: e.detail.value
+          sec_loan_months: value
         })
         break;
     }
@@ -1548,6 +1563,7 @@ Page({
       data = {
         commonbirthDate: this.data.commonbirthDate
       }
+
     } else if (idcard_belong == 'spouse_id_card_no_input') {
       this.data.loverbirthDate.selected = info.birthDay
       this.data.loverbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
@@ -1629,13 +1645,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 '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]
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @f2d9323
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @f2d9323
@@ -145,7 +145,7 @@
   </view>
   <view class='divide_line_30'></view>
-  <!-- <template is="picker_cell_normal" data="{{...older_relativeData}}" /> -->
+  <template is="picker_cell_normal" data="{{...older_relativeData}}" />
   <!-- <view style='height:90rpx;'>
     <text class='red_star_right_10'>*</text>
     <text class='text_777_30 float_left'>分摊比例</text>
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @f2d9323
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @f2d9323
@@ -31,7 +31,7 @@ Page({
       disabled: false,
       placeholder: '请选择关系',
       // values: ["子","女" ,"配偶", "父母", "祖父母、外祖父母"],
-      values: ["子", "女", "配偶", "父母"],
+      values: ["子", "女", "配偶", "父母","其他"],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {