wangyu / naturalPersonTax · 提交

提交 6384bb10dc63c593b231728b8659483fcf2c16bf

作者 pangy
2 个父辈 03183af4 3aad39df
构建： 未知

Merge branch 'dev_py' into dev2.0

内嵌 并排对比
正在显示 3 个修改的文件 包含 23 行增加 和 16 行删除
@@ -77,7 +77,7 @@ Page({ @@ -77,7 +77,7 @@ Page({
77 placeholder: '请选择出生日期', 77 placeholder: '请选择出生日期',
78 mode: "date", 78 mode: "date",
79 fields: "day", 79 fields: "day",
80 - start: '1949-01-01', 80 + start: '1970-01-01',
81 end: '2018-01-01', 81 end: '2018-01-01',
82 onChange: 'onPickerSelect', 82 onChange: 'onPickerSelect',
83 }, 83 },
@@ -406,7 +406,7 @@ Page({ @@ -406,7 +406,7 @@ Page({
406 onChange: 'onPickerSelect', 406 onChange: 'onPickerSelect',
407 mode: "date", 407 mode: "date",
408 fields: "day", 408 fields: "day",
409 - start: '2018-01-01', 409 + start: '1970-01-01',
410 datelong: 0, 410 datelong: 0,
411 }, 411 },
412 leasestartDate: { 412 leasestartDate: {
@@ -420,7 +420,7 @@ Page({ @@ -420,7 +420,7 @@ Page({
420 onChange: 'onPickerSelect', 420 onChange: 'onPickerSelect',
421 mode: "date", 421 mode: "date",
422 fields: "day", 422 fields: "day",
423 - start: '2000-01-01', 423 + start: '1970-01-01',
424 datelong: 0, 424 datelong: 0,
425 }, 425 },
426 leaseendDate: { 426 leaseendDate: {
@@ -434,7 +434,7 @@ Page({ @@ -434,7 +434,7 @@ Page({
434 onChange: 'onPickerSelect', 434 onChange: 'onPickerSelect',
435 mode: "date", 435 mode: "date",
436 fields: "day", 436 fields: "day",
437 - start: '2000-01-01', 437 + start: '1970-01-01',
438 datelong: 0, 438 datelong: 0,
439 }, 439 },
440 loandatelongData: { 440 loandatelongData: {
@@ -758,9 +758,9 @@ Page({ @@ -758,9 +758,9 @@ Page({
758 olderbirthDate.datelong = data.birth_date 758 olderbirthDate.datelong = data.birth_date
759 setData.olderbirthDate = olderbirthDate 759 setData.olderbirthDate = olderbirthDate
760 } 760 }
761 - if (data.relationship && data.relationship.length) { 761 + if (data.family_ties && data.family_ties.length) {
762 var older_relativeData = this.data.older_relativeData 762 var older_relativeData = this.data.older_relativeData
763 - older_relativeData.selected = data.relationship 763 + older_relativeData.selected = data.family_ties
764 setData.older_relativeData = older_relativeData 764 setData.older_relativeData = older_relativeData
765 } 765 }
766 this.setData(setData) 766 this.setData(setData)
@@ -1161,20 +1161,20 @@ Page({ @@ -1161,20 +1161,20 @@ Page({
1161 // newdata.share_method = this.data.shareMethodData.selected 1161 // newdata.share_method = this.data.shareMethodData.selected
1162 // } 1162 // }
1163 if (!formdata.supported_name || formdata.supported_name.length < 1) { 1163 if (!formdata.supported_name || formdata.supported_name.length < 1) {
1164 - this.showToast('请填写赡养人姓名') 1164 + this.showToast('请填写被赡养人姓名')
1165 return 1165 return
1166 } else if (this.data.oldercardtypeData.selected.length < 1) { 1166 } else if (this.data.oldercardtypeData.selected.length < 1) {
1167 - this.showToast('请选择赡养人证照类型') 1167 + this.showToast('请选择被赡养人证照类型')
1168 return 1168 return
1169 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) { 1169 } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
1170 - this.showToast('请填写赡养人证照号') 1170 + this.showToast('请填写被赡养人证照号')
1171 return 1171 return
1172 } else if (!format.isIDCardNum(formdata.id_card_no)) { 1172 } else if (!format.isIDCardNum(formdata.id_card_no)) {
1173 - this.showToast('赡养人身份证格式有误') 1173 + this.showToast('被赡养人身份证格式有误')
1174 return 1174 return
1175 } 1175 }
1176 if (this.data.olderbirthDate.selected.length < 1) { 1176 if (this.data.olderbirthDate.selected.length < 1) {
1177 - this.showToast('请选择赡养人出生日期') 1177 + this.showToast('请选择被赡养人出生日期')
1178 return 1178 return
1179 } 1179 }
1180 if (this.data.older_relativeData.selected.length < 1) { 1180 if (this.data.older_relativeData.selected.length < 1) {
@@ -237,7 +237,12 @@ Page({ @@ -237,7 +237,12 @@ Page({
237 mobile: e.detail.value 237 mobile: e.detail.value
238 }) 238 })
239 }, 239 },
240 - 240 + nameInput: function (e) {
  241 + console.log('bindinputname', e)
  242 + this.setData({
  243 + name: e.detail.value
  244 + })
  245 + },
241 // =============其他数据选中处理============== 246 // =============其他数据选中处理==============
242 247
243 getIdInfo: function(e) { 248 getIdInfo: function(e) {
@@ -269,10 +274,11 @@ Page({ @@ -269,10 +274,11 @@ Page({
269 this.showtoast('证照号码有误'); 274 this.showtoast('证照号码有误');
270 return 275 return
271 } 276 }
272 - if (formdata.name.length < 1) { 277 + var name = formdata.person_name.length ? formdata.person_name : this.data.name
  278 + if (name.length < 1 ) {
273 this.showtoast('姓名未填写'); 279 this.showtoast('姓名未填写');
274 return 280 return
275 - } else if (!regname.test(formdata.name)) { 281 + } else if (!regname.test(name)) {
276 this.showtoast('请输入正确姓名'); 282 this.showtoast('请输入正确姓名');
277 return 283 return
278 } 284 }
@@ -302,6 +308,7 @@ Page({ @@ -302,6 +308,7 @@ Page({
302 goCommit: function(data) { 308 goCommit: function(data) {
303 var that = this 309 var that = this
304 var formdata = data 310 var formdata = data
  311 + var name = formdata.person_name.length ? formdata.person_name : this.data.name
305 console.log("form_data", formdata); 312 console.log("form_data", formdata);
306 var Authorization = app.globalData.Authorization; 313 var Authorization = app.globalData.Authorization;
307 var url = baseUrl + 'persontax/v1/personal-taxes', method = "POST" 314 var url = baseUrl + 'persontax/v1/personal-taxes', method = "POST"
@@ -320,7 +327,7 @@ Page({ @@ -320,7 +327,7 @@ Page({
320 "family_ties": that.data.relativeData.selected, 327 "family_ties": that.data.relativeData.selected,
321 "id_card_type": '居民身份证',//that.data.cardtypeData.selected, 328 "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
322 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number, 329 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
323 - "name": formdata.name, 330 + "name": name,
324 "gender": that.data.genderData.selected, 331 "gender": that.data.genderData.selected,
325 "mobile": formdata.mobile, 332 "mobile": formdata.mobile,
326 //"age": formdata.age ? formdata.age : '',//不传 333 //"age": formdata.age ? formdata.age : '',//不传
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <view class='item_body'> 35 <view class='item_body'>
36 <text class='red_star_right_10'>*</text> 36 <text class='red_star_right_10'>*</text>
37 <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text> 37 <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
38 - <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}'></input> 38 + <input class='input_wrap float_right' placeholder='请填写姓名' name='person_name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}' bindinput='nameInput'></input>
39 </view> 39 </view>
40 <view class="divide_line_30"></view> 40 <view class="divide_line_30"></view>
41 41
请 注册 或 登录 后发表评论