wangyu / naturalPersonTax · 提交

提交 d49966f699092bcea14493c27930a4c570104425

作者 wangyu
1 个父辈 702b9d4f

yh

内嵌 并排对比
正在显示 3 个修改的文件 包含 10 行增加 和 30 行删除
@@ -11,30 +11,9 @@ @@ -11,30 +11,9 @@
11 11
12 <view class="weui-cell__bd"> 12 <view class="weui-cell__bd">
13 <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'> 13 <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
14 - <view wx:if="{{selected}}" class="text_333_28 float_right">{{selected}}</view>  
15 - <view wx:elif="{{placeholder}}" class="text_999_28 float_right">{{placeholder}}</view> 14 + <view wx:if="{{selected&&!disabled}}" class="text_333_28 float_right">{{selected}}</view>
  15 + <view wx:else class="text_999_28 float_right">{{selected?selected:placeholder}}</view>
16 </picker> 16 </picker>
17 </view> 17 </view>
18 </view> 18 </view>
19 </template> 19 </template>
20 -  
21 -<template name="picker_cell_muti">  
22 - <view class='item_body'>  
23 - <text hidden='{{!isrequre}}' style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>  
24 - <view wx:if='{{isrequre}}'>  
25 - <text class='text_black_28 float_left'>{{label}}</text>  
26 - </view>  
27 - <view wx:else>  
28 - <text class='text_666_28 float_left'>{{label}}</text>  
29 - </view>  
30 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
31 -  
32 - <view class="weui-cell__bd">  
33 - <picker mode="{{mode?mode:'multiSelector'}}" range-key="{{range_key}}" range="{{values}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>  
34 - <view wx:if="{{true}}" class="text_333_28 float_right">{{selected}}</view>  
35 - <view wx:elif="{{placeholder}}" class="text_333_28 float_right">{{placeholder}}</view>  
36 - </picker>  
37 - </view>  
38 -  
39 - </view>  
40 -</template>  
@@ -279,7 +279,7 @@ Page({ @@ -279,7 +279,7 @@ Page({
279 this.data.name = tax_info.name 279 this.data.name = tax_info.name
280 if (this.data.isself) { 280 if (this.data.isself) {
281 this.data.relativeData.disabled = true 281 this.data.relativeData.disabled = true
282 - this.data.relativeData.placeholder = tax_info.family_ties 282 + this.data.relativeData.selected = tax_info.family_ties
283 } else { 283 } else {
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
@@ -287,6 +287,7 @@ Page({ @@ -287,6 +287,7 @@ Page({
287 if (tax_info.real_auth_status == 'active') { 287 if (tax_info.real_auth_status == 'active') {
288 this.data.genderData.disabled = true 288 this.data.genderData.disabled = true
289 this.data.birthDate.disabled = true 289 this.data.birthDate.disabled = true
  290 + this.data.cardtypeData.disabled = true
290 } 291 }
291 292
292 this.data.personstatusData.selected = tax_info.taxpayer_status 293 this.data.personstatusData.selected = tax_info.taxpayer_status
@@ -784,7 +785,7 @@ Page({ @@ -784,7 +785,7 @@ Page({
784 } else if (!regname.test(formdata.name)) { 785 } else if (!regname.test(formdata.name)) {
785 this.showtoast('请输入正确姓名'); 786 this.showtoast('请输入正确姓名');
786 return 787 return
787 - } else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) { 788 + } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
788 this.showtoast('有必填项未填写'); 789 this.showtoast('有必填项未填写');
789 return 790 return
790 } else if (this.data.personstatusData.selected.length < 1) { 791 } else if (this.data.personstatusData.selected.length < 1) {
@@ -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="{{taxInfo.real_auth_status=='active'}}" value='{{name}}'></input> 16 + <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.real_auth_status=='active'}}" ></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="{{taxInfo.real_auth_status=='active'}}" ></input> 49 + <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.real_auth_status=='active'&&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}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input> 84 + <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' 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}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input> 87 + <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}"placeholder-class='text_999_28' name='id_card_no' maxlength='24' 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='{{isself}}' maxlength='11'></input> 193 + <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&mobile?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}}'>
请 注册 或 登录 后发表评论