新需求修改1.0

wangyu
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @a189f24
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @a189f24
@@ -100,37 +100,37 @@ Page({
       placeholder: '请选择教育阶段',
       onChange: 'onPickerSelect'
     },
-    edudegreeData: {
-      label: '教育阶段',
-      bindtype: 'edu_degree',
-      selected: '',
-      isblack: 'true',
-      values: ["小学", "初中", "高中", "大学"],
-      placeholder: '请选择教育阶段',
-      onChange: 'onPickerSelect'
-    },
+    // edudegreeData: {
+    //   label: '教育阶段',
+    //   bindtype: 'edu_degree',
+    //   selected: '',
+    //   isblack: 'true',
+    //   values: ["专科", "本科", "硕士研究生", "博士研究生","其他"],
+    //   placeholder: '请选择教育阶段',
+    //   onChange: 'onPickerSelect'
+    // },
     edutypeData: {
-      label: '教育类型',
+      label: '继续教育情况',
       isrequre: true,
       bindtype: 'edu_type',
       selected: '',
       isblack: 'true',
-      values: ["学历教育", "非学历教育"],
-      placeholder: '请选择教育类型',
+      values: ["学历继续教育", "非学历继续教育"],
+      placeholder: '请选择教育情况',
       onChange: 'onPickerSelect'
     },
     edustyleData: {
-      label: '教育类别',
+      label: '继续教育类型',
       isrequre: true,
       bindtype: 'edu_style',
       selected: '',
       isblack: 'true',
-      values: ["职业能力", "专业能力"],
-      placeholder: '请选择教育类别',
+      values: ["技能人员职业资格", "专业技术人员职业资格"],
+      placeholder: '请选择教育类型',
       onChange: 'onPickerSelect'
     },
     edulevelData: {
-      label: '学历教育阶段',
+      label: '教育阶段',
       isrequre: true,
       bindtype: 'edu_level',
       selected: '',
@@ -214,7 +214,7 @@ Page({
       selected: '',
       isblack: 'true',
       values: ["是", "否"],
-      placeholder: '请选择受教育日期',
+      placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
@@ -228,7 +228,21 @@ Page({
       selected: '',
       isblack: 'true',
       values: ["是", "否"],
-      placeholder: '请选择受教育日期止',
+      placeholder: '请选择时间',
+      onChange: 'onPickerSelect',
+      mode: "date",
+      fields: "day",
+      start: '1970-01-01',
+      datelong: 0,
+    },
+    applydate: {
+      label: '发证(批准)日期',
+      isrequre: true,
+      bindtype: 'apply_date',
+      selected: '',
+      isblack: 'true',
+      values: ["是", "否"],
+      placeholder: '请选择时间',
       onChange: 'onPickerSelect',
       mode: "date",
       fields: "day",
@@ -344,7 +358,7 @@ Page({
       placeholder: '中国',
       onChange: 'onPickerSelect',
     },
-    edu_lable: "",
+    edu_lable: "school",
     oldersupport_lable: "",
     img_path: "/images/upload_img.png"
   },
@@ -457,6 +471,17 @@ Page({
         // }
         this.setData(setData)
       break;
+      case 'continuing_education':
+        var setData = {}
+
+        var studystartdate = this.data.studystartdate
+        studystartdate.label = "入学时间起"
+        setData.studystartdate = studystartdate
+
+        this.setData({
+          studystartdate: studystartdate
+        })
+      break;
       case 'medical_fund':
         var setData = {}
         if (data.name && data.name.length) {
@@ -662,7 +687,7 @@ Page({
       case 'continuing_education':
         subUrl = 'persontax/v1/continuing-educations'
         if (this.data.edutypeData.selected.length < 1) {
-          this.showToast('请选择教育类别')
+          this.showToast('请选择教育情况')
           return
         } else if (this.data.edu_lable == 'school') {
           // newdata.edu_type_lable = '0'
@@ -671,11 +696,11 @@ Page({
             return
           }
           if (this.data.studystartdate.selected.length < 1) {
-            this.showToast('请选择受教育日期')
+            this.showToast('请选择受入学日期')
             return
           }
           if (this.data.studyenddate.selected.length < 1) {
-            this.showToast('请选择受教育日期')
+            this.showToast('请选择受预计毕业日期')
             return
           }
           newdata.education_start = this.data.studystartdate.datelong
@@ -687,6 +712,10 @@ Page({
             this.showToast('请选择教育类型')
             return
           }
+          if (this.data.applydate.selected.length < 1) {
+            this.showToast('请选择发证日期')
+            return
+          }
           if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) {
             this.showToast('请填写证书名称')
             return
@@ -701,7 +730,7 @@ Page({
           }
           //新增教育类型(区别教育类别)
           // newdata.edu_type_lable = '1'
-          newdata.education_type = this.data.edustyleData.selected == '职业能力' ? 'profession' : 'major'
+          newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major'
         }
         break;
       case 'support_duty':
@@ -971,13 +1000,13 @@ Page({
           childedudegreeData: childedudegreeData
         })
         break;
-      case 'edu_degree':
-        var edudegree_data = this.data.edudegreeData
-        edudegree_data.selected = edudegree_data.values[e.detail.value]
-        this.setData({
-          edudegreeData: edudegree_data
-        })
-        break;
+      // case 'edu_degree':
+      //   var edudegree_data = this.data.edudegreeData
+      //   edudegree_data.selected = edudegree_data.values[e.detail.value]
+      //   this.setData({
+      //     edudegreeData: edudegree_data
+      //   })
+      //   break;
       case 'edu_country':
         var eduCountry_data = this.data.eduCountryData
         eduCountry_data.selected = eduCountry_data.values[e.detail.value]
@@ -1044,6 +1073,15 @@ Page({
           edulevelData: edulevel_data
         })
         break;
+      case 'apply_date':
+        var apply_date = this.data.applydate
+        apply_date.selected = e.detail.value
+        console.log('apply_date', Date.parse(new Date(e.detail.value)))
+        this.setData({
+          applydate: apply_date
+        })
+        break;
+        break;
       case 'cardtype':
         var cardtype_Data = this.data.cardtypeData
         cardtype_Data.selected = cardtype_Data.values[e.detail.value]
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @a189f24
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @a189f24
@@ -91,6 +91,8 @@
       <view wx:elif="{{edu_lable=='tech'}}">
         <template is="picker_cell_normal" data="{{...edustyleData}}" />
         <view class='divide_line_f5f5f5'></view>
+        <template is="picker_cell_normal" data="{{...applydate}}" />
+        <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>
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @a189f24
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @a189f24
@@ -55,6 +55,21 @@
       <text class='text_right_333'>{{datas.education_end_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
+      <text class='text_left'>就读国家(地区)</text>
+      <text class='text_right_333'>中国</text>
+    </view>
+    <view style='height:90rpx;width:100%'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
+      <text class='text_left'>就读学校</text>
+      <text class='text_right_333'>北京八一小学</text>
+    </view>
+    <view style='height:90rpx;width:100%'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
+      <text class='text_left'>就读国家(地区)</text>
+      <text class='text_right_333'>{{datas.education_end_new}}</text>
+    </view>
+    <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
       <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
     </view>