wangyu / naturalPersonTax · 提交

提交 702b9d4f656d613079f0c648a8aa42fca7d582f4

作者 wangyu
1 个父辈 8bbeca1e

优化

内嵌 并排对比
正在显示 5 个修改的文件 包含 25 行增加 和 11 行删除

2.2 KB | 宽: | 高:

2.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
@@ -377,7 +377,7 @@ Page({ @@ -377,7 +377,7 @@ Page({
377 that.showtoast("姓名冲突") 377 that.showtoast("姓名冲突")
378 return 378 return
379 } 379 }
380 - if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) { 380 + if (that.data.card_number.length > 0 && id_info.id_card_number != that.data.card_number) {
381 that.showtoast("证照号码冲突") 381 that.showtoast("证照号码冲突")
382 return 382 return
383 } 383 }
@@ -284,6 +284,10 @@ Page({ @@ -284,6 +284,10 @@ Page({
284 this.data.relativeData.disabled = false 284 this.data.relativeData.disabled = false
285 this.data.relativeData.selected = tax_info.family_ties 285 this.data.relativeData.selected = tax_info.family_ties
286 } 286 }
  287 + if (tax_info.real_auth_status == 'active') {
  288 + this.data.genderData.disabled = true
  289 + this.data.birthDate.disabled = true
  290 + }
287 291
288 this.data.personstatusData.selected = tax_info.taxpayer_status 292 this.data.personstatusData.selected = tax_info.taxpayer_status
289 293
@@ -493,8 +497,17 @@ Page({ @@ -493,8 +497,17 @@ Page({
493 console.log('id_info', res.data) 497 console.log('id_info', res.data)
494 if (res.data && res.data.length > 0) { 498 if (res.data && res.data.length > 0) {
495 var id_info = JSON.parse(res.data) 499 var id_info = JSON.parse(res.data)
496 -  
497 - var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day; 500 + var birth_day
  501 + if (id_info.birthday.month > 9 && id_info.birthday.day>9){
  502 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  503 + } else if(id_info.birthday.month > 9 && id_info.birthday.day<10){
  504 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
  505 + } else if (id_info.birthday.month < 9 && id_info.birthday.day > 10) {
  506 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  507 + } else if (id_info.birthday.month < 9 && id_info.birthday.day < 10) {
  508 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  509 + }
  510 +
498 var cardtype_Data = that.data.cardtypeData 511 var cardtype_Data = that.data.cardtypeData
499 cardtype_Data.selected = '居民身份证' 512 cardtype_Data.selected = '居民身份证'
500 var gender_Data = that.data.genderData 513 var gender_Data = that.data.genderData
@@ -508,7 +521,7 @@ Page({ @@ -508,7 +521,7 @@ Page({
508 id_error = true 521 id_error = true
509 return 522 return
510 } 523 }
511 - if (that.data.card_number.length > 0 && id_info.card_number != that.data.card_number) { 524 + if (that.data.card_number.length > 0 && id_info.id_card_number != that.data.card_number) {
512 that.showtoast("证照号码冲突") 525 that.showtoast("证照号码冲突")
513 id_error = true 526 id_error = true
514 return 527 return
@@ -518,6 +531,7 @@ Page({ @@ -518,6 +531,7 @@ Page({
518 birthday: birth_day, 531 birthday: birth_day,
519 cardtypeData: cardtype_Data, 532 cardtypeData: cardtype_Data,
520 genderData: gender_Data, 533 genderData: gender_Data,
  534 + long_birth_date: Date.parse(new Date(birth_day)) / 1000,
521 birthDate: that.data.birthDate, 535 birthDate: that.data.birthDate,
522 card_number: id_info.id_card_number 536 card_number: id_info.id_card_number
523 }) 537 })
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <view class='item_body'> 13 <view class='item_body'>
14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
15 <text class='text_black_28 float_left'>姓名</text> 15 <text class='text_black_28 float_left'>姓名</text>
16 - <input class='input_wrap float_right' placeholder='请填写姓名' name='name' disabled='{{isself}}' value='{{name}}'></input> 16 + <input class='input_wrap float_right' placeholder='请填写姓名' name='name' disabled="{{taxInfo.real_auth_status=='active'}}" value='{{name}}'></input>
17 </view> 17 </view>
18 <view class="divide_line"></view> 18 <view class="divide_line"></view>
19 <!-- <view class='item_body' bindtap='openpicker'> 19 <!-- <view class='item_body' bindtap='openpicker'>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <view class='item_body' hidden="{{!isself}}"> 46 <view class='item_body' hidden="{{!isself}}">
47 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 47 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
48 <text class='text_black_28 float_left'>姓名</text> 48 <text class='text_black_28 float_left'>姓名</text>
49 - <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{name?name:'请填写姓名'}}" disabled='true' ></input> 49 + <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{name?name:'请填写姓名'}}" disabled="{{taxInfo.real_auth_status=='active'}}" ></input>
50 </view> 50 </view>
51 <view class="divide_line"></view> 51 <view class="divide_line"></view>
52 52
@@ -81,10 +81,10 @@ @@ -81,10 +81,10 @@
81 <view wx:if="{{isIdCard}}" > 81 <view wx:if="{{isIdCard}}" >
82 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image> 82 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
83 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> --> 83 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
84 - <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input> 84 + <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input>
85 </view> 85 </view>
86 <view wx:else> 86 <view wx:else>
87 - <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input> 87 + <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input>
88 </view> 88 </view>
89 </view> 89 </view>
90 <view class="divide_line"></view> 90 <view class="divide_line"></view>
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 <view class='item_body'> 190 <view class='item_body'>
191 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 191 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
192 <text class='text_black_28 float_left'>联系电话</text> 192 <text class='text_black_28 float_left'>联系电话</text>
193 - <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='true' maxlength='11'></input> 193 + <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='{{isself}}' maxlength='11'></input>
194 </view> 194 </view>
195 <!-- 非必填部分02 --> 195 <!-- 非必填部分02 -->
196 <view hidden='{{!isshow02}}'> 196 <view hidden='{{!isshow02}}'>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <text class='text_999_22'>{{item.id_card_no}}</text> 18 <text class='text_999_22'>{{item.id_card_no}}</text>
19 </view> 19 </view>
20 </view> --> 20 </view> -->
21 - <view class='rectangle_solid_blue_bg'> 21 + <view class='rectangle_solid_blue_bg' bindtap='goedit' id='{{item.id}}'>
22 <view style='padding:11px 15px'> 22 <view style='padding:11px 15px'>
23 <text class='text_white_32'>{{item.name}}</text> 23 <text class='text_white_32'>{{item.name}}</text>
24 <text class='text_gray_bg text_blue_20' hidden="{{item.family_ties?false:true}}">{{item.family_ties}}</text> 24 <text class='text_gray_bg text_blue_20' hidden="{{item.family_ties?false:true}}">{{item.family_ties}}</text>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码 "}}</text> 31 <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码 "}}</text>
32 </view> 32 </view>
33 </view> 33 </view>
34 - <view class='rectangle_solid_bg' bindtap='goedit' id='{{item.id}}'> 34 + <view class='rectangle_solid_bg' >
35 <view style='padding: 0 15px '> 35 <view style='padding: 0 15px '>
36 <image class='arrow_wrap' src='/images/arrow_right.png'> </image> 36 <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
37 <text class='text_999_28' >{{text_tip}}</text> 37 <text class='text_999_28' >{{text_tip}}</text>
请 注册 或 登录 后发表评论