wangyu / naturalPersonTax · 提交

提交 4dae7dcb5be4f4fe73a68fb02afa94cb28237e48

作者 wangyu
1 个父辈 bd9b6e38

优化

内嵌 并排对比
正在显示 7 个修改的文件 包含 171 行增加 和 124 行删除
... ... @@ -62,7 +62,6 @@ App({
62 62 if (relaunch) {
63 63 wx.reLaunch({ //重新加载
64 64 url: '../home/home'
65   - // url: '../../getPhone/getPhone'
66 65 })
67 66 }
68 67 }
... ...
... ... @@ -36,7 +36,7 @@ Page({
36 36 bindtype: 'personstatus',
37 37 selected: '',
38 38 placeholder: '请选择纳税人状态',
39   - values: ["正常(在职)", "非正常"],
  39 + values: ["正常", "非正常"],
40 40 onChange: 'onPickerSelect'
41 41 },
42 42 cardtypeData: {
... ... @@ -349,7 +349,7 @@ Page({
349 349 key: 'id_info',
350 350 success: function(res) {
351 351 console.log('id_info', res.data)
352   - if (res.data && res.data.id_card_number) {
  352 + if (res.data && res.data.length>0) {
353 353 var id_info = JSON.parse(res.data)
354 354
355 355 var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
... ... @@ -357,13 +357,27 @@ Page({
357 357 cardtype_Data.selected = '居民身份证'
358 358 var gender_Data = that.data.genderData
359 359 gender_Data.selected = id_info.gender
  360 +
  361 + that.data.birthDate.selected = birth_day
  362 +
  363 + if (that.data.name.length > 0 && id_info.name != that.data.name){
  364 + that.showtoast("证照与所填姓名冲突")
  365 + return
  366 + }
  367 + if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
  368 + that.showtoast("证照与所填证照号码冲突")
  369 + return
  370 + }
360 371 that.setData({
361 372 name: id_info.name,
362 373 birthday: birth_day,
363 374 cardtypeData: cardtype_Data,
364 375 genderData: gender_Data,
  376 + birthDate: that.data.birthDate,
365 377 card_number: id_info.id_card_number
366 378 })
  379 + console.log('-cardtypeData--', that.data.cardtypeData)
  380 +
367 381 }
368 382 },
369 383 })
... ...
... ... @@ -30,7 +30,8 @@
30 30 <!-- 基本信息 -->
31 31 <view class='head_wrap' bindtap='span' id='1'>
32 32 <text class='head_text_wrap1'>基本信息</text>
33   - <text class='head_text_wrap2'>（点击收起非必填选项）</text>
  33 + <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
  34 + <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
34 35 <view style='float:right' wx:if='{{isshow01}}'>
35 36 <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
36 37 </view>
... ... @@ -52,7 +53,7 @@
52 53 <view class='item_body'>
53 54 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
54 55 <text class='text_black_28 float_left'>国籍（地区）</text>
55   - <input class='input_wrap float_right' value='中国'></input>
  56 + <text class='text_999_28 float_right' >中国</text>
56 57 </view>
57 58 <view class="divide_line"></view>
58 59
... ... @@ -82,7 +83,7 @@
82 83 <text class='text_333_28 float_right'>{{card_number}}</text>
83 84 </view>
84 85 <view wx:else>
85   - <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no'></input>
  86 + <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no' maxlength='24'></input>
86 87 </view>
87 88 </view>
88 89 <view class="divide_line"></view>
... ... @@ -128,7 +129,7 @@
128 129 <view class="divide_line"></view>
129 130 <view class='item_body'>
130 131 <text class='text_666_28 float_left'>纳税人识别号</text>
131   - <input class='input_wrap float_right' name='taxpayer_no' type='number' placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
  132 + <input class='input_wrap float_right' name='taxpayer_no' type='number' placeholder-class='text_999_28' placeholder='请输入纳税人识别号' maxlength='24'></input>
132 133 </view>
133 134 <view class="divide_line"></view>
134 135 <!-- <view class='item_body'>
... ... @@ -137,10 +138,10 @@
137 138 <text class='text_333_28 float_right'></text>
138 139 </view> -->
139 140 <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
140   - <view class="divide_line"></view>
141   - <view class='item_body'>
  141 + <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
  142 + <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
142 143 <text class='text_666_28 float_left'>残疾证号</text>
143   - <input class='input_wrap float_right' name='disability_no' type='number' placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
  144 + <input class='input_wrap float_right' name='disability_no' type='number' placeholder-class='text_999_28' placeholder='请输入残疾证号' maxlength='24'></input>
144 145 </view>
145 146 <view class="divide_line"></view>
146 147 <!-- <view class='item_body'>
... ... @@ -149,10 +150,10 @@
149 150 <text class='text_333_28 float_right'></text>
150 151 </view> -->
151 152 <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
152   - <view class="divide_line"></view>
153   - <view class='item_body'>
  153 + <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
  154 + <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
154 155 <text class='text_666_28 float_left'>烈属证号</text>
155   - <input class='input_wrap float_right' name='martyr_family_no' type='number' placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
  156 + <input class='input_wrap float_right' name='martyr_family_no' type='number' placeholder-class='text_999_28' placeholder='请输入烈属证号' maxlength='24'></input>
156 157 </view>
157 158 <view class="divide_line"></view>
158 159 <!-- <view class='item_body'>
... ... @@ -161,6 +162,11 @@
161 162 <text class='text_333_28 float_right'></text>
162 163 </view> -->
163 164 <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
  165 + <view class="divide_line"></view>
  166 + <view class='item_body'>
  167 + <text class='text_666_28 float_left'>备注</text>
  168 + <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注' ></input>
  169 + </view>
164 170 </view>
165 171 </view>
166 172 </view>
... ... @@ -168,7 +174,8 @@
168 174 <!-- 联系方式 -->
169 175 <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='2'>
170 176 <text class='head_text_wrap1'>联系方式</text>
171   - <text class='head_text_wrap2'>（点击收起非必填选项）</text>
  177 + <text class='head_text_wrap2' hidden='{{!isshow02}}'>（点击收起非必填选项）</text>
  178 + <text class='head_text_wrap2' hidden='{{isshow02}}'>（点击展开非必填选项）</text>
172 179 <view style='float:right' wx:if='{{isshow02}}'>
173 180 <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
174 181 </view>
... ... @@ -182,7 +189,7 @@
182 189 <view class='item_body'>
183 190 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
184 191 <text class='text_black_28 float_left'>联系电话</text>
185   - <input class='input_wrap float_right' placeholder='请填写电话' value='{{taxInfo.mobile}}' name='mobile' type='number' placeholder-class='text_999_28'></input>
  192 + <input class='input_wrap float_right' placeholder='请输入手机号' value='{{taxInfo.mobile}}' name='mobile' type='number' placeholder-class='text_999_28' maxlength='11'></input>
186 193 </view>
187 194 <!-- 非必填部分02 -->
188 195 <view hidden='{{!isshow02}}'>
... ... @@ -208,7 +215,7 @@
208 215 <view class="divide_line"></view>
209 216 <view class='item_body'>
210 217 <text class='text_666_28 float_left'>银行账号</text>
211   - <input class='input_wrap float_right' name='bank_account' placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
  218 + <input class='input_wrap float_right' name='bank_account' placeholder-class='text_999_28' placeholder='请输入银行账号' maxlength='24'></input>
212 219 </view>
213 220 <view class="divide_line"></view>
214 221 <view class='item_body'>
... ... @@ -247,8 +254,9 @@
247 254
248 255 <!-- 任职雇佣信息 -->
249 256 <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='3'>
250   - <text class='head_text_wrap1'>任职雇佣信息</text>
251   - <text class='head_text_wrap2'>（点击收起非必填选项）</text>
  257 + <text class='head_text_wrap1'>任职受雇信息</text>
  258 + <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
  259 + <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
252 260 <view style='float:right' wx:if='{{isshow03}}'>
253 261 <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
254 262 </view>
... ... @@ -285,7 +293,7 @@
285 293 <view class="divide_line"></view>
286 294 <view class='item_body'>
287 295 <text class='text_666_28 float_left'>公司股本总额</text>
288   - <input class='input_wrap float_right' name='company_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入公司股本总额'></input>
  296 + <input class='input_wrap float_right' name='company_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='20'></input>
289 297 </view>
290 298 <view class="divide_line"></view>
291 299 <!-- <view class='item_body'>
... ... @@ -305,7 +313,7 @@
305 313 <view class="divide_line"></view>
306 314 <view class='item_body'>
307 315 <text class='text_666_28 float_left'>工号</text>
308   - <input class='input_wrap float_right' name='employee_no' type='number' placeholder-class='text_999_28' placeholder='请输入工号'></input>
  316 + <input class='input_wrap float_right' name='employee_no' type='number' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='24'></input>
309 317 </view>
310 318 <view class="divide_line"></view>
311 319 <!-- <view class='item_body'>
... ... @@ -314,19 +322,19 @@
314 322 <text class='text_333_28 float_right'></text>
315 323 </view> -->
316 324 <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
317   - <view class="divide_line"></view>
318   - <view class='item_body'>
  325 + <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
  326 + <view class='item_body' hidden="{{investpersonalInfo.selected!='是'}}">
319 327 <text class='text_666_28 float_left'>个人投资总额</text>
320   - <input class='input_wrap float_right' name='personal_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
  328 + <input class='input_wrap float_right' name='personal_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
321 329 </view>
322 330 <view class="divide_line"></view>
323 331 </view>
324 332
325   -
  333 +<!--
326 334 <view style='width:100%'>
327 335 <text class='text_666_28 float_left'>备注</text>
328 336 <input class='extra_input float_right' value='' name='comment'></input>
329   - </view>
  337 + </view> -->
330 338 </view>
331 339
332 340 </view>
... ...
... ... @@ -16,12 +16,12 @@ Page({
16 16 banklist: {},
17 17 cur_id: '',
18 18 isself: true,
19   - isIdCard:true,
20   - profession_haschanges:false,
  19 + isIdCard: true,
  20 + profession_haschanges: false,
21 21 name: '',
22   - mobile:'',
  22 + mobile: '',
23 23 card_number: '',
24   - long_birth_date:0,
  24 + long_birth_date: 0,
25 25 long_start_date: 0,
26 26 long_end_date: 0,
27 27 relativeData: {
... ... @@ -40,7 +40,7 @@ Page({
40 40 bindtype: 'personstatus',
41 41 placeholder: '请选择纳税人状态',
42 42 selected: '',
43   - values: ["正常(在职)", "非正常"],
  43 + values: ["正常", "非正常"],
44 44 onChange: 'onPickerSelect'
45 45 },
46 46 cardtypeData: {
... ... @@ -85,7 +85,7 @@ Page({
85 85 multiIndex: [0, 0, 0],
86 86 placeholder: '请选择职业',
87 87 selected: '',
88   - range_key:'label',
  88 + range_key: 'label',
89 89 onChange: 'onPickerSelect'
90 90 },
91 91 degreeData: {
... ... @@ -210,7 +210,7 @@ Page({
210 210 placeholder: '请选择户籍所在地',
211 211 onChange: 'birthAddressSelect'
212 212 },
213   - title:'',
  213 + title: '',
214 214 condition: false
215 215 },
216 216
... ... @@ -224,7 +224,7 @@ Page({
224 224 cur_id: options.id
225 225 })
226 226 this.getpersonalTax(options.id)
227   - }
  227 + }
228 228 this.getproffessiondata()
229 229 this.getbanklist()
230 230 },
... ... @@ -240,7 +240,7 @@ Page({
240 240 "Authorization": Authorization
241 241 },
242 242 success: function(res) {
243   - console.log('taxInfo',res)
  243 + console.log('taxInfo', res)
244 244 that.setData({
245 245 taxInfo: res.data,
246 246 isself: res.data.family_ties ? false : true
... ... @@ -252,9 +252,9 @@ Page({
252 252 }
253 253 })
254 254 },
255   -
  255 +
256 256 //对各参数初始赋值
257   - handleDatas:function(){
  257 + handleDatas: function() {
258 258 var tax_info = this.data.taxInfo
259 259 this.data.name = tax_info.name
260 260 this.data.relativeData.selected = tax_info.family_ties
... ... @@ -276,22 +276,22 @@ Page({
276 276 this.data.lieshuInfo.selected = tax_info.is_martyr_family
277 277 this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
278 278 this.data.bankInfo.selected = tax_info.bank
279   - this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
280   - this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
281   - this.data.birthaddressInfo.selected = tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district
  279 + this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
  280 + this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
  281 + this.data.birthaddressInfo.selected = tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district
282 282 this.data.employeeInfo.selected = tax_info.is_employee
283 283 this.data.investpersonalInfo.selected = tax_info.is_business_angel
284 284 this.setData({
285 285 relativeData: this.data.relativeData,
286   - name:this.data.name,
  286 + name: this.data.name,
287 287 personstatusData: this.data.personstatusData,
288 288 cardtypeData: this.data.cardtypeData,
289 289 mobile: this.data.mobile,
290 290 investInfo: this.data.investInfo,
291 291 specificIndustryInfo: this.data.specificIndustryInfo,
292 292 genderData: this.data.genderData,
293   -
294   - professionData:this.data.professionData,
  293 +
  294 + professionData: this.data.professionData,
295 295 degreeData: this.data.degreeData,
296 296 disabilityInfo: this.data.disabilityInfo,
297 297 lieshuInfo: this.data.lieshuInfo,
... ... @@ -299,7 +299,7 @@ Page({
299 299 contactaddressInfo: this.data.contactaddressInfo,
300 300 currentaddressInfo: this.data.currentaddressInfo,
301 301 birthaddressInfo: this.data.birthaddressInfo,
302   - employeeInfo:this.data.employeeInfo,
  302 + employeeInfo: this.data.employeeInfo,
303 303 investpersonalInfo: this.data.investpersonalInfo,
304 304
305 305 long_birth_date: tax_info.birth_date,
... ... @@ -308,12 +308,13 @@ Page({
308 308 startDate: this.data.startDate,
309 309 long_end_date: tax_info.separate_date,
310 310 endDate: this.data.endDate,
  311 + isIdCard: '居民身份证' == tax_info.id_card_type?true:false,
311 312 card_number: this.data.card_number
312 313
313 314 })
314 315 },
315 316
316   - getproffessiondata: function () {
  317 + getproffessiondata: function() {
317 318 var that = this
318 319 var Authorization = app.globalData.Authorization;
319 320 var proffession_info = that.data.professionData
... ... @@ -324,7 +325,7 @@ Page({
324 325 'content-type': 'application/json', // 默认值
325 326 "Authorization": Authorization
326 327 },
327   - success: function (res) {
  328 + success: function(res) {
328 329 proffession_info.values = that.handleProfession(res.data.items)
329 330 console.log('proffession_info------', proffession_info)
330 331 that.setData({
... ... @@ -338,7 +339,7 @@ Page({
338 339 })
339 340 },
340 341
341   - handleProfession: function (items) {
  342 + handleProfession: function(items) {
342 343 var new_profession_data = []
343 344 var list = [],
344 345 tempTwo = {},
... ... @@ -491,13 +492,13 @@ Page({
491 492 var is_idcard = this.data.isIdCard
492 493 var cardtype_data = this.data.cardtypeData
493 494 cardtype_data.selected = cardtype_data.values[e.detail.value]
494   - if (0 == e.detail.value){
  495 + if (0 == e.detail.value) {
495 496 is_idcard = true
496   - }else{
  497 + } else {
497 498 is_idcard = false
498 499 }
499 500 this.setData({
500   - isIdCard:is_idcard,
  501 + isIdCard: is_idcard,
501 502 cardtypeData: cardtype_data
502 503 })
503 504 break;
... ... @@ -528,7 +529,7 @@ Page({
528 529 var profession_name = profession_data.values[e.detail.value[e.detail.value[0]]][0].children[e.detail.value[1]].children[e.detail.value[2]].label
529 530 profession_data.selected = profession_name
530 531 this.setData({
531   - profession_haschanges:true,
  532 + profession_haschanges: true,
532 533 profession_index: e.detail.value,
533 534 professionData: profession_data
534 535 })
... ... @@ -594,7 +595,7 @@ Page({
594 595 },
595 596
596 597 // =============日期picker选中处理==============
597   - birthdayChange: function (e) {
  598 + birthdayChange: function(e) {
598 599 var birth_date = this.data.birthDate;
599 600 birth_date.selected = e.detail.value
600 601 console.log('birthdayChange', Date.parse(new Date(e.detail.value)))
... ... @@ -605,7 +606,7 @@ Page({
605 606 })
606 607 },
607 608
608   - startChange: function (e) {
  609 + startChange: function(e) {
609 610 var start_date = this.data.startDate;
610 611 start_date.selected = e.detail.value
611 612 this.setData({
... ... @@ -613,7 +614,7 @@ Page({
613 614 })
614 615 },
615 616
616   - endChange: function (e) {
  617 + endChange: function(e) {
617 618 var end_date = this.data.endDate;
618 619 end_date.selected = e.detail.value
619 620 this.setData({
... ... @@ -623,7 +624,7 @@ Page({
623 624
624 625 // =============地区picker选中处理==============
625 626
626   - contactAddressSelect: function (e) {
  627 + contactAddressSelect: function(e) {
627 628 // console.log('contactAddressSelect', e)
628 629 var contact_address = this.data.contactaddressInfo;
629 630 contact_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
... ... @@ -635,10 +636,10 @@ Page({
635 636 console.log('contactaddressInfo', this.data.contactaddressInfo)
636 637 },
637 638
638   - currentAddressSelect: function (e) {
  639 + currentAddressSelect: function(e) {
639 640 // console.log('currentAddressSelect', e)
640 641 var current_address = this.data.currentaddressInfo;
641   - current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
  642 + current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
642 643 current_address.address_value = e.detail.value
643 644 current_address.address_code = e.detail.code
644 645 this.setData({
... ... @@ -646,7 +647,7 @@ Page({
646 647 })
647 648 },
648 649
649   - birthAddressSelect: function (e) {
  650 + birthAddressSelect: function(e) {
650 651 // console.log('birthAddressSelect', e)
651 652 var birth_address = this.data.birthaddressInfo;
652 653 birth_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
... ... @@ -662,24 +663,24 @@ Page({
662 663
663 664
664 665 getIdInfo: function(e) {
665   - if(this.data.isIdCard){
  666 + if (this.data.isIdCard) {
666 667 wx.navigateTo({
667 668 url: '../idinfo/idinfo',
668   - success: function (res) { },
  669 + success: function(res) {},
669 670 })
670 671 }
671 672 },
672 673
673   - formSubmit: function (e) {
  674 + formSubmit: function(e) {
674 675 console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
675 676
676 677 var formdata = e.detail.value;
677 678 console.log("formdata", formdata)
678 679 console.log("card_number", this.data.card_number)
679   - if (formdata.name.length < 1) {
  680 + if (this.data.name&&this.data.name.length < 1 && formdata.name.length < 1) {
680 681 this.showtoast('请输入姓名');
681 682 return
682   - } else if (!this.data.isself&&this.data.relativeData.selected.length < 1) {
  683 + } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
683 684 this.showtoast('请选择成员关系');
684 685 return
685 686 } else if (this.data.personstatusData.selected.length < 1) {
... ... @@ -717,14 +718,14 @@ Page({
717 718 this.goCommit(formdata);
718 719 },
719 720
720   - goCommit: function (data) {
  721 + goCommit: function(data) {
721 722 var that = this
722 723 var formdata = data
723 724 console.log("form_data", formdata);
724 725 var request_profession = that.getProfessionRequest()
725 726 var Authorization = app.globalData.Authorization;
726 727 wx.request({
727   - url: baseUrl + 'persontax/v1/personal-taxes/'+that.data.cur_id,
  728 + url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
728 729 method: "PUT",
729 730 data: {
730 731 "name": that.data.name.length > 0 ? that.data.name : form_data.name,
... ... @@ -790,7 +791,7 @@ Page({
790 791 'content-type': 'application/json', // 默认值
791 792 "Authorization": Authorization
792 793 },
793   - success: function (res) {
  794 + success: function(res) {
794 795 console.log(res)
795 796 wx.redirectTo({
796 797 url: '../home/home',
... ... @@ -802,10 +803,10 @@ Page({
802 803 })
803 804 },
804 805
805   - getProfessionRequest:function(){
  806 + getProfessionRequest: function() {
806 807 var that = this
807 808 var pro_index = that.data.profession_index
808   - if (that.data.profession_haschanges&&pro_index.length==3){
  809 + if (that.data.profession_haschanges && pro_index.length == 3) {
809 810 var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
810 811 console.log('profession_datas', profession_data_info)
811 812 return {
... ... @@ -816,14 +817,14 @@ Page({
816 817 "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
817 818 "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
818 819 }
819   - }else{
820   - return that.data.taxInfo.profession
  820 + } else {
  821 + return that.data.taxInfo.profession
821 822 }
822 823 },
823 824
824   - showtoast: function (title) {
  825 + showtoast: function(str) {
825 826 wx.showToast({
826   - title: title,
  827 + title: str,
827 828 })
828 829 },
829 830
... ...
... ... @@ -30,7 +30,8 @@
30 30 <!-- 基本信息 -->
31 31 <view class='head_wrap' bindtap='span' id='1'>
32 32 <text class='head_text_wrap1'>基本信息</text>
33   - <text class='head_text_wrap2'>（点击收起非必填选项）</text>
  33 + <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
  34 + <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
34 35 <view style='float:right' wx:if='{{isshow01}}'>
35 36 <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
36 37 </view>
... ... @@ -52,7 +53,7 @@
52 53 <view class='item_body'>
53 54 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
54 55 <text class='text_black_28 float_left'>国籍（地区）</text>
55   - <input class='input_wrap float_right' value='中国'></input>
  56 + <text class='text_999_28 float_right'>中国</text>
56 57 </view>
57 58 <view class="divide_line"></view>
58 59
... ... @@ -82,7 +83,7 @@
82 83 <text class='text_333_28 float_right'>{{card_number}}</text>
83 84 </view>
84 85 <view wx:else>
85   - <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no' ></input>
  86 + <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no' maxlength='24'></input>
86 87 </view>
87 88 </view>
88 89 <view class="divide_line"></view>
... ... @@ -128,7 +129,7 @@
128 129 <view class="divide_line"></view>
129 130 <view class='item_body'>
130 131 <text class='text_666_28 float_left'>纳税人识别号</text>
131   - <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
  132 + <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_28' placeholder='请输入纳税人识别号' maxlength='24'></input>
132 133 </view>
133 134 <view class="divide_line"></view>
134 135 <!-- <view class='item_body'>
... ... @@ -137,10 +138,10 @@
137 138 <text class='text_333_28 float_right'></text>
138 139 </view> -->
139 140 <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
140   - <view class="divide_line"></view>
141   - <view class='item_body'>
  141 + <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
  142 + <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
142 143 <text class='text_666_28 float_left'>残疾证号</text>
143   - <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
  144 + <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_28' placeholder='请输入残疾证号' maxlength='24'></input>
144 145 </view>
145 146 <view class="divide_line"></view>
146 147 <!-- <view class='item_body'>
... ... @@ -149,10 +150,10 @@
149 150 <text class='text_333_28 float_right'></text>
150 151 </view> -->
151 152 <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
152   - <view class="divide_line"></view>
153   - <view class='item_body'>
  153 + <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
  154 + <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
154 155 <text class='text_666_28 float_left'>烈属证号</text>
155   - <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
  156 + <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_28' placeholder='请输入烈属证号' maxlength='24'></input>
156 157 </view>
157 158 <view class="divide_line"></view>
158 159 <!-- <view class='item_body'>
... ... @@ -161,6 +162,11 @@
161 162 <text class='text_333_28 float_right'></text>
162 163 </view> -->
163 164 <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
  165 + <view class="divide_line"></view>
  166 + <view class='item_body'>
  167 + <text class='text_666_28 float_left'>备注</text>
  168 + <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注' ></input>
  169 + </view>
164 170 </view>
165 171 </view>
166 172 </view>
... ... @@ -168,7 +174,8 @@
168 174 <!-- 联系方式 -->
169 175 <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='2'>
170 176 <text class='head_text_wrap1'>联系方式</text>
171   - <text class='head_text_wrap2'>（点击收起非必填选项）</text>
  177 + <text class='head_text_wrap2' hidden='{{!isshow02}}'>（点击收起非必填选项）</text>
  178 + <text class='head_text_wrap2' hidden='{{isshow02}}'>（点击展开非必填选项）</text>
172 179 <view style='float:right' wx:if='{{isshow02}}'>
173 180 <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
174 181 </view>
... ... @@ -182,7 +189,7 @@
182 189 <view class='item_body'>
183 190 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
184 191 <text class='text_black_28 float_left'>联系电话</text>
185   - <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='{{disabled}}'></input>
  192 + <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='true' maxlength='11'></input>
186 193 </view>
187 194 <!-- 非必填部分02 -->
188 195 <view hidden='{{!isshow02}}'>
... ... @@ -208,12 +215,12 @@
208 215 <view class="divide_line"></view>
209 216 <view class='item_body'>
210 217 <text class='text_666_28 float_left'>银行账号</text>
211   - <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
  218 + <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_28' placeholder='请输入银行账号' maxlength='24'></input>
212 219 </view>
213 220 <view class="divide_line"></view>
214 221 <view class='item_body'>
215 222 <text class='text_666_28 float_left'>电子邮箱</text>
216   - <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_28'></input>
  223 + <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_28'></input>
217 224 </view>
218 225 <view class="divide_line"></view>
219 226 <!-- <view class=' item_body '>
... ... @@ -225,7 +232,7 @@
225 232 <view class="divide_line"></view>
226 233 <view class='item_body '>
227 234 <text class='text_666_28 float_left '>详细地址</text>
228   - <input class='input_wrap float_right ' name='current_address_detail ' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
  235 + <input class='input_wrap float_right ' name='current_address_detail ' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
229 236 </view>
230 237 <view class="divide_line"></view>
231 238 <!-- <view class='item_body '>
... ... @@ -247,8 +254,9 @@
247 254
248 255 <!-- 任职雇佣信息 -->
249 256 <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'>
250   - <text class='head_text_wrap1 '>任职雇佣信息</text>
251   - <text class='head_text_wrap2 '>（点击收起非必填选项）</text>
  257 + <text class='head_text_wrap1 '>任职受雇信息</text>
  258 + <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
  259 + <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
252 260 <view style='float:right ' hidden='{{!isshow03}}'>
253 261 <image class='head_image_wrap_up ' src='/images/arrow_up.png '></image>
254 262 </view>
... ... @@ -285,7 +293,7 @@
285 293 <view class="divide_line"></view>
286 294 <view class='item_body '>
287 295 <text class='text_666_28 float_left'>公司股本总额</text>
288   - <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额'></input>
  296 + <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额' maxlength='20'></input>
289 297 </view>
290 298 <view class="divide_line"></view>
291 299 <!-- <view class='item_body '>
... ... @@ -306,7 +314,7 @@
306 314 <view class="divide_line"></view>
307 315 <view class='item_body '>
308 316 <text class='text_666_28 float_left '>工号</text>
309   - <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号'></input>
  317 + <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='20'></input>
310 318 </view>
311 319 <view class="divide_line"></view>
312 320 <!-- <view class='item_body '>
... ... @@ -315,19 +323,19 @@
315 323 <text class='text_333_28 float_right '></text>
316 324 </view> -->
317 325 <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
318   - <view class="divide_line"></view>
319   - <view class='item_body '>
  326 + <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
  327 + <view class='item_body ' hidden="{{investpersonalInfo.selected!='是'}}">
320 328 <text class='text_666_28 float_left '>个人投资总额</text>
321   - <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
  329 + <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
322 330 </view>
323 331 <view class="divide_line"></view>
324 332 </view>
325 333
326 334
327   - <view style='width:100% '>
  335 + <!-- <view style='width:100% '>
328 336 <text class='text_666_28 float_left '>备注</text>
329   - <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
330   - </view>
  337 + <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
  338 + </view> -->
331 339 </view>
332 340 </view>
333 341
... ... @@ -335,7 +343,7 @@
335 343 <view class="btn_bottom">
336 344 <button class="btn_bottom" formType="submit"> 保存</button>
337 345 </view>
338   -
  346 +
339 347 </form>
340 348 </view>
341 349
... ...
... ... @@ -7,36 +7,37 @@ Page({
7 7 * 页面的初始数据
8 8 */
9 9 data: {
10   - taxlist:['']
  10 + text_tip: "去完善",
  11 + taxlist: ['']
11 12 },
12 13
13 14 /**
14 15 * 生命周期函数--监听页面加载
15 16 */
16   - onLoad: function (options) {
17   -
  17 + onLoad: function(options) {
  18 +
18 19 },
19 20
20 21 /**
21 22 * 生命周期函数--监听页面初次渲染完成
22 23 */
23   - onReady: function () {
24   -
  24 + onReady: function() {
  25 +
25 26 },
26 27
27 28 /**
28 29 * 生命周期函数--监听页面显示
29 30 */
30   - onShow: function () {
  31 + onShow: function() {
31 32 this.getTaxList()
32 33 },
33 34
34   - getTaxList:function(){
  35 + getTaxList: function() {
35 36 var that = this;
36 37 var Authorization = app.globalData.Authorization;
37   - console.log('Authorization',Authorization)
38   - if(!Authorization||Authorization.length<10){
39   - return
  38 + console.log('Authorization', Authorization)
  39 + if (!Authorization || Authorization.length < 10) {
  40 + return
40 41 }
41 42 wx.request({
42 43 url: baseUrl + 'persontax/v1/personal-taxes',
... ... @@ -45,14 +46,17 @@ Page({
45 46 'content-type': 'application/json', // 默认值
46 47 "Authorization": Authorization
47 48 },
48   - data:{
49   - 'all':true
  49 + data: {
  50 + 'all': true
50 51 },
51   - success: function (res) {
  52 + success: function(res) {
52 53 console.log(res.data)
53 54 that.setData({
54   - taxlist:res.data.items
  55 + taxlist: res.data.items
55 56 })
  57 + if (res.data.items && res.data.items.length > 0) {
  58 + that.getStatus(res.data.items)
  59 + }
56 60 },
57 61 fail(res) {
58 62 console.log(res.data)
... ... @@ -60,14 +64,27 @@ Page({
60 64 })
61 65 },
62 66
63   - goadd:function(e){
  67 + getStatus: function(data) {
  68 + console.log('data', data )
  69 + if (data[0].family_ties.length < 1 && data[0].name.length > 0 && data[0].taxpayer_status.length > 0 && data[0].id_card_type.length > 0 && data[0].id_card_no.length > 0 && data[0].mobile.length > 0 && data[0].is_investor.length > 0 && data[0].is_specific_profession.length > 0) {
  70 + this.setData({
  71 + text_tip: '去查看'
  72 + })
  73 + } else {
  74 + this.setData({
  75 + text_tip: '去完善'
  76 + })
  77 + }
  78 + },
  79 +
  80 + goadd: function(e) {
64 81 console.log(e)
65 82 wx.navigateTo({
66 83 url: '../addinfo/addinfo',
67 84 })
68 85 },
69 86
70   - goedit: function (e) {
  87 + goedit: function(e) {
71 88 console.log(e)
72 89 wx.navigateTo({
73 90 url: '../editinfo/editinfo?id=' + e.currentTarget.id,
... ... @@ -77,35 +94,35 @@ Page({
77 94 /**
78 95 * 生命周期函数--监听页面隐藏
79 96 */
80   - onHide: function () {
81   -
  97 + onHide: function() {
  98 +
82 99 },
83 100
84 101 /**
85 102 * 生命周期函数--监听页面卸载
86 103 */
87   - onUnload: function () {
88   -
  104 + onUnload: function() {
  105 +
89 106 },
90 107
91 108 /**
92 109 * 页面相关事件处理函数--监听用户下拉动作
93 110 */
94   - onPullDownRefresh: function () {
95   -
  111 + onPullDownRefresh: function() {
  112 +
96 113 },
97 114
98 115 /**
99 116 * 页面上拉触底事件的处理函数
100 117 */
101   - onReachBottom: function () {
102   -
  118 + onReachBottom: function() {
  119 +
103 120 },
104 121
105 122 /**
106 123 * 用户点击右上角分享
107 124 */
108   - onShareAppMessage: function () {
109   -
  125 + onShareAppMessage: function() {
  126 +
110 127 }
111 128 })
\ No newline at end of file
... ...
... ... @@ -34,7 +34,7 @@
34 34 <view class='rectangle_solid_bg' bindtap='goedit' id='{{item.id}}'>
35 35 <view style='padding: 0 15px '>
36 36 <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
37   - <text class='text_999_28'>去完善</text>
  37 + <text class='text_999_28' >{{text_tip}}</text>
38 38 </view>
39 39
40 40 </view>
... ...
请 注册 或 登录 后发表评论