wangyu / naturalPersonTax · 提交

提交 630ae5e6844e4d595e2bb67a96e1c198941b8cac

作者 pangy
1 个父辈 1f3ae0e6
构建： 未知

基本信息去除注释代码 UI初调

内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 214 行删除
... ... @@ -33,15 +33,6 @@ Page({
33 33 personal_equity_total:0,
34 34 company_equity_total:0,
35 35 huji_address_detail: '',
36   - relativeData: {
37   - isrequre: true,
38   - label: '关系',
39   - bindtype: 'relative',
40   - placeholder: '请选择亲属关系',
41   - selected: '',
42   - values: ["子女", "配偶"],
43   - onChange: 'onPickerSelect'
44   - },
45 36 personstatusData: {
46 37 isrequre: true,
47 38 label: '纳税人状态',
... ... @@ -281,13 +272,6 @@ Page({
281 272 console.log('curdate', curdate)
282 273
283 274 this.data.name = tax_info.name
284   - if (this.data.isself) {
285   - this.data.relativeData.disabled = true
286   - this.data.relativeData.selected = tax_info.family_ties
287   - } else {
288   - this.data.relativeData.disabled = false
289   - this.data.relativeData.selected = tax_info.family_ties
290   - }
291 275 if (tax_info.certification_status == 'active') {//已通过拍摄身份证认证过，不能修改
292 276 this.data.genderData.disabled = true
293 277 this.data.birthDate.disabled = true
... ... @@ -337,7 +321,6 @@ Page({
337 321 this.data.investpersonalInfo.selected = tax_info.is_business_angel
338 322 this.setData({
339 323 huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
340   - relativeData: this.data.relativeData,
341 324 name: this.data.name,
342 325 personstatusData: this.data.personstatusData,
343 326 cardtypeData: this.data.cardtypeData,
... ... @@ -586,13 +569,6 @@ Page({
586 569 onPickerSelect: function(e) {
587 570 console.log('picker发送选择改变，携带值为', e)
588 571 switch (e.currentTarget.id) {
589   - case 'relative':
590   - var relative_data = this.data.relativeData
591   - relative_data.selected = relative_data.values[e.detail.value]
592   - this.setData({
593   - relativeData: relative_data
594   - })
595   - break;
596 572 case 'personstatus':
597 573 var personstatus_data = this.data.personstatusData
598 574 personstatus_data.selected = personstatus_data.values[e.detail.value]
... ... @@ -865,9 +841,6 @@ Page({
865 841 } else if (this.data.name.length > 0 && !regname.test(this.data.name)) {
866 842 this.showtoast('请输入正确姓名');
867 843 return
868   - } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
869   - this.showtoast('请选择关系');
870   - return
871 844 }
872 845 // else if (this.data.personstatusData.selected.length < 1) {
873 846 // this.showtoast('有必填项未填写');
... ... @@ -944,7 +917,7 @@ Page({
944 917 data: {
945 918 'certification_status': that.getCertifyStatus(formdata),
946 919 "name": that.data.name,
947   - "family_ties": that.data.relativeData.selected,
  920 + "family_ties": '本人',//that.data.relativeData.selected,
948 921 "native": "中国",
949 922 "taxpayer_type":"居民",
950 923 "is_overseas_personnel": "否",
... ...
... ... @@ -3,33 +3,7 @@
3 3
4 4 <view class='page'>
5 5 <form bindsubmit='formSubmit'>
6   -
7   - <!-- 成员关系 -->
8   - <view class='head_wrap' hidden="{{isself}}">
9   - <text class='head_text_wrap1'>成员关系</text>
10   - </view>
11   - <view class='data_list' hidden="{{isself}}">
12   - <view class='data_item'>
13   - <view class='item_body'>
14   - <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
15   - <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
16   - <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
17   -
18   - <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入姓名" value='{{name}}' name='name' disabled="{{taxInfo.certification_status=='active'}}" maxlength='15' bindblur='bindinputname'></input>
19   - <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}" maxlength='15' bindblur='bindinputname'></input>
20   - </view>
21   - <view class="divide_line"></view>
22   - <!-- <view class='item_body' bindtap='openpicker'>
23   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
24   - <text class='text_black_28 float_left'>关系</text>
25   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
26   - <text class='text_333_28 float_right'>请选择关系</text>
27   - </view> -->
28   -
29   - <template is="picker_cell_normal" data="{{...relativeData}}" />
30   - </view>
31   - </view>
32   -
  6 + <view class="divide_line"></view>
33 7 <!-- 基本信息 -->
34 8 <view class='head_wrap' bindtap='span' id='1'>
35 9 <text class='head_text_wrap1'>基本信息</text>
... ... @@ -41,16 +15,14 @@
41 15 <view wx:else style='float:right'>
42 16 <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
43 17 </view>
44   - <!-- <image class='{{isshow01}}?head_image_wrap_up:head_image_wrap_down' src="{{isshow01?'/images/arrow_up.png':'/images/arrow_down.png'}}"></image> -->
45 18 </view>
46 19
47 20 <view class='data_list'>
48 21 <view class='data_item'>
  22 + <view class="divide_line"></view>
49 23 <view class='item_body' hidden="{{!isself}}">
50 24 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
51 25 <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
52   - <!-- <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}"></input> -->
53   -
54 26 <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
55 27 <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
56 28 </view>
... ... @@ -74,21 +46,6 @@
74 46 <text class='text_999_30 float_right' style='line-height: 90rpx'>否</text>
75 47 </view>
76 48 <view class="divide_line"></view>
77   - <!-- <view class='item_body'>
78   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
79   - <text class='text_black_28 float_left'>纳税人状态</text>
80   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
81   - <text class='text_333_28 float_right'>在职</text>
82   - </view> -->
83   - <!-- <template is="picker_cell_normal" data="{{...personstatusData}}" />
84   - <view class="divide_line"></view> -->
85   -
86   - <!-- <view class='item_body'>
87   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
88   - <text class='text_black_28 float_left'>证照类型</text>
89   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
90   - <text class='text_333_28 float_right'>居民身份证</text>
91   - </view> -->
92 49 <template is="picker_cell_normal" data="{{...cardtypeData}}" />
93 50 <view class="divide_line"></view>
94 51
... ... @@ -97,36 +54,14 @@
97 54 <text class='text_black_30 float_left' style='line-height: 90rpx'>证照号码</text>
98 55 <view>
99 56 <image wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
100   - <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
101   - <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证照号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
102 57 <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
103 58 <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input>
104 59 </view>
105 60 </view>
106   -
107   - <!-- <view class='item_body'>
108   - <text class='head_red_star float_left'>*</text>
109   - <text class='text_black_28 float_left'>是否境外人员</text>
110   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
111   - <text class='text_333_28 float_right'>否</text>
112   - </view> -->
113   - <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
114   - <!-- 非必填部分 -->
115 61 <view hidden='{{!isshow01}}'>
116 62 <view class="divide_line"></view>
117   -
118   - <!-- <view class='item_body'>
119   - <text class='text_666_28 float_left'>性别</text>
120   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
121   - <text class='text_333_28 float_right'>男</text>
122   - </view> -->
123 63 <template is="picker_cell_normal" data="{{...genderData}}" />
124 64 <view class="divide_line"></view>
125   - <!-- <view class='item_body'>
126   - <text class='text_666_28 float_left'>出生年月</text>
127   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
128   - <text class='text_333_28 float_right'></text>
129   - </view> -->
130 65 <template is="picker_cell_normal" data="{{...birthDate}}" />
131 66 </view>
132 67 </view>
... ... @@ -147,44 +82,16 @@
147 82
148 83 <view class='data_list'>
149 84 <view class='data_item'>
  85 + <view class="divide_line"></view>
150 86 <view class='item_body'>
151 87 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
152 88 <text class='text_black_30 float_left' style='line-height: 90rpx'>手机号码</text>
153 89 <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile'></input>
154 90 </view>
155   - <!-- <view class='item_body'>
156   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
157   - <text class='text_black_30 float_left' style='line-height: 90rpx'>联系电话</text>
158   - <input class='input_wrap float_right' hidden="{{isself||taxInfo.certification_status=='active'}}" placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'||isself}}" maxlength='11' bindblur='bindinputmobile'></input>
159 91
160   - <input hidden="{{taxInfo.certification_status!='active'&&!isself}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||mobile?mobile:'请输入手机号'}}" name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'||isself}}"
161   - maxlength='11' bindblur='bindinputmobile'></input>
162   - </view> -->
163 92 <!-- 非必填部分02 -->
164 93 <view hidden='{{!isshow02}}'>
165 94 <view class="divide_line"></view>
166   - <!-- <view class='item_body'>
167   - <text class='text_666_28 float_left'>联系地址</text>
168   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
169   - <text class='text_333_28 float_right'></text>
170   - </view> -->
171   - <!-- <template is="picker_cell_normal" data="{{...contactaddressInfo}}" />
172   - <view class="divide_line"></view>
173   - <view class='item_body'>
174   - <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text>
175   - <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}' placeholder-class='text_999_30' placeholder='请输入详细联系地址'></input>
176   - </view>
177   - <view class="divide_line"></view> -->
178   - <!-- <view class='item_body'>
179   - <text class='text_666_28 float_left'>开户银行</text>
180   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
181   - <text class='text_333_28 float_right'></text>
182   - </view> -->
183   - <!-- <view class=' item_body '>
184   - <text class='text_666_28 float_left '>居住地</text>
185   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
186   - <text class='text_333_28 float_right '></text>
187   - </view> -->
188 95 <template is="picker_cell_normal" data="{{...currentaddressInfo}}" />
189 96 <view class="divide_line"></view>
190 97 <view class='item_body'>
... ... @@ -192,11 +99,6 @@
192 99 <input class='input_wrap float_right ' name='current_address_detail' value="{{taxInfo.current_address_detail}}" placeholder-class='text_999_30' placeholder='请输入详细居住地址'></input>
193 100 </view>
194 101 <view class="divide_line"></view>
195   - <!-- <view class='item_body '>
196   - <text class='text_666_28 float_left '>户籍所在地</text>
197   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
198   - <text class='text_333_28 float_right '></text>
199   - </view> -->
200 102 <template is="picker_cell_normal" data="{{...birthaddressInfo}}" />
201 103 <view class="divide_line"></view>
202 104 <view class='item_body '>
... ... @@ -229,17 +131,8 @@
229 131 </view>
230 132 <view class='data_list'>
231 133 <view class='data_item'>
232   - <view hidden='{{!isshow03}}'>
233   - <!-- <view class='item_body'>
234   - <text class='text_666_28 float_left'>职业</text>
235   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
236   - <text class='text_333_28 float_right'></text>
237   - </view> -->
238   - <!-- <view class='item_body'>
239   - <text class='text_666_28 float_left'>学历</text>
240   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
241   - <text class='text_333_28 float_right'></text>
242   - </view> -->
  134 + <view hidden='{{!isshow03}}'>
  135 + <view class="divide_line"></view>
243 136 <template is="picker_cell_normal" data="{{...degreeData}}" />
244 137 <view class="divide_line"></view>
245 138 <template is="picker_cell_normal" data="{{...professionData}}" />
... ... @@ -251,17 +144,6 @@
251 144 <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input>
252 145 </view>
253 146 <view class="divide_line"></view>
254   -
255   - <!-- <view class='item_body'>
256   - <text class='text_666_30 float_left' style='line-height: 90rpx'>纳税人识别号</text>
257   - <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_30' placeholder='请输入纳税人识别号' maxlength='24'></input>
258   - </view>
259   - <view class="divide_line"></view> -->
260   - <!-- <view class='item_body'>
261   - <text class='text_666_28 float_left'>是否残疾</text>
262   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
263   - <text class='text_333_28 float_right'></text>
264   - </view> -->
265 147 <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
266 148 <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
267 149 <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
... ... @@ -269,11 +151,7 @@
269 151 <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
270 152 </view>
271 153 <view class="divide_line"></view>
272   - <!-- <view class='item_body'>
273   - <text class='text_666_28 float_left'>是否烈属</text>
274   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
275   - <text class='text_333_28 float_right'></text>
276   - </view> -->
  154 +
277 155 <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
278 156 <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
279 157 <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
... ... @@ -281,11 +159,7 @@
281 159 <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
282 160 </view>
283 161 <view class="divide_line"></view>
284   - <!-- <view class='item_body'>
285   - <text class='text_666_28 float_left'>是否孤老</text>
286   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
287   - <text class='text_333_28 float_right'></text>
288   - </view> -->
  162 +
289 163 <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
290 164 <view class="divide_line"></view>
291 165 <view class='item_body'>
... ... @@ -300,43 +174,15 @@
300 174 </view>
301 175
302 176
303   -
304   - <!-- 任职雇佣信息 -->
305   - <!-- <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'>
306   - <text class='head_text_wrap1 '>任职受雇信息</text>
307   - <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
308   - <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
309   - <view style='float:right ' hidden='{{!isshow03}}'>
310   - <image class='head_image_wrap_up ' src='/images/arrow_up.png '></image>
311   - </view>
312   - <view hidden='{{isshow03}}' style='float:right '>
313   - <image class='head_image_wrap_down ' src='/images/arrow_down.png '></image>
314   - </view>
315   - </view> -->
316   -
317 177 <view class='data_list ' hidden='true'>
318 178 <view class='data_item '>
319   - <!-- <view class='item_body '>
320   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left '>*</text>
321   - <text class='text_black_28 float_left '>是否股东、投资者</text>
322   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
323   - <text class='text_333_28 float_right '>是</text>
324   - </view> -->
  179 +
325 180 <template is="picker_cell_normal" data="{{...investInfo}}" />
326 181 <view class="divide_line"></view>
327   - <!-- <view class='item_body '>
328   - <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left '>*</text>
329   - <text class='text_black_28 float_left '>是否特定行业</text>
330   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
331   - <text class='text_333_28 float_right '></text>
332   - </view> -->
  182 +
333 183 <template is="picker_cell_normal" data="{{...specificIndustryInfo}}" />
334 184 <view class="divide_line"></view>
335   - <!-- <view class='item_body '>
336   - <text class='text_666_28 float_left '>是否雇员</text>
337   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
338   - <text class='text_333_28 float_right '></text>
339   - </view> -->
  185 +
340 186 <template is="picker_cell_normal" data="{{...employeeInfo}}" />
341 187 <view hidden='{{!isshow03}}'>
342 188 <view class="divide_line"></view>
... ... @@ -345,19 +191,11 @@
345 191 <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_30' placeholder='请输入股本总额(保留两位小数)' maxlength='13' bindblur='companymoney'></input>
346 192 </view>
347 193 <view class="divide_line"></view>
348   - <!-- <view class='item_body '>
349   - <text class='text_666_28 float_left '>在职受雇日期</text>
350   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
351   - <text class='text_333_28 float_right '></text>
352   - </view> -->
  194 +
353 195 <template is="picker_cell_normal" data="{{...startDate}}" />
354 196
355 197 <view class="divide_line"></view>
356   - <!-- <view class='item_body '>
357   - <text class='text_666_28 float_left '>离职日期</text>
358   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
359   - <text class='text_333_28 float_right '></text>
360   - </view> -->
  198 +
361 199 <template is="picker_cell_normal" data="{{...endDate}}" />
362 200
363 201 <view class="divide_line"></view>
... ... @@ -366,11 +204,7 @@
366 204 <input class='input_wrap float_right ' name='employee_no' value='{{taxInfo.employee_no}}' placeholder-class='text_999_30' placeholder='请输入工号' maxlength='20'></input>
367 205 </view>
368 206 <view class="divide_line"></view>
369   - <!-- <view class='item_body '>
370   - <text class='text_666_28 float_left '>是否天使投资个人</text>
371   - <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
372   - <text class='text_333_28 float_right '></text>
373   - </view> -->
  207 +
374 208 <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
375 209 <view class="divide_line"></view>
376 210 <view class='item_body'>
... ... @@ -381,10 +215,6 @@
381 215 </view>
382 216
383 217
384   - <!-- <view style='width:100% '>
385   - <text class='text_666_28 float_left '>备注</text>
386   - <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
387   - </view> -->
388 218 </view>
389 219 </view>
390 220
... ... @@ -398,4 +228,3 @@
398 228 </form>
399 229 </view>
400 230
401   -<!-- 普通选择器 -->
\ No newline at end of file
... ...
... ... @@ -5,10 +5,12 @@
5 5 }
6 6
7 7 .head_wrap {
8   - height: 90rpx;
9   - background: #f7f9fd;
  8 + height: 96rpx;
  9 + /* background: #f7f9fd; */
  10 + background: #fff;
10 11 padding-right: 20rpx;
11 12 padding-left: 32rpx;
  13 + /* line-height: 96rpx; */
12 14 }
13 15
14 16 .head_red_star {
... ...
请 注册 或 登录 后发表评论