wangyu / naturalPersonTax · 提交

提交 a189f246166bcccd1467c66217a6f74c4a714f34

作者 wangyu
1 个父辈 fe97b880
构建： 未知

新需求修改1.0

内嵌 并排对比
正在显示 3 个修改的文件 包含 85 行增加 和 30 行删除
@@ -100,37 +100,37 @@ Page({ @@ -100,37 +100,37 @@ Page({
100 placeholder: '请选择教育阶段', 100 placeholder: '请选择教育阶段',
101 onChange: 'onPickerSelect' 101 onChange: 'onPickerSelect'
102 }, 102 },
103 - edudegreeData: {  
104 - label: '教育阶段',  
105 - bindtype: 'edu_degree',  
106 - selected: '',  
107 - isblack: 'true',  
108 - values: ["小学", "初中", "高中", "大学"],  
109 - placeholder: '请选择教育阶段',  
110 - onChange: 'onPickerSelect'  
111 - }, 103 + // edudegreeData: {
  104 + // label: '教育阶段',
  105 + // bindtype: 'edu_degree',
  106 + // selected: '',
  107 + // isblack: 'true',
  108 + // values: ["专科", "本科", "硕士研究生", "博士研究生","其他"],
  109 + // placeholder: '请选择教育阶段',
  110 + // onChange: 'onPickerSelect'
  111 + // },
112 edutypeData: { 112 edutypeData: {
113 - label: '教育类型', 113 + label: '继续教育情况',
114 isrequre: true, 114 isrequre: true,
115 bindtype: 'edu_type', 115 bindtype: 'edu_type',
116 selected: '', 116 selected: '',
117 isblack: 'true', 117 isblack: 'true',
118 - values: ["学历教育", "非学历教育"],  
119 - placeholder: '请选择教育类型', 118 + values: ["学历继续教育", "非学历继续教育"],
  119 + placeholder: '请选择教育情况',
120 onChange: 'onPickerSelect' 120 onChange: 'onPickerSelect'
121 }, 121 },
122 edustyleData: { 122 edustyleData: {
123 - label: '教育类别', 123 + label: '继续教育类型',
124 isrequre: true, 124 isrequre: true,
125 bindtype: 'edu_style', 125 bindtype: 'edu_style',
126 selected: '', 126 selected: '',
127 isblack: 'true', 127 isblack: 'true',
128 - values: ["职业能力", "专业能力"],  
129 - placeholder: '请选择教育类别', 128 + values: ["技能人员职业资格", "专业技术人员职业资格"],
  129 + placeholder: '请选择教育类型',
130 onChange: 'onPickerSelect' 130 onChange: 'onPickerSelect'
131 }, 131 },
132 edulevelData: { 132 edulevelData: {
133 - label: '学历教育阶段', 133 + label: '教育阶段',
134 isrequre: true, 134 isrequre: true,
135 bindtype: 'edu_level', 135 bindtype: 'edu_level',
136 selected: '', 136 selected: '',
@@ -214,7 +214,7 @@ Page({ @@ -214,7 +214,7 @@ Page({
214 selected: '', 214 selected: '',
215 isblack: 'true', 215 isblack: 'true',
216 values: ["是", "否"], 216 values: ["是", "否"],
217 - placeholder: '请选择受教育日期', 217 + placeholder: '请选择时间',
218 onChange: 'onPickerSelect', 218 onChange: 'onPickerSelect',
219 mode: "date", 219 mode: "date",
220 fields: "day", 220 fields: "day",
@@ -228,7 +228,21 @@ Page({ @@ -228,7 +228,21 @@ Page({
228 selected: '', 228 selected: '',
229 isblack: 'true', 229 isblack: 'true',
230 values: ["是", "否"], 230 values: ["是", "否"],
231 - placeholder: '请选择受教育日期止', 231 + placeholder: '请选择时间',
  232 + onChange: 'onPickerSelect',
  233 + mode: "date",
  234 + fields: "day",
  235 + start: '1970-01-01',
  236 + datelong: 0,
  237 + },
  238 + applydate: {
  239 + label: '发证(批准)日期',
  240 + isrequre: true,
  241 + bindtype: 'apply_date',
  242 + selected: '',
  243 + isblack: 'true',
  244 + values: ["是", "否"],
  245 + placeholder: '请选择时间',
232 onChange: 'onPickerSelect', 246 onChange: 'onPickerSelect',
233 mode: "date", 247 mode: "date",
234 fields: "day", 248 fields: "day",
@@ -344,7 +358,7 @@ Page({ @@ -344,7 +358,7 @@ Page({
344 placeholder: '中国', 358 placeholder: '中国',
345 onChange: 'onPickerSelect', 359 onChange: 'onPickerSelect',
346 }, 360 },
347 - edu_lable: "", 361 + edu_lable: "school",
348 oldersupport_lable: "", 362 oldersupport_lable: "",
349 img_path: "/images/upload_img.png" 363 img_path: "/images/upload_img.png"
350 }, 364 },
@@ -457,6 +471,17 @@ Page({ @@ -457,6 +471,17 @@ Page({
457 // } 471 // }
458 this.setData(setData) 472 this.setData(setData)
459 break; 473 break;
  474 + case 'continuing_education':
  475 + var setData = {}
  476 +
  477 + var studystartdate = this.data.studystartdate
  478 + studystartdate.label = "入学时间起"
  479 + setData.studystartdate = studystartdate
  480 +
  481 + this.setData({
  482 + studystartdate: studystartdate
  483 + })
  484 + break;
460 case 'medical_fund': 485 case 'medical_fund':
461 var setData = {} 486 var setData = {}
462 if (data.name && data.name.length) { 487 if (data.name && data.name.length) {
@@ -662,7 +687,7 @@ Page({ @@ -662,7 +687,7 @@ Page({
662 case 'continuing_education': 687 case 'continuing_education':
663 subUrl = 'persontax/v1/continuing-educations' 688 subUrl = 'persontax/v1/continuing-educations'
664 if (this.data.edutypeData.selected.length < 1) { 689 if (this.data.edutypeData.selected.length < 1) {
665 - this.showToast('请选择教育类别') 690 + this.showToast('请选择教育情况')
666 return 691 return
667 } else if (this.data.edu_lable == 'school') { 692 } else if (this.data.edu_lable == 'school') {
668 // newdata.edu_type_lable = '0' 693 // newdata.edu_type_lable = '0'
@@ -671,11 +696,11 @@ Page({ @@ -671,11 +696,11 @@ Page({
671 return 696 return
672 } 697 }
673 if (this.data.studystartdate.selected.length < 1) { 698 if (this.data.studystartdate.selected.length < 1) {
674 - this.showToast('请选择受教育日期') 699 + this.showToast('请选择受入学日期')
675 return 700 return
676 } 701 }
677 if (this.data.studyenddate.selected.length < 1) { 702 if (this.data.studyenddate.selected.length < 1) {
678 - this.showToast('请选择受教育日期') 703 + this.showToast('请选择受预计毕业日期')
679 return 704 return
680 } 705 }
681 newdata.education_start = this.data.studystartdate.datelong 706 newdata.education_start = this.data.studystartdate.datelong
@@ -687,6 +712,10 @@ Page({ @@ -687,6 +712,10 @@ Page({
687 this.showToast('请选择教育类型') 712 this.showToast('请选择教育类型')
688 return 713 return
689 } 714 }
  715 + if (this.data.applydate.selected.length < 1) {
  716 + this.showToast('请选择发证日期')
  717 + return
  718 + }
690 if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) { 719 if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) {
691 this.showToast('请填写证书名称') 720 this.showToast('请填写证书名称')
692 return 721 return
@@ -701,7 +730,7 @@ Page({ @@ -701,7 +730,7 @@ Page({
701 } 730 }
702 //新增教育类型(区别教育类别) 731 //新增教育类型(区别教育类别)
703 // newdata.edu_type_lable = '1' 732 // newdata.edu_type_lable = '1'
704 - newdata.education_type = this.data.edustyleData.selected == '职业能力' ? 'profession' : 'major' 733 + newdata.education_type = this.data.edustyleData.selected == '技能人员职业资格' ? 'profession' : 'major'
705 } 734 }
706 break; 735 break;
707 case 'support_duty': 736 case 'support_duty':
@@ -971,13 +1000,13 @@ Page({ @@ -971,13 +1000,13 @@ Page({
971 childedudegreeData: childedudegreeData 1000 childedudegreeData: childedudegreeData
972 }) 1001 })
973 break; 1002 break;
974 - case 'edu_degree':  
975 - var edudegree_data = this.data.edudegreeData  
976 - edudegree_data.selected = edudegree_data.values[e.detail.value]  
977 - this.setData({  
978 - edudegreeData: edudegree_data  
979 - })  
980 - break; 1003 + // case 'edu_degree':
  1004 + // var edudegree_data = this.data.edudegreeData
  1005 + // edudegree_data.selected = edudegree_data.values[e.detail.value]
  1006 + // this.setData({
  1007 + // edudegreeData: edudegree_data
  1008 + // })
  1009 + // break;
981 case 'edu_country': 1010 case 'edu_country':
982 var eduCountry_data = this.data.eduCountryData 1011 var eduCountry_data = this.data.eduCountryData
983 eduCountry_data.selected = eduCountry_data.values[e.detail.value] 1012 eduCountry_data.selected = eduCountry_data.values[e.detail.value]
@@ -1044,6 +1073,15 @@ Page({ @@ -1044,6 +1073,15 @@ Page({
1044 edulevelData: edulevel_data 1073 edulevelData: edulevel_data
1045 }) 1074 })
1046 break; 1075 break;
  1076 + case 'apply_date':
  1077 + var apply_date = this.data.applydate
  1078 + apply_date.selected = e.detail.value
  1079 + console.log('apply_date', Date.parse(new Date(e.detail.value)))
  1080 + this.setData({
  1081 + applydate: apply_date
  1082 + })
  1083 + break;
  1084 + break;
1047 case 'cardtype': 1085 case 'cardtype':
1048 var cardtype_Data = this.data.cardtypeData 1086 var cardtype_Data = this.data.cardtypeData
1049 cardtype_Data.selected = cardtype_Data.values[e.detail.value] 1087 cardtype_Data.selected = cardtype_Data.values[e.detail.value]
@@ -91,6 +91,8 @@ @@ -91,6 +91,8 @@
91 <view wx:elif="{{edu_lable=='tech'}}"> 91 <view wx:elif="{{edu_lable=='tech'}}">
92 <template is="picker_cell_normal" data="{{...edustyleData}}" /> 92 <template is="picker_cell_normal" data="{{...edustyleData}}" />
93 <view class='divide_line_f5f5f5'></view> 93 <view class='divide_line_f5f5f5'></view>
  94 + <template is="picker_cell_normal" data="{{...applydate}}" />
  95 + <view class='divide_line_f5f5f5'></view>
94 <view style='height:90rpx'> 96 <view style='height:90rpx'>
95 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 97 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
96 <text class='text_black_30 float_left'>证书名称</text> 98 <text class='text_black_30 float_left'>证书名称</text>
@@ -55,6 +55,21 @@ @@ -55,6 +55,21 @@
55 <text class='text_right_333'>{{datas.education_end_new}}</text> 55 <text class='text_right_333'>{{datas.education_end_new}}</text>
56 </view> 56 </view>
57 <view style='height:90rpx;width:100%'> 57 <view style='height:90rpx;width:100%'>
  58 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  59 + <text class='text_left'>就读国家(地区)</text>
  60 + <text class='text_right_333'>中国</text>
  61 + </view>
  62 + <view style='height:90rpx;width:100%'>
  63 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  64 + <text class='text_left'>就读学校</text>
  65 + <text class='text_right_333'>北京八一小学</text>
  66 + </view>
  67 + <view style='height:90rpx;width:100%'>
  68 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  69 + <text class='text_left'>就读国家(地区)</text>
  70 + <text class='text_right_333'>{{datas.education_end_new}}</text>
  71 + </view>
  72 + <view style='height:90rpx;width:100%'>
58 <text class='text_left'>扣除方式</text> 73 <text class='text_left'>扣除方式</text>
59 <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text> 74 <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
60 </view> 75 </view>
请 注册 或 登录 后发表评论