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
查看文件 @bab549f
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @bab549f
@@ -183,6 +183,14 @@ Page({
       placeholder: '请选择教育类型',
       onChange: 'onPickerSelect'
     },
+    certificateDate: {
+      label: '证书名称',
+      isrequre: true,
+      bindtype: 'certificate',
+      values: [],
+      placeholder: '请输入证书名称',
+      onChange: 'onPickerSelect'
+    },
     edulevelData: {
       label: '教育阶段',
       isrequre: true,
@@ -535,6 +543,7 @@ Page({
         this.getTaxList()
       }
     } else if ("continuing_education" == options.status) {
+      this.getCertificates()
       var studystart_date = this.data.studystartdate
       studystart_date.label = "入学时间起"
       var studyend_date = this.data.studyenddate
@@ -778,7 +787,9 @@ Page({
             setData.applydate = applydate
             if (data.certification_name && data.certification_name.length) {
-              setData.certification_name = data.certification_name
+              var certificateDate = this.data.certificateDate
+              certificateDate.selected = data.certification_name
+              setData.certificateDate = certificateDate
             }
             if (data.certification_no && data.certification_no.length) {
               setData.certification_no = data.certification_no
@@ -1072,7 +1083,9 @@ Page({
           setData.applydate = applydate
         }
         if (data.certification_name && data.certification_name.length) {
-          setData.certification_name = data.certification_name
+          var certificateDate = this.data.certificateDate
+          certificateDate.selected = data.certification_name
+          setData.certificateDate = certificateDate
         }
         if (data.certification_no && data.certification_no.length) {
           setData.certification_no = data.certification_no
@@ -1350,7 +1363,29 @@ Page({
       }
     })
   },
-
+  getCertificates: function () {
+    var that = this
+    var Authorization = app.globalData.Authorization;
+    var bank_info = that.data.bankInfo
+    wx.request({
+      url: baseUrl + 'persontax/v1/certification-list' ,
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log('certification', res)
+        that.profs_cers = res.data.profession_certificates
+        that.major_cers = res.data.major_certificates
+      },
+      fail(res) {
+        console.log(res)
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
+  },
   handleBankinfo: function(data) {
     var bank_name = []
     for (var i = 0; i < data.length; i++) {
@@ -1497,10 +1532,14 @@ Page({
               return
             }
           }
-          if (!formdata.certification_name || formdata.certification_name.length < 1) {
-            this.showToast('请填写证书名称')
+          // if (!formdata.certification_name || formdata.certification_name.length < 1) {
+          //   this.showToast('请填写证书名称')
+          //   return
+          // }
+          if (this.data.certificateDate.selected.length < 1) {
+            this.showToast('请选择证书名称')
             return
-          }
+          } 
           if (!formdata.certification_no || formdata.certification_no.length < 1) {
             this.showToast('请填写证书编号')
             return
@@ -1513,6 +1552,7 @@ Page({
           // newdata.edu_type_lable = '1'
           newdata.approval_date = this.data.applydate.datelong
           newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major'
+          newdata.certification_name = this.data.certificateDate.selected
         }
         break;
       case 'support_duty':
@@ -2180,8 +2220,19 @@ Page({
       case 'edu_style':
         var edustyle_data = this.data.edustyleData
         edustyle_data.selected = edustyle_data.values[e.detail.value]
+        var certificateDate = this.data.certificateDate
+        certificateDate.values = e.detail.value == '0' ? this.profs_cers : this.major_cers
+        certificateDate.selected = ''
+        this.setData({
+          edustyleData: edustyle_data,
+          certificateDate: certificateDate
+        })
+        break;
+      case 'certificate':
+        var certificateDate = this.data.certificateDate
+        certificateDate.selected = certificateDate.values[e.detail.value]
         this.setData({
-          edustyleData: edustyle_data
+          certificateDate: certificateDate
         })
         break;
       case 'edu_level':
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @bab549f
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @bab549f
@@ -94,11 +94,12 @@
     <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...applydate}}" />
     <view class='divide_line_30'></view>
-    <view style='height:90rpx'>
+    <template is="picker_cell_normal" data="{{...certificateDate}}" />
+    <!-- <view style='height:90rpx'>
       <text class='red_star_right_10'>*</text>
       <text class='text_777_30 float_left'>证书名称</text>
       <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证书名称' name='certification_name' value='{{certification_name}}'></input>
-    </view>
+    </view> -->
     <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='red_star_right_10'>*</text>