正在显示
16 个修改的文件
包含
347 行增加
和
246 行删除
@@ -62,14 +62,6 @@ App({ | @@ -62,14 +62,6 @@ App({ | ||
62 | url: '../../getPhone/getPhone' | 62 | url: '../../getPhone/getPhone' |
63 | }) | 63 | }) |
64 | } else if (user && user.type == "1") {//注册用户 | 64 | } else if (user && user.type == "1") {//注册用户 |
65 | - if (relaunch) { | ||
66 | - // wx.reLaunch({ //重新加载 | ||
67 | - // url: '../home/home' | ||
68 | - // }) | ||
69 | - wx.reLaunch({ | ||
70 | - url: '../guide/guide' | ||
71 | - }) | ||
72 | - } | ||
73 | that.configOssUrl() | 65 | that.configOssUrl() |
74 | } | 66 | } |
75 | }, | 67 | }, |
@@ -2,27 +2,23 @@ | @@ -2,27 +2,23 @@ | ||
2 | "pages": [ | 2 | "pages": [ |
3 | "pages/main/guide/guide", | 3 | "pages/main/guide/guide", |
4 | "pages/getPhone/getPhone", | 4 | "pages/getPhone/getPhone", |
5 | - | ||
6 | "pages/main/smartchat/chat", | 5 | "pages/main/smartchat/chat", |
7 | - | ||
8 | "pages/main/taxperson/home", | 6 | "pages/main/taxperson/home", |
9 | "pages/main/taxperson/editinfo/editinfo", | 7 | "pages/main/taxperson/editinfo/editinfo", |
10 | "pages/main/taxperson/addinfo/addinfo", | 8 | "pages/main/taxperson/addinfo/addinfo", |
11 | "pages/main/taxperson/idinfo/idinfo", | 9 | "pages/main/taxperson/idinfo/idinfo", |
12 | - | ||
13 | "pages/main/addtionalreduce/home", | 10 | "pages/main/addtionalreduce/home", |
14 | "pages/main/addtionalreduce/godeclare/godeclare", | 11 | "pages/main/addtionalreduce/godeclare/godeclare", |
15 | "pages/main/addtionalreduce/godetail/godetail", | 12 | "pages/main/addtionalreduce/godetail/godetail", |
16 | "pages/main/addtionalreduce/lookandupdate/lookandupdate", | 13 | "pages/main/addtionalreduce/lookandupdate/lookandupdate", |
17 | "pages/main/addtionalreduce/addextrainfo/addextrainfo", | 14 | "pages/main/addtionalreduce/addextrainfo/addextrainfo", |
18 | - | ||
19 | - "pages/main/advancepayment/home", | ||
20 | - | 15 | + "pages/main/advancepayment/adPayHome", |
21 | "pages/main/finalpayment/home", | 16 | "pages/main/finalpayment/home", |
22 | "pages/main/finalpayment/inputinfo/inputinfo", | 17 | "pages/main/finalpayment/inputinfo/inputinfo", |
23 | "pages/main/finalpayment/historylist/historylist", | 18 | "pages/main/finalpayment/historylist/historylist", |
24 | "pages/main/finalpayment/historydetail/historydetail", | 19 | "pages/main/finalpayment/historydetail/historydetail", |
25 | - "pages/login/login" | 20 | + "pages/login/login", |
21 | + "pages/main/advancepayment/adPayDetails/adPayDetails" | ||
26 | ], | 22 | ], |
27 | "window": { | 23 | "window": { |
28 | "backgroundTextStyle": "light", | 24 | "backgroundTextStyle": "light", |
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | <view wx:else> | 7 | <view wx:else> |
8 | <text class='text_666_30 float_left' style='line-height: 90rpx;'>{{label}}</text> | 8 | <text class='text_666_30 float_left' style='line-height: 90rpx;'>{{label}}</text> |
9 | </view> | 9 | </view> |
10 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | 10 | + <image wx:if='{{!disabled}}' class='arrow_wrap' src='/images/arrow_right.png'></image> |
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}}'> |
@@ -64,7 +64,8 @@ Page({ | @@ -64,7 +64,8 @@ Page({ | ||
64 | app.globalData.tenant_id = tenant.id; | 64 | app.globalData.tenant_id = tenant.id; |
65 | app.globalData.userInfo = user; | 65 | app.globalData.userInfo = user; |
66 | app.globalData.wx_open_id = user.wx_open_id; | 66 | app.globalData.wx_open_id = user.wx_open_id; |
67 | - | 67 | + |
68 | + app.configOssUrl() | ||
68 | wx.reLaunch({ | 69 | wx.reLaunch({ |
69 | url: '../main/guide/guide' | 70 | url: '../main/guide/guide' |
70 | }) | 71 | }) |
1 | +// pages/main/advancepayment/adPayDetails/adPayDetails.js | ||
2 | +var format = require('../../../../utils/util.js'); | ||
3 | +var app = getApp(); | ||
4 | +var baseUrl = app.globalData.baseUrl; | ||
5 | + | ||
6 | +Page({ | ||
7 | + | ||
8 | + data: { | ||
9 | + // tab切换 | ||
10 | + isshow: false, | ||
11 | + currentTab: 0, | ||
12 | + datas: {}, | ||
13 | + choosed_date: '', | ||
14 | + long_date: 0 | ||
15 | + }, | ||
16 | + onLoad: function (options) { | ||
17 | + if (!options.id) return | ||
18 | + | ||
19 | + const self = this | ||
20 | + var Authorization = getApp().globalData.Authorization; | ||
21 | + wx.showLoading() | ||
22 | + wx.request({ | ||
23 | + url: baseUrl + "payroll/v1/tax/person-records/" + options.id, | ||
24 | + header: { | ||
25 | + 'Authorization': Authorization | ||
26 | + }, | ||
27 | + success: function (result) { | ||
28 | + console.log('成功', result) | ||
29 | + self.setData({ | ||
30 | + datas:result | ||
31 | + }) | ||
32 | + }, | ||
33 | + fail: function (res) { | ||
34 | + console.log('失败', res) | ||
35 | + }, | ||
36 | + complete: function () { | ||
37 | + wx.hideLoading() | ||
38 | + } | ||
39 | + | ||
40 | + }) | ||
41 | + | ||
42 | + // this.setData({ | ||
43 | + // choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth() + 1) + "月", | ||
44 | + // long_date: mydate.getTime() / 1000 | ||
45 | + // }) | ||
46 | + }, | ||
47 | + | ||
48 | + | ||
49 | + | ||
50 | + | ||
51 | +}) |
1 | -<!--pages/main/advancepayment/home.wxml--> | 1 | +<!--pages/main/advancepayment/adPayDetails/adPayDetails.wxml--> |
2 | <view> | 2 | <view> |
3 | - <!-- <scroll-view style='margin-bottom:40rpx'> | 3 | + <scroll-view style='margin-bottom:40rpx'> |
4 | <view style='padding:30rpx;background:#ffffff'> | 4 | <view style='padding:30rpx;background:#ffffff'> |
5 | <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange"> | 5 | <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange"> |
6 | <view> | 6 | <view> |
@@ -13,38 +13,43 @@ | @@ -13,38 +13,43 @@ | ||
13 | </picker> | 13 | </picker> |
14 | <view class='divide_line_f5f5f5'></view> | 14 | <view class='divide_line_f5f5f5'></view> |
15 | <view style='padding:30rpx 0'> | 15 | <view style='padding:30rpx 0'> |
16 | + <text class='text_666_30 float_left'>当期收入额</text> | ||
17 | + <text class='text_number float_right'>400000.00</text> | ||
18 | + </view> | ||
19 | + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | ||
20 | + <view style='padding:30rpx 0'> | ||
16 | <text class='text_666_30 float_left'>累计工资收入</text> | 21 | <text class='text_666_30 float_left'>累计工资收入</text> |
17 | - <text class='text_333_30_bold float_right'>400000.00</text> | 22 | + <text class='text_number float_right'>400000.00</text> |
18 | </view> | 23 | </view> |
19 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 24 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
20 | <view style='padding:30rpx 0'> | 25 | <view style='padding:30rpx 0'> |
21 | <text class='text_666_30 float_left'>累计免税收入</text> | 26 | <text class='text_666_30 float_left'>累计免税收入</text> |
22 | - <text class='text_333_30_bold float_right'>40.00</text> | 27 | + <text class='text_number float_right'>40.00</text> |
23 | </view> | 28 | </view> |
24 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 29 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
25 | <view style='padding:30rpx 0'> | 30 | <view style='padding:30rpx 0'> |
26 | <text class='text_666_30 float_left'>累计基本减除费用</text> | 31 | <text class='text_666_30 float_left'>累计基本减除费用</text> |
27 | - <text class='text_333_30_bold float_right'>8000.00</text> | 32 | + <text class='text_number float_right'>8000.00</text> |
28 | </view> | 33 | </view> |
29 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 34 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
30 | <view style='padding:30rpx 0'> | 35 | <view style='padding:30rpx 0'> |
31 | <text class='text_666_30 float_left'>累计专项扣除额</text> | 36 | <text class='text_666_30 float_left'>累计专项扣除额</text> |
32 | - <text class='text_333_30_bold float_right'>84783.00</text> | 37 | + <text class='text_number float_right'>84783.00</text> |
33 | </view> | 38 | </view> |
34 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 39 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
35 | <view style='padding:30rpx 0'> | 40 | <view style='padding:30rpx 0'> |
36 | <text class='text_666_30 float_left'>累计专项附加扣除额</text> | 41 | <text class='text_666_30 float_left'>累计专项附加扣除额</text> |
37 | - <text class='text_333_30_bold float_right'>32200.00</text> | 42 | + <text class='text_number float_right'>32200.00</text> |
38 | </view> | 43 | </view> |
39 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 44 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
40 | <view style='padding:30rpx 0'> | 45 | <view style='padding:30rpx 0'> |
41 | <text class='text_666_30 float_left'>累计其他扣除额</text> | 46 | <text class='text_666_30 float_left'>累计其他扣除额</text> |
42 | - <text class='text_333_30_bold float_right'>0.00</text> | 47 | + <text class='text_number float_right'>0.00</text> |
43 | </view> | 48 | </view> |
44 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> | 49 | <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view> |
45 | <view style='padding:30rpx 0'> | 50 | <view style='padding:30rpx 0'> |
46 | <text class='text_666_30 float_left'>累计预缴应纳税所得额</text> | 51 | <text class='text_666_30 float_left'>累计预缴应纳税所得额</text> |
47 | - <text class='text_333_30_bold float_right'>32983000.00</text> | 52 | + <text class='text_number float_right'>32983000.00</text> |
48 | </view> | 53 | </view> |
49 | </view> | 54 | </view> |
50 | <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'> | 55 | <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'> |
@@ -60,14 +65,16 @@ | @@ -60,14 +65,16 @@ | ||
60 | <text class='text_num_wrap'>10398.01</text> | 65 | <text class='text_num_wrap'>10398.01</text> |
61 | <text class='text_text_wrap'>已预扣预缴税额</text> | 66 | <text class='text_text_wrap'>已预扣预缴税额</text> |
62 | </view> | 67 | </view> |
63 | - <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> | 68 | + |
69 | + </view> | ||
70 | + | ||
71 | + <view class='view_bg_wrap' style='margin-top: 180rpx;'> | ||
64 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> | 72 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> |
65 | <text class='text_num_wrap'>133.09</text> | 73 | <text class='text_num_wrap'>133.09</text> |
66 | <text class='text_text_wrap'>本期应预扣预缴税额</text> | 74 | <text class='text_text_wrap'>本期应预扣预缴税额</text> |
67 | </view> | 75 | </view> |
68 | - </view> | ||
69 | - | ||
70 | - <view class='view_bg_wrap' style='margin-top: 180rpx;'> | 76 | + |
77 | + <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> | ||
71 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> | 78 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> |
72 | <text class='text_num_wrap'>30.8%</text> | 79 | <text class='text_num_wrap'>30.8%</text> |
73 | <text class='text_text_wrap'>使用税率</text> | 80 | <text class='text_text_wrap'>使用税率</text> |
@@ -76,12 +83,12 @@ | @@ -76,12 +83,12 @@ | ||
76 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> | 83 | <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> |
77 | <text class='text_num_wrap'>19106.91</text> | 84 | <text class='text_num_wrap'>19106.91</text> |
78 | <text class='text_text_wrap'>速算扣除数</text> | 85 | <text class='text_text_wrap'>速算扣除数</text> |
79 | - </view> | 86 | + </view> --> |
80 | </view> | 87 | </view> |
81 | </view> | 88 | </view> |
82 | </view> | 89 | </view> |
83 | 90 | ||
84 | - <view style='padding-left:30rpx;background:#ffffff'> | 91 | + <!-- <view style='padding-left:30rpx;background:#ffffff'> |
85 | <image class='icon_wrap' src="/images/rectangle_icon.png"></image> | 92 | <image class='icon_wrap' src="/images/rectangle_icon.png"></image> |
86 | <text style='padding-left:20rpx' class='text_gray_32'>工资明细</text> | 93 | <text style='padding-left:20rpx' class='text_gray_32'>工资明细</text> |
87 | </view> | 94 | </view> |
@@ -102,63 +109,6 @@ | @@ -102,63 +109,6 @@ | ||
102 | <text class='text_wrap_left'>实发工资</text> | 109 | <text class='text_wrap_left'>实发工资</text> |
103 | <text class='text_wrap_right'>13860.00</text> | 110 | <text class='text_wrap_right'>13860.00</text> |
104 | </view> | 111 | </view> |
105 | - </view> | ||
106 | - </scroll-view> --> | ||
107 | - | ||
108 | - <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange"> | ||
109 | - <view style='padding: 0 30rpx;background:#2F72E0'> | ||
110 | - <text class='text_white_28'>{{choosed_date}}</text> | ||
111 | - <view class='float_right'> | ||
112 | - <image class='arrow_wrap' src='/images/arrow_down.png'></image> | ||
113 | - </view> | ||
114 | - </view> | ||
115 | - </picker> | ||
116 | - <view class="swiper-tab" style='display:flex'> | ||
117 | - <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" style="margin:0 90rpx" data-current="0" bindtap="swichNav">预扣预缴</view> | ||
118 | - <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" style="margin:0 90rpx" data-current="1" bindtap="swichNav">工资明细</view> | ||
119 | - </view> | ||
120 | - <view style='height:10rpx;background:#f8f8f8'></view> | ||
121 | - <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange"> | ||
122 | - <view wx:if="{{currentTab==0}}"> | ||
123 | - <view wx:for="{{datas}}" style='margin-bottom:20rpx'> | ||
124 | - <view class='card_rectangle_bg_column' style='padding:30rpx'> | ||
125 | - <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:工资薪金</text> | ||
126 | - <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view> | ||
127 | - <text class='text_666_28'>累计收入额:10800.00</text> | ||
128 | - <text class='text_666_28'>累计应缴纳所得额:43800.00</text> | ||
129 | - <text class='text_666_28'>累计应扣缴税额:1860.00</text> | ||
130 | - <text class='text_666_28'>已预交税额:1130.00</text> | ||
131 | - <text class='text_666_28'>本期应缴税额:730.00</text> | ||
132 | - </view> | ||
133 | - </view> | ||
134 | - </view> | ||
135 | - <view wx:else> | ||
136 | - <view wx:for="{{datas}}" style='margin-bottom:20rpx'> | ||
137 | - <view class='card_rectangle_bg_column' style='padding:30rpx'> | ||
138 | - <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:业务部八月工资</text> | ||
139 | - <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view> | ||
140 | - <text class='text_666_28'>发薪日:2018、10、31</text> | ||
141 | - <text class='text_666_28'>计薪时间:2018/10/01-2018/10/31</text> | ||
142 | - <text class='text_666_28'>应发额度:23460.00</text> | ||
143 | - <text class='text_666_28'>实发:13980.00</text> | ||
144 | - <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view> | ||
145 | - <view wx:if="{{!isshow}}" bindtap='gospan'> | ||
146 | - <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text> | ||
147 | - <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image> | ||
148 | - </view> | ||
149 | - <view wx:if="{{isshow}}" bindtap='gospan'> | ||
150 | - <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text> | ||
151 | - <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image> | ||
152 | - </view> | ||
153 | - <view wx:if="{{isshow}}" wx:for="{{datas}}"> | ||
154 | - <view> | ||
155 | - <text style='font-size:28rpx;color:#999;text-align:left'>中文姓名</text> | ||
156 | - <text style='font-size:28rpx;color:#999;text-align:right'>嘎嘎</text> | ||
157 | - </view> | ||
158 | - </view> | ||
159 | - </view> | ||
160 | - </view> | ||
161 | - | ||
162 | - </view> | ||
163 | - </view> | ||
164 | -</view> | ||
112 | + </view> --> | ||
113 | + </scroll-view> | ||
114 | +</view> |
@@ -5,42 +5,73 @@ var baseUrl = app.globalData.baseUrl; | @@ -5,42 +5,73 @@ var baseUrl = app.globalData.baseUrl; | ||
5 | 5 | ||
6 | Page({ | 6 | Page({ |
7 | 7 | ||
8 | - /** | ||
9 | - * Page initial data | ||
10 | - */ | ||
11 | data: { | 8 | data: { |
12 | // tab切换 | 9 | // tab切换 |
13 | isshow : false, | 10 | isshow : false, |
14 | currentTab: 0, | 11 | currentTab: 0, |
15 | - datas:["","",""], | 12 | + datas: [{ |
13 | + "id": "154024896031100928", | ||
14 | + "created_at": 1511525284, | ||
15 | + "updated_at": 1511525284, | ||
16 | + "tenant_id": "122371433052508160", | ||
17 | + "taxation_method": "salary", // 个税申报类型:"0101"-工资薪金 "0401"-劳务报酬 | ||
18 | + "sub_taxation_method": "salary", // 正 | ||
19 | + "province": "北京市", | ||
20 | + "province_code": "110000", | ||
21 | + "city": "市辖区", | ||
22 | + "city_code": "110100", | ||
23 | + "district": "东城", | ||
24 | + "district_code": "110101", | ||
25 | + "name": "徐恒堂", //姓名 | ||
26 | + "credential_type": "身份证", | ||
27 | + "credential_number": "110221198301270632", //证件号码 | ||
28 | + "personal_tax": 475.6, //本期应缴税额 | ||
29 | + "prepay_tax": 475.6, //已预交税额 | ||
30 | + "accumulated_taxable_income": 475.6, //累计应纳税所得额 | ||
31 | + "accumulated_withholding_tax": 475.6, //累计应扣缴税额 | ||
32 | + "prepay_tax": 475.6, //已预交税额 | ||
33 | + "option_date": 152135596800 | ||
34 | + }], | ||
16 | choosed_date: '', | 35 | choosed_date: '', |
17 | long_date: 0 | 36 | long_date: 0 |
18 | }, | 37 | }, |
19 | - | ||
20 | - /** | ||
21 | - * Lifecycle function--Called when page load | ||
22 | - */ | ||
23 | onLoad: function(options) { | 38 | onLoad: function(options) { |
24 | var mydate = new Date(); | 39 | var mydate = new Date(); |
25 | this.setData({ | 40 | this.setData({ |
26 | choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth()+1)+"月", | 41 | choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth()+1)+"月", |
27 | long_date: mydate.getTime()/1000 | 42 | long_date: mydate.getTime()/1000 |
28 | }) | 43 | }) |
29 | - }, | ||
30 | 44 | ||
31 | - /** | ||
32 | - * Lifecycle function--Called when page is initially rendered | ||
33 | - */ | ||
34 | - onReady: function() { | ||
35 | 45 | ||
46 | + var that = this | ||
47 | + var Authorization = getApp().globalData.Authorization; | ||
48 | + //OSS 上传前init | ||
49 | + wx.showLoading() | ||
50 | + wx.request({ | ||
51 | + url: baseUrl + "payroll/v1/tax/person-records", | ||
52 | + header: { | ||
53 | + 'Authorization': Authorization | ||
54 | + }, | ||
55 | + success: function (result) { | ||
56 | + that.setData({ | ||
57 | + datas: result.items | ||
58 | + }) | ||
59 | + | ||
60 | + }, | ||
61 | + fail: function (res) { | ||
62 | + console.log('OSS init 失败', res) | ||
63 | + }, | ||
64 | + complete: function () { | ||
65 | + wx.hideLoading() | ||
66 | + } | ||
67 | + }) | ||
36 | }, | 68 | }, |
37 | 69 | ||
38 | - /** | ||
39 | - * Lifecycle function--Called when page show | ||
40 | - */ | ||
41 | - onShow: function() { | ||
42 | - | ||
43 | - }, | 70 | + // handleData: function (items) { |
71 | + // for (var i = 0; i < items.length; ++i) { | ||
72 | + // if (items.taxation_method) | ||
73 | + // } | ||
74 | + // }, | ||
44 | 75 | ||
45 | datePickerChange: function(e) { | 76 | datePickerChange: function(e) { |
46 | console.log("e",e) | 77 | console.log("e",e) |
@@ -82,39 +113,9 @@ Page({ | @@ -82,39 +113,9 @@ Page({ | ||
82 | isshow: !this.data.isshow | 113 | isshow: !this.data.isshow |
83 | }) | 114 | }) |
84 | }, | 115 | }, |
85 | - | ||
86 | - /** | ||
87 | - * Lifecycle function--Called when page hide | ||
88 | - */ | ||
89 | - onHide: function() { | ||
90 | - | ||
91 | - }, | ||
92 | - | ||
93 | - /** | ||
94 | - * Lifecycle function--Called when page unload | ||
95 | - */ | ||
96 | - onUnload: function() { | ||
97 | - | ||
98 | - }, | ||
99 | - | ||
100 | - /** | ||
101 | - * Page event handler function--Called when user drop down | ||
102 | - */ | ||
103 | - onPullDownRefresh: function() { | ||
104 | - | ||
105 | - }, | ||
106 | - | ||
107 | - /** | ||
108 | - * Called when page reach bottom | ||
109 | - */ | ||
110 | - onReachBottom: function() { | ||
111 | - | 116 | + goItemDetails: function (e) { |
117 | + wx.navigateTo({ | ||
118 | + url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id | ||
119 | + }) | ||
112 | }, | 120 | }, |
113 | - | ||
114 | - /** | ||
115 | - * Called when user click on the top right corner to share | ||
116 | - */ | ||
117 | - onShareAppMessage: function() { | ||
118 | - | ||
119 | - } | ||
120 | }) | 121 | }) |
pages/main/advancepayment/adPayHome.wxml
0 → 100644
1 | +<!--pages/main/advancepayment/home.wxml--> | ||
2 | +<view> | ||
3 | + <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange"> | ||
4 | + <view style='padding: 0 30rpx;background:#2F72E0'> | ||
5 | + <text class='text_white_28'>{{choosed_date}}</text> | ||
6 | + <view class='float_right'> | ||
7 | + <image class='arrow_wrap' src='/images/arrow_down.png'></image> | ||
8 | + </view> | ||
9 | + </view> | ||
10 | + </picker> | ||
11 | + <view class="swiper-tab" style='display:flex'> | ||
12 | + <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" style="margin:0 90rpx" data-current="0" bindtap="swichNav">预扣预缴</view> | ||
13 | + <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" style="margin:0 90rpx" data-current="1" bindtap="swichNav">工资明细</view> | ||
14 | + </view> | ||
15 | + <view style='height:10rpx;background:#f8f8f8'></view> | ||
16 | + <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange"> | ||
17 | + <view wx:if="{{currentTab==0}}"> | ||
18 | + <view wx:for="{{datas}}" style='margin-bottom:20rpx'> | ||
19 | + <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'> | ||
20 | + <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.taxation_method=='salary'?'工资薪金':'劳务报酬'}}</text> | ||
21 | + <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view> | ||
22 | + <!-- <text class='text_666_28'>累计收入额:{{item.}}</text> --> | ||
23 | + <!-- <text class='text_666_28'>当期收入额:{{item.}}</text> --> | ||
24 | + <text class='text_666_28'>累计应缴纳所得额:{{item.accumulated_taxable_income}}</text> | ||
25 | + <text class='text_666_28'>累计应扣缴税额:{{item.accumulated_withholding_tax}}</text> | ||
26 | + <text class='text_666_28'>已预交税额:{{item.prepay_tax}}</text> | ||
27 | + <text class='text_666_28'>本期应缴税额:{{item.personal_tax}}</text> | ||
28 | + </view> | ||
29 | + </view> | ||
30 | + </view> | ||
31 | + <view wx:else> | ||
32 | + <view wx:for="{{datas}}" style='margin-bottom:20rpx'> | ||
33 | + <view class='card_rectangle_bg_column' style='padding:30rpx'> | ||
34 | + <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:业务部八月工资</text> | ||
35 | + <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view> | ||
36 | + <text class='text_666_28'>发薪日:2018、10、31</text> | ||
37 | + <text class='text_666_28'>计薪时间:2018/10/01-2018/10/31</text> | ||
38 | + <text class='text_666_28'>应发额度:23460.00</text> | ||
39 | + <text class='text_666_28'>实发:13980.00</text> | ||
40 | + <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view> | ||
41 | + <view wx:if="{{!isshow}}" bindtap='gospan'> | ||
42 | + <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text> | ||
43 | + <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image> | ||
44 | + </view> | ||
45 | + <view wx:if="{{isshow}}" bindtap='gospan'> | ||
46 | + <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text> | ||
47 | + <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image> | ||
48 | + </view> | ||
49 | + <view wx:if="{{isshow}}" wx:for="{{datas}}"> | ||
50 | + <view> | ||
51 | + <text style='font-size:28rpx;color:#999;text-align:left'>中文姓名</text> | ||
52 | + <text style='font-size:28rpx;color:#999;text-align:right'>嘎嘎</text> | ||
53 | + </view> | ||
54 | + </view> | ||
55 | + </view> | ||
56 | + </view> | ||
57 | + | ||
58 | + </view> | ||
59 | + </view> | ||
60 | +</view> |
@@ -54,7 +54,7 @@ | @@ -54,7 +54,7 @@ | ||
54 | margin-top:20rpx | 54 | margin-top:20rpx |
55 | } | 55 | } |
56 | 56 | ||
57 | -/* .payment_img_bg { | 57 | +.payment_img_bg { |
58 | width: 92%; | 58 | width: 92%; |
59 | height: 312rpx; | 59 | height: 312rpx; |
60 | } | 60 | } |
@@ -106,4 +106,4 @@ | @@ -106,4 +106,4 @@ | ||
106 | color: #000; | 106 | color: #000; |
107 | text-align: right; | 107 | text-align: right; |
108 | float: right | 108 | float: right |
109 | -} */ | 109 | +} |
@@ -61,7 +61,7 @@ Page({ | @@ -61,7 +61,7 @@ Page({ | ||
61 | '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证' | 61 | '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证' |
62 | ], | 62 | ], |
63 | onChange: 'onPickerSelect' | 63 | onChange: 'onPickerSelect' |
64 | - }, | 64 | +}, |
65 | forignerInfo: { | 65 | forignerInfo: { |
66 | isrequre: true, | 66 | isrequre: true, |
67 | label: '是否境外人员', | 67 | label: '是否境外人员', |
@@ -205,7 +205,7 @@ Page({ | @@ -205,7 +205,7 @@ Page({ | ||
205 | onChange: 'contactAddressSelect' | 205 | onChange: 'contactAddressSelect' |
206 | }, | 206 | }, |
207 | currentaddressInfo: { | 207 | currentaddressInfo: { |
208 | - label: '居住地', | 208 | + label: '经常居住地址', |
209 | mode: 'region', | 209 | mode: 'region', |
210 | address_code: ['', '', ''], | 210 | address_code: ['', '', ''], |
211 | address_value: ['', '', ''], | 211 | address_value: ['', '', ''], |
@@ -214,7 +214,7 @@ Page({ | @@ -214,7 +214,7 @@ Page({ | ||
214 | onChange: 'currentAddressSelect' | 214 | onChange: 'currentAddressSelect' |
215 | }, | 215 | }, |
216 | birthaddressInfo: { | 216 | birthaddressInfo: { |
217 | - label: '户籍所在地', | 217 | + label: '户籍地址', |
218 | mode: 'region', | 218 | mode: 'region', |
219 | address_code: ['', '', ''], | 219 | address_code: ['', '', ''], |
220 | address_value: ['', '', ''], | 220 | address_value: ['', '', ''], |
@@ -289,7 +289,7 @@ Page({ | @@ -289,7 +289,7 @@ Page({ | ||
289 | this.data.relativeData.disabled = false | 289 | this.data.relativeData.disabled = false |
290 | this.data.relativeData.selected = tax_info.family_ties | 290 | this.data.relativeData.selected = tax_info.family_ties |
291 | } | 291 | } |
292 | - if (tax_info.certification_status == 'active') { | 292 | + if (tax_info.certification_status == 'active') {//已通过拍摄身份证认证过,不能修改 |
293 | this.data.genderData.disabled = true | 293 | this.data.genderData.disabled = true |
294 | this.data.birthDate.disabled = true | 294 | this.data.birthDate.disabled = true |
295 | this.data.cardtypeData.disabled = true | 295 | this.data.cardtypeData.disabled = true |
@@ -923,31 +923,36 @@ Page({ | @@ -923,31 +923,36 @@ Page({ | ||
923 | "name": that.data.name, | 923 | "name": that.data.name, |
924 | "family_ties": that.data.relativeData.selected, | 924 | "family_ties": that.data.relativeData.selected, |
925 | "native": "中国", | 925 | "native": "中国", |
926 | + "taxpayer_type":"居民", | ||
927 | + "is_overseas_personnel": "否", | ||
926 | "id_card_type": that.data.cardtypeData.selected, | 928 | "id_card_type": that.data.cardtypeData.selected, |
927 | "id_card_no": that.data.card_number, | 929 | "id_card_no": that.data.card_number, |
928 | "gender": that.data.genderData.selected, | 930 | "gender": that.data.genderData.selected, |
929 | "birth_date": that.data.long_birth_date, | 931 | "birth_date": that.data.long_birth_date, |
930 | - "profession": request_profession, | ||
931 | - "education": that.data.degreeData.selected, | ||
932 | - "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no, | ||
933 | - // "taxpayer_status": that.data.personstatusData.selected, | ||
934 | - "is_martyr_family": that.data.lieshuInfo.selected, | ||
935 | - "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : (formdata.martyr_family_no.length > 0 ? formdata.martyr_family_no : that.data.taxInfo.martyr_family_no), | ||
936 | - "is_disability": that.data.disabilityInfo.selected, | ||
937 | - "disability_no": that.data.disabilityInfo.selected == '否' ? '' : (formdata.disability_no.length > 0 ? formdata.disability_no : that.data.taxInfo.disability_no), | ||
938 | - "is_lonely_man": that.data.lonelyolderInfo.selected, | ||
939 | - "is_overseas_personnel": "否", | ||
940 | - "comment": formdata.comment.length > 0 ? formdata.comment : that.data.taxInfo.comment, | 932 | + |
933 | + "mobile": that.data.mobile, | ||
941 | "current_address": request_current_address, | 934 | "current_address": request_current_address, |
942 | "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail, | 935 | "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail, |
943 | "huji_address": request_birth_address, | 936 | "huji_address": request_birth_address, |
944 | "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "").length > 0 ? formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "") : that.data.huji_address_detail, | 937 | "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "").length > 0 ? formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "") : that.data.huji_address_detail, |
945 | - "mobile": that.data.mobile, | ||
946 | - "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail, | ||
947 | - "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail, | ||
948 | "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email, | 938 | "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email, |
939 | + | ||
940 | + "profession": request_profession, | ||
941 | + "education": that.data.degreeData.selected, | ||
949 | "bank": that.data.bankInfo.selected, | 942 | "bank": that.data.bankInfo.selected, |
950 | "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account, | 943 | "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account, |
944 | + // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no, | ||
945 | + // "taxpayer_status": that.data.personstatusData.selected, | ||
946 | + "is_disability": that.data.disabilityInfo.selected, | ||
947 | + "disability_no": that.data.disabilityInfo.selected == '否' ? '' : (formdata.disability_no.length > 0 ? formdata.disability_no : that.data.taxInfo.disability_no), | ||
948 | + "is_martyr_family": that.data.lieshuInfo.selected, | ||
949 | + "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : (formdata.martyr_family_no.length > 0 ? formdata.martyr_family_no : that.data.taxInfo.martyr_family_no), | ||
950 | + "is_lonely_man": that.data.lonelyolderInfo.selected, | ||
951 | + "comment": formdata.comment.length > 0 ? formdata.comment : that.data.taxInfo.comment, | ||
952 | + | ||
953 | + // "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail, | ||
954 | + // "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail, | ||
955 | + | ||
951 | // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date, | 956 | // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date, |
952 | // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date, | 957 | // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date, |
953 | // "is_employee": that.data.employeeInfo.selected, | 958 | // "is_employee": that.data.employeeInfo.selected, |
@@ -62,7 +62,18 @@ | @@ -62,7 +62,18 @@ | ||
62 | <text class='text_999_30 float_right' style='line-height: 90rpx'>中国</text> | 62 | <text class='text_999_30 float_right' style='line-height: 90rpx'>中国</text> |
63 | </view> | 63 | </view> |
64 | <view class="divide_line"></view> | 64 | <view class="divide_line"></view> |
65 | - | 65 | + <view class='item_body'> |
66 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
67 | + <text class='text_black_30 float_left' style='line-height: 90rpx'>纳税人类型</text> | ||
68 | + <text class='text_999_30 float_right' style='line-height: 90rpx'>居民</text> | ||
69 | + </view> | ||
70 | + <view class="divide_line"></view> | ||
71 | + <view class='item_body'> | ||
72 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
73 | + <text class='text_black_30 float_left' style='line-height: 90rpx'>是否境外人员</text> | ||
74 | + <text class='text_999_30 float_right' style='line-height: 90rpx'>否</text> | ||
75 | + </view> | ||
76 | + <view class="divide_line"></view> | ||
66 | <!-- <view class='item_body'> | 77 | <!-- <view class='item_body'> |
67 | <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> | 78 | <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> |
68 | <text class='text_black_28 float_left'>纳税人状态</text> | 79 | <text class='text_black_28 float_left'>纳税人状态</text> |
@@ -99,7 +110,6 @@ | @@ -99,7 +110,6 @@ | ||
99 | bindblur='bindinputcardnum' maxlength='24'></input> | 110 | bindblur='bindinputcardnum' maxlength='24'></input> |
100 | </view> | 111 | </view> |
101 | </view> | 112 | </view> |
102 | - <view class="divide_line"></view> | ||
103 | 113 | ||
104 | <!-- <view class='item_body'> | 114 | <!-- <view class='item_body'> |
105 | <text class='head_red_star float_left'>*</text> | 115 | <text class='head_red_star float_left'>*</text> |
@@ -107,7 +117,7 @@ | @@ -107,7 +117,7 @@ | ||
107 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> | 117 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> |
108 | <text class='text_333_28 float_right'>否</text> | 118 | <text class='text_333_28 float_right'>否</text> |
109 | </view> --> | 119 | </view> --> |
110 | - <template is="picker_cell_normal" data="{{...forignerInfo}}" /> | 120 | + <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> --> |
111 | <!-- 非必填部分 --> | 121 | <!-- 非必填部分 --> |
112 | <view hidden='{{!isshow01}}'> | 122 | <view hidden='{{!isshow01}}'> |
113 | <view class="divide_line"></view> | 123 | <view class="divide_line"></view> |
@@ -124,62 +134,7 @@ | @@ -124,62 +134,7 @@ | ||
124 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> | 134 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> |
125 | <text class='text_333_28 float_right'></text> | 135 | <text class='text_333_28 float_right'></text> |
126 | </view> --> | 136 | </view> --> |
127 | - <template is="picker_cell_normal" data="{{...birthDate}}" /> | ||
128 | - <view class="divide_line"></view> | ||
129 | - <!-- <view class='item_body'> | ||
130 | - <text class='text_666_28 float_left'>职业</text> | ||
131 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
132 | - <text class='text_333_28 float_right'></text> | ||
133 | - </view> --> | ||
134 | - <template is="picker_cell_normal" data="{{...professionData}}" /> | ||
135 | - <view class="divide_line"></view> | ||
136 | - <!-- <view class='item_body'> | ||
137 | - <text class='text_666_28 float_left'>学历</text> | ||
138 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
139 | - <text class='text_333_28 float_right'></text> | ||
140 | - </view> --> | ||
141 | - <template is="picker_cell_normal" data="{{...degreeData}}" /> | ||
142 | - <view class="divide_line"></view> | ||
143 | - <view class='item_body'> | ||
144 | - <text class='text_666_30 float_left' style='line-height: 90rpx'>纳税人识别号</text> | ||
145 | - <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_30' placeholder='请输入纳税人识别号' maxlength='24'></input> | ||
146 | - </view> | ||
147 | - <view class="divide_line"></view> | ||
148 | - <!-- <view class='item_body'> | ||
149 | - <text class='text_666_28 float_left'>是否残疾</text> | ||
150 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
151 | - <text class='text_333_28 float_right'></text> | ||
152 | - </view> --> | ||
153 | - <template is="picker_cell_normal" data="{{...disabilityInfo}}" /> | ||
154 | - <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view> | ||
155 | - <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}"> | ||
156 | - <text class='text_666_30 float_left'>残疾证号</text> | ||
157 | - <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input> | ||
158 | - </view> | ||
159 | - <view class="divide_line"></view> | ||
160 | - <!-- <view class='item_body'> | ||
161 | - <text class='text_666_28 float_left'>是否烈属</text> | ||
162 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
163 | - <text class='text_333_28 float_right'></text> | ||
164 | - </view> --> | ||
165 | - <template is="picker_cell_normal" data="{{...lieshuInfo}}" /> | ||
166 | - <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view> | ||
167 | - <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}"> | ||
168 | - <text class='text_666_30 float_left'>烈属证号</text> | ||
169 | - <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> | ||
170 | - </view> | ||
171 | - <view class="divide_line"></view> | ||
172 | - <!-- <view class='item_body'> | ||
173 | - <text class='text_666_28 float_left'>是否孤老</text> | ||
174 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
175 | - <text class='text_333_28 float_right'></text> | ||
176 | - </view> --> | ||
177 | - <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" /> | ||
178 | - <view class="divide_line"></view> | ||
179 | - <view class='item_body'> | ||
180 | - <text class='text_666_30 float_left' style='line-height: 90rpx'>备注</text> | ||
181 | - <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_30' placeholder='请输入备注'></input> | ||
182 | - </view> | 137 | + <template is="picker_cell_normal" data="{{...birthDate}}" /> |
183 | </view> | 138 | </view> |
184 | </view> | 139 | </view> |
185 | </view> | 140 | </view> |
@@ -199,6 +154,11 @@ | @@ -199,6 +154,11 @@ | ||
199 | 154 | ||
200 | <view class='data_list'> | 155 | <view class='data_list'> |
201 | <view class='data_item'> | 156 | <view class='data_item'> |
157 | + <view class='item_body'> | ||
158 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
159 | + <text class='text_black_30 float_left' style='line-height: 90rpx'>手机号码</text> | ||
160 | + <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile'></input> | ||
161 | + </view> | ||
202 | <!-- <view class='item_body'> | 162 | <!-- <view class='item_body'> |
203 | <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> | 163 | <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> |
204 | <text class='text_black_30 float_left' style='line-height: 90rpx'>联系电话</text> | 164 | <text class='text_black_30 float_left' style='line-height: 90rpx'>联系电话</text> |
@@ -208,42 +168,25 @@ | @@ -208,42 +168,25 @@ | ||
208 | maxlength='11' bindblur='bindinputmobile'></input> | 168 | maxlength='11' bindblur='bindinputmobile'></input> |
209 | </view> --> | 169 | </view> --> |
210 | <!-- 非必填部分02 --> | 170 | <!-- 非必填部分02 --> |
211 | - <view hidden='{{!isshow02}}'> | ||
212 | - <view class="divide_line"></view> | ||
213 | - <view class='item_body'> | ||
214 | - <text class='text_666_30 float_left' style='line-height: 90rpx'>联系电话</text> | ||
215 | - <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile'></input> | ||
216 | - </view> | 171 | + <view hidden='{{!isshow02}}'> |
217 | <view class="divide_line"></view> | 172 | <view class="divide_line"></view> |
218 | <!-- <view class='item_body'> | 173 | <!-- <view class='item_body'> |
219 | <text class='text_666_28 float_left'>联系地址</text> | 174 | <text class='text_666_28 float_left'>联系地址</text> |
220 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> | 175 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> |
221 | <text class='text_333_28 float_right'></text> | 176 | <text class='text_333_28 float_right'></text> |
222 | </view> --> | 177 | </view> --> |
223 | - <template is="picker_cell_normal" data="{{...contactaddressInfo}}" /> | 178 | + <!-- <template is="picker_cell_normal" data="{{...contactaddressInfo}}" /> |
224 | <view class="divide_line"></view> | 179 | <view class="divide_line"></view> |
225 | <view class='item_body'> | 180 | <view class='item_body'> |
226 | <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text> | 181 | <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text> |
227 | <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}' placeholder-class='text_999_30' placeholder='请输入详细联系地址'></input> | 182 | <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}' placeholder-class='text_999_30' placeholder='请输入详细联系地址'></input> |
228 | </view> | 183 | </view> |
229 | - <view class="divide_line"></view> | 184 | + <view class="divide_line"></view> --> |
230 | <!-- <view class='item_body'> | 185 | <!-- <view class='item_body'> |
231 | <text class='text_666_28 float_left'>开户银行</text> | 186 | <text class='text_666_28 float_left'>开户银行</text> |
232 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> | 187 | <image class='arrow_wrap' src='/images/arrow_right.png'></image> |
233 | <text class='text_333_28 float_right'></text> | 188 | <text class='text_333_28 float_right'></text> |
234 | </view> --> | 189 | </view> --> |
235 | - <template is="picker_cell_normal" data="{{...bankInfo}}" /> | ||
236 | - <view class="divide_line"></view> | ||
237 | - <view class='item_body'> | ||
238 | - <text class='text_666_30 float_left' style='line-height: 90rpx'>银行账号</text> | ||
239 | - <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input> | ||
240 | - </view> | ||
241 | - <view class="divide_line"></view> | ||
242 | - <view class='item_body'> | ||
243 | - <text class='text_666_30 float_left' style='line-height: 90rpx'>电子邮箱</text> | ||
244 | - <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='20'></input> | ||
245 | - </view> | ||
246 | - <view class="divide_line"></view> | ||
247 | <!-- <view class=' item_body '> | 190 | <!-- <view class=' item_body '> |
248 | <text class='text_666_28 float_left '>居住地</text> | 191 | <text class='text_666_28 float_left '>居住地</text> |
249 | <image class='arrow_wrap ' src='/images/arrow_right.png '></image> | 192 | <image class='arrow_wrap ' src='/images/arrow_right.png '></image> |
@@ -268,11 +211,103 @@ | @@ -268,11 +211,103 @@ | ||
268 | <input class='input_wrap float_right ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input> | 211 | <input class='input_wrap float_right ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input> |
269 | </view> | 212 | </view> |
270 | <view class="divide_line"></view> | 213 | <view class="divide_line"></view> |
214 | + | ||
215 | + <view class='item_body'> | ||
216 | + <text class='text_666_30 float_left' style='line-height: 90rpx'>电子邮箱</text> | ||
217 | + <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='20'></input> | ||
218 | + </view> | ||
271 | </view> | 219 | </view> |
272 | 220 | ||
273 | </view> | 221 | </view> |
274 | </view> | 222 | </view> |
275 | 223 | ||
224 | +<!-- 其他信息 --> | ||
225 | + | ||
226 | + <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='3'> | ||
227 | + <text class='head_text_wrap1'>其他信息</text> | ||
228 | + <text class='head_text_wrap2' hidden='{{!isshow03}}'>(点击收起非必填选项)</text> | ||
229 | + <text class='head_text_wrap2' hidden='{{isshow03}}'>(点击展开非必填选项)</text> | ||
230 | + <view style='float:right' wx:if='{{isshow03}}'> | ||
231 | + <image class='head_image_wrap_up' src='/images/arrow_up.png'></image> | ||
232 | + </view> | ||
233 | + <view wx:else style='float:right'> | ||
234 | + <image class='head_image_wrap_down' src='/images/arrow_down.png'></image> | ||
235 | + </view> | ||
236 | + </view> | ||
237 | + <view class='data_list'> | ||
238 | + <view class='data_item'> | ||
239 | + <view hidden='{{!isshow03}}'> | ||
240 | + <!-- <view class='item_body'> | ||
241 | + <text class='text_666_28 float_left'>职业</text> | ||
242 | + <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
243 | + <text class='text_333_28 float_right'></text> | ||
244 | + </view> --> | ||
245 | + <!-- <view class='item_body'> | ||
246 | + <text class='text_666_28 float_left'>学历</text> | ||
247 | + <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
248 | + <text class='text_333_28 float_right'></text> | ||
249 | + </view> --> | ||
250 | + <template is="picker_cell_normal" data="{{...degreeData}}" /> | ||
251 | + <view class="divide_line"></view> | ||
252 | + <template is="picker_cell_normal" data="{{...professionData}}" /> | ||
253 | + <view class="divide_line"></view> | ||
254 | + <template is="picker_cell_normal" data="{{...bankInfo}}" /> | ||
255 | + <view class="divide_line"></view> | ||
256 | + <view class='item_body'> | ||
257 | + <text class='text_666_30 float_left' style='line-height: 90rpx'>银行账号</text> | ||
258 | + <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input> | ||
259 | + </view> | ||
260 | + <view class="divide_line"></view> | ||
261 | + | ||
262 | + <!-- <view class='item_body'> | ||
263 | + <text class='text_666_30 float_left' style='line-height: 90rpx'>纳税人识别号</text> | ||
264 | + <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_30' placeholder='请输入纳税人识别号' maxlength='24'></input> | ||
265 | + </view> | ||
266 | + <view class="divide_line"></view> --> | ||
267 | + <!-- <view class='item_body'> | ||
268 | + <text class='text_666_28 float_left'>是否残疾</text> | ||
269 | + <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
270 | + <text class='text_333_28 float_right'></text> | ||
271 | + </view> --> | ||
272 | + <template is="picker_cell_normal" data="{{...disabilityInfo}}" /> | ||
273 | + <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view> | ||
274 | + <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}"> | ||
275 | + <text class='text_666_30 float_left'>残疾证号</text> | ||
276 | + <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input> | ||
277 | + </view> | ||
278 | + <view class="divide_line"></view> | ||
279 | + <!-- <view class='item_body'> | ||
280 | + <text class='text_666_28 float_left'>是否烈属</text> | ||
281 | + <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
282 | + <text class='text_333_28 float_right'></text> | ||
283 | + </view> --> | ||
284 | + <template is="picker_cell_normal" data="{{...lieshuInfo}}" /> | ||
285 | + <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view> | ||
286 | + <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}"> | ||
287 | + <text class='text_666_30 float_left'>烈属证号</text> | ||
288 | + <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> | ||
289 | + </view> | ||
290 | + <view class="divide_line"></view> | ||
291 | + <!-- <view class='item_body'> | ||
292 | + <text class='text_666_28 float_left'>是否孤老</text> | ||
293 | + <image class='arrow_wrap' src='/images/arrow_right.png'></image> | ||
294 | + <text class='text_333_28 float_right'></text> | ||
295 | + </view> --> | ||
296 | + <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" /> | ||
297 | + <view class="divide_line"></view> | ||
298 | + <view class='item_body'> | ||
299 | + <text class='text_666_30 float_left' style='line-height: 90rpx'>备注</text> | ||
300 | + <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_30' placeholder='请输入备注'></input> | ||
301 | + </view> | ||
302 | + | ||
303 | + | ||
304 | + </view> | ||
305 | + | ||
306 | +</view> | ||
307 | + </view> | ||
308 | + | ||
309 | + | ||
310 | + | ||
276 | <!-- 任职雇佣信息 --> | 311 | <!-- 任职雇佣信息 --> |
277 | <!-- <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'> | 312 | <!-- <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'> |
278 | <text class='head_text_wrap1 '>任职受雇信息</text> | 313 | <text class='head_text_wrap1 '>任职受雇信息</text> |
@@ -135,7 +135,7 @@ Page({ | @@ -135,7 +135,7 @@ Page({ | ||
135 | 135 | ||
136 | getStatus: function(data) { | 136 | getStatus: function(data) { |
137 | console.log('data', data) | 137 | console.log('data', data) |
138 | - 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) { | 138 | + 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) { |
139 | this.setData({ | 139 | this.setData({ |
140 | text_tip: '去查看' | 140 | text_tip: '去查看' |
141 | }) | 141 | }) |
请
注册
或
登录
后发表评论