wangyu / naturalPersonTax · 提交

提交 7bb55a118adc6ff6ec84e523b95bce39d0b0eb37

作者 pangy
2 个父辈 f854be17 4eb7bd0a
构建： 未知

Merge branch '机器人_py' into 机器人dev

内嵌 并排对比
正在显示 5 个修改的文件 包含 90 行增加 和 83 行删除
... ... @@ -232,11 +232,11 @@ Page({
232 232 },
233 233 cardtypeData: {
234 234 label: '证照类型',
235   - isrequre: true,
  235 + // isrequre: true,
236 236 bindtype: 'ownercardtype',
237 237 selected: '',
238 238 // disabled: true,
239   - isblack: 'true',
  239 + // isblack: 'true',
240 240 placeholder: '证照类型',
241 241 values: cardTypeArray,
242 242 //["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
... ... @@ -903,6 +903,12 @@ Page({
903 903 this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input')
904 904 }
905 905 }
  906 + var loverbirthDate = this.data.loverbirthDate
  907 + loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
  908 + loverbirthDate.datelong = data.spouse_birthday
  909 + setData.loverbirthDate = loverbirthDate
  910 + this.data.loverCountryData.selected = data.nation
  911 + setData.loverCountryData = this.data.loverCountryData
906 912 this.setData(setData)
907 913 break;
908 914 case 'continuing_education':
... ... @@ -1810,23 +1816,23 @@ Page({
1810 1816 this.showToast('请选择出租方类型')
1811 1817 return
1812 1818 } else if (!formdata.owner_name || formdata.owner_name.length < 1) {
1813   - this.showToast('请填写出租方名称')
1814   - return
  1819 + // this.showToast('请填写出租方名称')
  1820 + // return
1815 1821 }
1816 1822 if (this.data.leasetypeData.selected =='组织'){
1817 1823 if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
1818   - this.showToast('请填写统一社会信用代码')
1819   - return
  1824 + // this.showToast('请填写统一社会信用代码')
  1825 + // return
1820 1826 }
1821 1827 newdata.owner_id_card_no = ''
1822 1828 } else{
1823 1829 if (this.data.cardtypeData.selected.length < 1) {
1824   - this.showToast('请选择证照类型')
1825   - return
  1830 + // this.showToast('请选择证照类型')
  1831 + // return
1826 1832 }
1827 1833 if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
1828   - this.showToast('请填写证照号码')
1829   - return
  1834 + // this.showToast('请填写证照号码')
  1835 + // return
1830 1836 } else if (this.data.isIdCard_owner && !format.isIDCardNum(formdata.owner_id_card_no)) {
1831 1837 this.showToast('身份证格式有误')
1832 1838 return
... ... @@ -2288,7 +2294,7 @@ Page({
2288 2294 switch (witch) {
2289 2295 case 'childrencardtype':
2290 2296 that.data.countryData.values = countrys
2291   - setData.countryData = that.data.childrencardtypeData
  2297 + setData.countryData = that.data.countryData
2292 2298 break;
2293 2299 case 'lovercardtype':
2294 2300 that.data.loverCountryData.values = countrys
... ... @@ -2513,7 +2519,8 @@ Page({
2513 2519 this.showToast('请先完善子女生日信息')
2514 2520 return
2515 2521 } else{
2516   - var year = this.data.commonbirthDate.selected.substring(0, 4) - 3
  2522 + var year = this.data.commonbirthDate.selected.substring(0, 4)
  2523 + year = parseInt(year) + 3
2517 2524 var month = this.data.commonbirthDate.selected.substring(4, 7)
2518 2525 this.handleStartDate(year+month, true) //处理受教育时间起的逻辑
2519 2526 }
... ...
... ... @@ -291,22 +291,22 @@
291 291 <template is="picker_cell_normal" data="{{...leasetypeData}}" />
292 292 <view class='divide_line_30'></view>
293 293 <view style='height:90rpx'>
294   - <text class='red_star_right_10'>*</text>
295   - <text class='text_777_30 float_left'>出租方名称</text>
  294 + <!-- <text class='red_star_right_10'>*</text> -->
  295 + <text class='text_777_30 float_left head_in'>出租方名称</text>
296 296 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入出租方名称' name='owner_name' value='{{owner_name}}'></input>
297 297 </view>
298 298 <view class='divide_line_30' hidden="{{leasetypeData.selected == '个人'}}"></view>
299 299 <view style='height:90rpx' hidden="{{leasetypeData.selected == '个人'}}">
300   - <text class='red_star_right_10'>*</text>
301   - <text class='text_777_30 float_left'>统一社会信用代码</text>
  300 + <!-- <text class='red_star_right_10'>*</text> -->
  301 + <text class='text_777_30 float_left head_in'>统一社会信用代码</text>
302 302 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入统一社会信用代码' name='owner_credit_no' value='{{owner_credit_no}}'></input>
303 303 </view>
304 304 <view class='divide_line_30' hidden="{{leasetypeData.selected == '组织'}}"></view>
305 305 <template is="picker_cell_normal" data="{{...cardtypeData}}"/>
306 306 <view class='divide_line_30' hidden="{{leasetypeData.selected == '组织'}}"></view>
307 307 <view style='height:90rpx' hidden="{{leasetypeData.selected == '组织'}}">
308   - <text class='red_star_right_10'>*</text>
309   - <text class='text_777_30 float_left'>证照号码</text>
  308 + <!-- <text class='red_star_right_10'>*</text> -->
  309 + <text class='text_777_30 float_left head_in'>证照号码</text>
310 310 <view>
311 311 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no" hidden='{{!isIdCard_owner}}'></image>
312 312 <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18' type='idcard' name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" bindblur="idDone" id='owner_id_card_no_input'></input>
... ...
... ... @@ -55,17 +55,17 @@ Page({
55 55 values: ["否", "是"],
56 56 onChange: 'onPickerSelect'
57 57 },
58   - genderData: {
59   - label: '性别',
60   - bindtype: 'gender',
61   - isrequre: true,
62   - // disabled: true,
63   - selected: '',
64   - placeholder: '请选择性别',
65   - // placeholder: '性别',
66   - values: ["男", "女"],
67   - onChange: 'onPickerSelect'
68   - },
  58 + // genderData: {
  59 + // label: '性别',
  60 + // bindtype: 'gender',
  61 + // isrequre: true,
  62 + // // disabled: true,
  63 + // selected: '',
  64 + // placeholder: '请选择性别',
  65 + // // placeholder: '性别',
  66 + // values: ["男", "女"],
  67 + // onChange: 'onPickerSelect'
  68 + // },
69 69 countryData: {
70 70 label: '国籍',
71 71 bindtype: 'country',
... ... @@ -183,11 +183,11 @@ Page({
183 183 var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
184 184
185 185 this.data.relativeData.selected = tax_info.family_ties
186   - this.data.genderData.selected = tax_info.gender
  186 + // this.data.genderData.selected = tax_info.gender
187 187 this.data.countryData.selected = tax_info.native
188 188 if (isDisable){//否的话受证照类型控制
189 189 this.data.birthDate.disabled = true
190   - this.data.genderData.disabled = true
  190 + // this.data.genderData.disabled = true
191 191 }
192 192 this.data.forignerInfo.selected = tax_info.is_overseas_personnel
193 193 if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
... ... @@ -204,7 +204,7 @@ Page({
204 204 long_birth_date: tax_info.birth_date,
205 205 birthDate: this.data.birthDate,
206 206 mobile: tax_info.mobile,
207   - genderData: this.data.genderData,
  207 + // genderData: this.data.genderData,
208 208 isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
209 209 card_number: tax_info.id_card_no,
210 210 countryData: this.data.countryData,
... ... @@ -245,7 +245,7 @@ Page({
245 245 var cardtype_Data = that.data.cardtypeData
246 246 cardtype_Data.selected = '居民身份证'
247 247 // cardtypeData.selected_code = '1'
248   - var gender_Data = that.data.genderData
  248 + // var gender_Data = that.data.genderData
249 249 gender_Data.selected = id_info.gender
250 250
251 251 that.data.birthDate.selected = birth_day
... ... @@ -263,7 +263,7 @@ Page({
263 263 name: id_info.name,
264 264 birthday: birth_day,
265 265 cardtypeData: cardtype_Data,
266   - genderData: gender_Data,
  266 + // genderData: gender_Data,
267 267 long_birth_date: Date.parse(new Date(birth_day)) / 1000,
268 268 birthDate: that.data.birthDate,
269 269 card_number: id_info.id_card_number
... ... @@ -286,11 +286,11 @@ Page({
286 286
287 287 if ('居民身份证' == new_type) {
288 288 is_idcard = true
289   - this.data.genderData.disabled = true
  289 + // this.data.genderData.disabled = true
290 290 this.data.birthDate.disabled = true
291 291 } else {
292 292 is_idcard = false
293   - this.data.genderData.disabled = false
  293 + // this.data.genderData.disabled = false
294 294 this.data.birthDate.disabled = false
295 295 }
296 296 this.data.forignerInfo.selected = '是'
... ... @@ -313,7 +313,7 @@ Page({
313 313 this.setData({
314 314 isIdCard: is_idcard,
315 315 birthDate: this.data.birthDate,
316   - genderData: this.data.genderData,
  316 + // genderData: this.data.genderData,
317 317 countryData: this.data.countryData,
318 318 cardtypeData: this.data.cardtypeData,
319 319 forignerInfo: this.data.forignerInfo
... ... @@ -353,13 +353,13 @@ Page({
353 353 })
354 354 }
355 355 break;
356   - case 'gender':
357   - var gender_data = this.data.genderData
358   - gender_data.selected = gender_data.values[e.detail.value]
359   - this.setData({
360   - genderData: gender_data
361   - })
362   - break;
  356 + // case 'gender':
  357 + // var gender_data = this.data.genderData
  358 + // gender_data.selected = gender_data.values[e.detail.value]
  359 + // this.setData({
  360 + // genderData: gender_data
  361 + // })
  362 + // break;
363 363 case 'country':
364 364 var countryData = this.data.countryData
365 365 var new_country = countryData.values[e.detail.value]
... ... @@ -430,26 +430,26 @@ Page({
430 430 // this.showtoast('请输入正确姓名');
431 431 // return
432 432 }
433   - if (this.data.genderData.selected.length < 1) {
434   - this.showtoast('请选择性别');
435   - return
436   - }else {
437   - if (this.data.genderData.selected == '男') {
438   - if (rel == '女') {
439   - this.showtoast('关系和性别冲突');
440   - return
441   - }
442   - } else {
443   - if (rel == '子') {
444   - this.showtoast('关系和性别冲突');
445   - return
446   - }
447   - }
448   - if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
449   - this.showtoast('关系和性别冲突');
450   - return
451   - }
452   - }
  433 + // if (this.data.genderData.selected.length < 1) {
  434 + // this.showtoast('请选择性别');
  435 + // return
  436 + // }else {
  437 + // if (this.data.genderData.selected == '男') {
  438 + // if (rel == '女') {
  439 + // this.showtoast('关系和性别冲突');
  440 + // return
  441 + // }
  442 + // } else {
  443 + // if (rel == '子') {
  444 + // this.showtoast('关系和性别冲突');
  445 + // return
  446 + // }
  447 + // }
  448 + // if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
  449 + // this.showtoast('关系和性别冲突');
  450 + // return
  451 + // }
  452 + // }
453 453 // if (!formdata.age) {
454 454 // this.showtoast('请填写年龄');
455 455 // return
... ... @@ -501,7 +501,7 @@ Page({
501 501 "id_card_type": that.data.cardtypeData.selected,//_code,
502 502 "id_card_no": that.data.card_number,
503 503 "name": name,
504   - "gender": that.data.genderData.selected,
  504 + // "gender": that.data.genderData.selected,
505 505 "mobile": formdata.mobile,
506 506 // "age": formdata.age ? formdata.age : '',
507 507 "birth_date": that.data.long_birth_date,
... ... @@ -536,9 +536,9 @@ Page({
536 536 var name = this.data.name.length > 0 ? this.data.name : formdata.name;
537 537 var cardtype = this.data.cardtypeData.selected;
538 538 var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
539   - var gender = this.data.genderData.selected;
  539 + // var gender = this.data.genderData.selected;
540 540 var birth_day = this.data.birthDate.selected;
541   - if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
  541 + if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && birth_day == this.data.birthday) {//&& gender == iddata.gender
542 542 return 'active'
543 543 } else {
544 544 return ''
... ... @@ -565,13 +565,13 @@ Page({
565 565 birthDate: this.data.birthDate
566 566 })
567 567 }
568   - if (info.sex) {
569   - var gender_data = this.data.genderData
570   - gender_data.selected = info.sex
571   - this.setData({
572   - genderData: gender_data
573   - })
574   - }
  568 + // if (info.sex) {
  569 + // var gender_data = this.data.genderData
  570 + // gender_data.selected = info.sex
  571 + // this.setData({
  572 + // genderData: gender_data
  573 + // })
  574 + // }
575 575 },
576 576
577 577 idChange: function (e) {
... ...
... ... @@ -39,8 +39,8 @@
39 39 </view>
40 40 <view class="divide_line_30"></view>
41 41
42   - <template is="picker_cell_normal" data="{{...genderData}}" />
43   - <view class="divide_line_30"></view>
  42 + <!-- <template is="picker_cell_normal" data="{{...genderData}}" />
  43 + <view class="divide_line_30"></view> -->
44 44 <template is="picker_cell_normal" data="{{...birthDate}}" />
45 45 <!-- <view class='item_body'>
46 46 <text class='red_star_right_10'>*</text>
... ...
... ... @@ -85,7 +85,7 @@ Page({
85 85 isrequre: true,
86 86 label: '出生国家（地区）',
87 87 bindtype: 'brith_country',
88   - placeholder: '请选择国籍',
  88 + placeholder: '请选择出生国家（地区）',
89 89 onChange: 'onPickerSelect',
90 90 },
91 91 taxpayerTypeData: {
... ... @@ -1336,20 +1336,20 @@ Page({
1336 1336 data: {
1337 1337 'certification_status': that.getCertifyStatus(formdata),
1338 1338 "name": that.data.name,
1339   - "other_name": that.data.other_name,
  1339 + "other_name": that.data.hasOtherCard ? that.data.other_name : '',
1340 1340 "family_ties": '本人',//that.data.relativeData.selected,
1341 1341 "native": that.data.countryData.selected,
1342 1342 "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
1343 1343 "is_overseas_personnel": that.data.overseas,
1344   - 'birth_native': that.data.birthCountryData.selected,
  1344 + 'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
1345 1345 "id_card_type": that.data.cardtypeData.selected, //selected_code,
1346 1346 "id_card_no": that.data.card_number,
1347   - "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
1348   - "other_id_card_no": formdata.other_card_number,
  1347 + "other_id_card_type": that.data.hasOtherCard ? that.data.otherCardtypeData.selected : '', //selected_code,
  1348 + "other_id_card_no": that.data.hasOtherCard ? formdata.other_card_number : '',
1349 1349 "gender": that.data.genderData.selected,
1350 1350 "birth_date": that.data.long_birth_date,
1351   - "first_entry_date": that.data.firstEntryDate.datelong,
1352   - "predict_leave_date": that.data.predictLeaveDate.datelong,
  1351 + "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,
  1352 + "predict_leave_date": that.data.hasOtherCard ? that.data.predictLeaveDate.datelong : null,
1353 1353 "mobile": that.data.mobile,
1354 1354 "current_address": request_current_address,
1355 1355 "current_address_detail": formdata.current_address_detail,
... ...
请 注册 或 登录 后发表评论