wangyu / naturalPersonTax · 提交

提交 5a5d76d9d5562c9baa15d2da3bbe60968725722b

作者 wangyu
2 个父辈 d80a1e05 6aa15aa4
构建： 未知

Merge branch 'dev_wy' into dev_无非居民

内嵌 并排对比
正在显示 7 个修改的文件 包含 303 行增加 和 90 行删除
... ... @@ -12,36 +12,38 @@ Page({
12 12 flag_housing02: false,
13 13 legal_entity_id: '',
14 14 legal_entity: '',
15   -
  15 + type: "",
  16 + selectdata: {},
16 17 selectIndex: [{
17   - message: '子女教育',
18   - disable_change: '',
19   - status: "children_education",
20   - sureid: false
21   - }, {
22   - message: '继续教育',
23   - disable_change: '',
24   - status: "continuing_education",
25   - sureid: false
26   - }, {
27   - message: '赡养老人',
28   - disable_change: '',
29   - status: "support_duty",
30   - sureid: false
31   - },
32   - // {
33   - // message: '大病医疗',
34   - // disable_change: '',
35   - // status: "medical_fund",
36   - // sureid: false
37   - // },
38   - {
39   - message: '住房',
40   - sureid: false,
41   - disable_change: '',
42   - status: "",
43   - extra_message: ''
44   - }, ],
  18 + message: '子女教育',
  19 + disable_change: '',
  20 + status: "children_education",
  21 + sureid: false
  22 + }, {
  23 + message: '继续教育',
  24 + disable_change: '',
  25 + status: "continuing_education",
  26 + sureid: false
  27 + }, {
  28 + message: '赡养老人',
  29 + disable_change: '',
  30 + status: "support_duty",
  31 + sureid: false
  32 + },
  33 + // {
  34 + // message: '大病医疗',
  35 + // disable_change: '',
  36 + // status: "medical_fund",
  37 + // sureid: false
  38 + // },
  39 + {
  40 + message: '住房',
  41 + sureid: false,
  42 + disable_change: '',
  43 + status: "",
  44 + extra_message: ''
  45 + },
  46 + ],
45 47 },
46 48
47 49 /**
... ... @@ -51,9 +53,13 @@ Page({
51 53 console.log("onLoad", options)
52 54 this.setData({
53 55 legal_entity_id: options.legal_entity_id,
54   - legal_entity: options.legal_entity
  56 + legal_entity: options.legal_entity,
  57 + type: options.type,
  58 + selectdata: options.select_data ? JSON.parse(options.select_data) : {}
55 59 })
56   -
  60 + if (options.type == '1' && options.select_data && JSON.parse(options.select_data)) {
  61 + this.handleData(JSON.parse(options.select_data))
  62 + }
57 63 },
58 64
59 65 /**
... ... @@ -70,6 +76,52 @@ Page({
70 76
71 77 },
72 78
  79 + handleData: function(data) {
  80 + var selectarray = data.addition_items;
  81 + console.log("handleData", data)
  82 + var selectIndex = this.data.selectIndex;
  83 +
  84 + if (selectarray.length > 0) {
  85 + wx.showLoading({
  86 + title: '',
  87 + })
  88 + for (var i = 0; i < selectarray.length; i++) {
  89 + if (selectarray[i].addition_category == 'children_education') { //子女教育
  90 + selectIndex[0].sureid = true
  91 + selectIndex[0].disable_change = true
  92 + }
  93 + if (selectarray[i].addition_category == 'continuing_education') { //继续教育
  94 + selectIndex[1].sureid = true
  95 + selectIndex[1].disable_change = true
  96 + }
  97 + if (selectarray[i].addition_category == 'support_duty') { //赡养老人
  98 + selectIndex[2].sureid = true
  99 + selectIndex[2].disable_change = true
  100 + }
  101 + if (selectarray[i].addition_category == 'house_fund_rent') { //住房（租房）
  102 + selectIndex[3].sureid = true
  103 + selectIndex[3].disable_change = true
  104 + this.setData({
  105 + flag_housing01: false,
  106 + flag_housing02: true,
  107 + })
  108 + }
  109 + if (selectarray[i].addition_category == 'house_fund_loan') { //住房（租房）
  110 + selectIndex[3].sureid = true
  111 + selectIndex[3].disable_change = true
  112 + this.setData({
  113 + flag_housing01: true,
  114 + flag_housing02: false,
  115 + })
  116 + }
  117 + }
  118 + this.setData({
  119 + selectIndex: selectIndex
  120 + })
  121 + wx.hideLoading()
  122 + }
  123 + },
  124 +
73 125 selectRep: function(e) {
74 126 let index = e.currentTarget.dataset.selectindex;
75 127 let selectIndex = this.data.selectIndex; //取到data里的selectIndex
... ... @@ -136,7 +188,7 @@ Page({
136 188 } else {
137 189 wx.showToast({
138 190 title: '请选择住房类型',
139   - icon:"none"
  191 + icon: "none"
140 192 })
141 193 return;
142 194 }
... ... @@ -155,8 +207,12 @@ Page({
155 207 })
156 208 return;
157 209 }
158   - this.goDeclare(stuatusarray)
159   -
  210 + if (this.data.type == '0') {
  211 + this.goDeclare(stuatusarray)
  212 + } else if (this.data.type == '1'){
  213 + this.goUpdate(stuatusarray)
  214 + // this.goDeclare(stuatusarray)
  215 + }
160 216 },
161 217
162 218 goDeclare: function(array) {
... ... @@ -175,11 +231,46 @@ Page({
175 231 "Authorization": Authorization
176 232 },
177 233 success: function(res) {
178   - if (res && res.data) {
179   - console.log("res", res)
  234 + if (res.statusCode == 200) {
180 235 wx.redirectTo({
181 236 url: '../godetail/godetail?datas=' + JSON.stringify(res.data)
182 237 })
  238 + } else {
  239 + wx.showToast({
  240 + title: res.data.message,
  241 + icon: 'none'
  242 + })
  243 + }
  244 + }
  245 + })
  246 + },
  247 +
  248 + goUpdate: function (array) {
  249 + var that = this;
  250 + var Authorization = getApp().globalData.Authorization;
  251 + wx.request({
  252 + url: baseUrl + 'persontax/v1/update-addition-setting',
  253 + data: {
  254 + "legal_entity_id": that.data.legal_entity_id,
  255 + "id": that.data.selectdata?that.data.selectdata.id:'',
  256 + "options": array
  257 + },
  258 + method: "PUT",
  259 + header: {
  260 + 'content-type': 'application/json',
  261 + "Authorization": Authorization
  262 + },
  263 + success: function (res) {
  264 + console.log("res", res)
  265 + if (res.statusCode==200) {
  266 + wx.redirectTo({
  267 + url: '../godetail/godetail?datas=' + JSON.stringify(res.data.item)
  268 + })
  269 + }else{
  270 + wx.showToast({
  271 + title: res.data.message,
  272 + icon:'none'
  273 + })
183 274 }
184 275 }
185 276 })
... ...
... ... @@ -12,7 +12,7 @@
12 12 <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
13 13
14 14 <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx'>
15   - <view data-selectIndex="{{index}}" bindtap="selectRep">
  15 + <view data-selectIndex="{{index}}" bindtap="selectRep" >
16 16 <view class='float_left'>
17 17 <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" style='margin-top:20rpx' />
18 18 </view>
... ...
... ... @@ -8,36 +8,76 @@ Page({
8 8 * Page initial data
9 9 */
10 10 data: {
  11 + additiontitle: {
  12 + "children_education": "子女教育",
  13 + "continuing_education": "继续教育",
  14 + "support_duty": "赡养老人",
  15 + "medical_fund": "大病医疗",
  16 + "house_fund_rent": "住房",
  17 + "house_fund_loan": "住房",
  18 + "house_fund": "住房"
  19 + },
  20 + reducetype: {
  21 + "": "月",
  22 + "month": "月",
  23 + "year": "年"
  24 + },
11 25 additiondata: {}
12 26 },
13 27
14 28 /**
15 29 * Lifecycle function--Called when page load
16 30 */
17   - onLoad: function (options) {
18   - console.log("onLoad", options.datas)
19   - this.setData({
20   - additiondata: JSON.parse(options.datas)
21   - })
  31 + onLoad: function(options) {
  32 + console.log("onLoad", options)
  33 + if (options.datas) {
  34 + this.setData({
  35 + additiondata: this.handleData(JSON.parse(options.datas))
  36 + })
  37 + }
22 38 },
23 39
24 40 /**
25 41 * Lifecycle function--Called when page is initially rendered
26 42 */
27   - onReady: function () {
  43 + onReady: function() {
28 44
29 45 },
30 46
31 47 /**
32 48 * Lifecycle function--Called when page show
33 49 */
34   - onShow: function () {
  50 + onShow: function() {
  51 +
  52 + },
35 53
  54 + handleData: function(data) {
  55 + if (data.addition_items && data.addition_items.length>0){
  56 + for (var j = 0; j < data.addition_items.length; j++) {
  57 + var midItem = data.addition_items[j]
  58 + if (midItem.addition_category == 'continuing_education') {
  59 + var majors = [],
  60 + professions = []
  61 + for (var k = 0; k < midItem.detail_items.length; k++) {
  62 + var smallItem = midItem.detail_items[k]
  63 + if (smallItem.continue_education_type == 'major') {
  64 + majors.push(smallItem)
  65 + } else if (smallItem.continue_education_type == 'nomajor') {
  66 + professions.push(smallItem)
  67 + }
  68 + }
  69 + data.addition_items[j].majors = majors
  70 + data.addition_items[j].professions = professions
  71 + break;
  72 + }
  73 + }
  74 + }
  75 + return data
36 76 },
37 77
38   - lookandadd:function(e){
  78 + lookandadd: function(e) {
39 79 console.log("lookandadd", e);
40   - if (this.data.additiondata.options && this.data.additiondata.options.length>0){
  80 + if (this.data.additiondata.options && this.data.additiondata.options.length > 0) {
41 81 var newstatus = this.data.additiondata.options[e.currentTarget.id]
42 82 // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
43 83 // newstatus = "house_fund"
... ... @@ -48,38 +88,48 @@ Page({
48 88 }
49 89 },
50 90
  91 + lookandadd02: function (e) {
  92 + console.log("lookandadd02", e);
  93 + if (this.data.additiondata.addition_items && this.data.additiondata.addition_items.length > 0) {
  94 + var newstatus = this.data.additiondata.addition_items[e.currentTarget.id].addition_category
  95 + wx.navigateTo({
  96 + url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
  97 + })
  98 + }
  99 + },
  100 +
51 101 /**
52 102 * Lifecycle function--Called when page hide
53 103 */
54   - onHide: function () {
  104 + onHide: function() {
55 105
56 106 },
57 107
58 108 /**
59 109 * Lifecycle function--Called when page unload
60 110 */
61   - onUnload: function () {
  111 + onUnload: function() {
62 112
63 113 },
64 114
65 115 /**
66 116 * Page event handler function--Called when user drop down
67 117 */
68   - onPullDownRefresh: function () {
  118 + onPullDownRefresh: function() {
69 119
70 120 },
71 121
72 122 /**
73 123 * Called when page reach bottom
74 124 */
75   - onReachBottom: function () {
  125 + onReachBottom: function() {
76 126
77 127 },
78 128
79 129 /**
80 130 * Called when user click on the top right corner to share
81 131 */
82   - onShareAppMessage: function () {
  132 + onShareAppMessage: function() {
83 133
84 134 }
85 135 })
\ No newline at end of file
... ...
... ... @@ -3,12 +3,12 @@
3 3 <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
4 4
5 5 <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
6   - <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx" >
7   - <view wx:if="{{item=='children_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
  6 + <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx">
  7 + <view wx:if="{{item=='children_education'}}" style='margin:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
8 8 <view style='height:40rpx'>
9 9 <text class='text_333_32 float_left'>子女教育</text>
10 10 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
11   - <text class='text_999_28' style='float:right' >查看</text>
  11 + <text class='text_999_28' style='float:right'>查看</text>
12 12 </view>
13 13 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
14 14 <view class='float_left' style='flex:1'>
... ... @@ -66,7 +66,7 @@
66 66 </view>
67 67 </view> -->
68 68 </view>
69   - <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column' bindtap='lookandadd' id='{{idx}}'>
  69 + <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column' bindtap='lookandadd' id='{{idx}}'>
70 70 <view style='height:40rpx'>
71 71 <text class='text_333_32 float_left'>大病医疗</text>
72 72 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
... ... @@ -83,11 +83,11 @@
83 83 </view>
84 84 </view>
85 85 </view>
86   - <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
  86 + <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx}}'>
87 87 <view style='height:40rpx'>
88 88 <text class='text_333_32 float_left'>赡养老人</text>
89 89 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
90   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
  90 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
91 91 </view>
92 92 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
93 93 <view class='float_left' style='flex:1'>
... ... @@ -104,7 +104,7 @@
104 104 <view style='height:40rpx'>
105 105 <text class='text_333_32 float_left'>住房</text>
106 106 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
107   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' >查看</text>
  107 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
108 108 </view>
109 109 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
110 110 <view class='float_left' style='flex:1'>
... ... @@ -121,4 +121,65 @@
121 121 </block>
122 122 </view>
123 123
  124 + <view wx:elif="{{additiondata.addition_items&&additiondata.addition_items.length>0}}">
  125 + <block wx:for="{{additiondata.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx">
  126 + <view wx:if="{{itemData.addition_category!='medical_fund'}}">
  127 + <view style='margin:0 50rpx;background:#e5e5e5;height:2rpx;'></view>
  128 + <view style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd02' id='{{idx}}'>
  129 + <view style='height:40rpx'>
  130 + <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
  131 + <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
  132 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  133 + <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
  134 + </view>
  135 + <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
  136 + <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
  137 + <view wx:if="{{index==0}}">
  138 + <text wx:if='{{itemData.majors.length>1}}' style='font-size:28rpx;color:#666'>学历(学位)继续教育 ({{itemData.majors.length}})</text>
  139 + <text wx:else style='font-size:28rpx;color:#666'>学历(学位)继续教育</text>
  140 + <view style='width:100%;display:flex;flex-direction:row '>
  141 + <view class='float_left' style='flex:1'>
  142 + <text class='text_999_24 '>扣除方式</text>
  143 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[major.deduction_type]}}度</text>
  144 + </view>
  145 + <view class='float_right' style='flex:1'>
  146 + <text class='text_999_24 '>可扣除金额</text>
  147 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{major.deduction_amount}}/{{reducetype[major.deduction_type]}}</text>
  148 + </view>
  149 + </view>
  150 + </view>
  151 + </view>
  152 + <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">
  153 + <view wx:if="{{index==0}}">
  154 + <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>职业资格继续教育 ({{itemData.professions.length}})</text>
  155 + <text wx:else style='font-size:28rpx;color:#666'>职业资格继续教育</text>
  156 + <text style='font-size:28rpx;color:#666' hidden='{{profession.detail_count<2}}'>（{{profession.detail_count}}）</text>
  157 + <view style='width:100%;display:flex;flex-direction:row '>
  158 + <view class='float_left' style='flex:1'>
  159 + <text class='text_999_24 '>扣除方式</text>
  160 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[profession.deduction_type]}}度</text>
  161 + </view>
  162 + <view class='float_right' style='flex:1'>
  163 + <text class='text_999_24 '>可扣除金额</text>
  164 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{profession.deduction_amount}}/{{reducetype[profession.deduction_type]}}</text>
  165 + </view>
  166 + </view>
  167 + </view>
  168 + </view>
  169 + </view>
  170 + <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  171 + <view class='float_left' style='flex:1'>
  172 + <text class='text_999_24 '>扣除方式</text>
  173 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}度</text>
  174 + </view>
  175 + <view class='float_right' style='flex:1'>
  176 + <text class='text_999_24 '>可扣除金额</text>
  177 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetype[itemData.deduction_type]}}</text>
  178 + </view>
  179 + </view>
  180 + </view>
  181 + </view>
  182 + </block>
  183 + </view>
  184 +
124 185 </view>
\ No newline at end of file
... ...
... ... @@ -45,7 +45,15 @@ Page({
45 45 console.log("godeclare", e);
46 46 var newdata = this.data.additionlist[e.currentTarget.id]
47 47 wx.navigateTo({
48   - url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity,
  48 + url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&type=0",
  49 + })
  50 + },
  51 +
  52 + goupdate: function (e) {
  53 + console.log("goupdate", e);
  54 + var newdata = this.data.additionlist[e.currentTarget.id]
  55 + wx.navigateTo({
  56 + url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&type=1",
49 57 })
50 58 },
51 59
... ...
... ... @@ -9,6 +9,9 @@
9 9 <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
10 10 立即申报
11 11 </view>
  12 + <view wx:elif="{{item.addition_items&&item.addition_items.length>0&&item.addition_items.length<4}}" class='view_godeclare_wrap' bindtap='goupdate' id='{{idx01}}'>
  13 + 查看并调整
  14 + </view>
12 15 </view>
13 16 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
14 17 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
... ...
1 1 {
2   - "description": "项目配置文件",
3   - "packOptions": {
4   - "ignore": []
5   - },
6   - "setting": {
7   - "urlCheck": false,
8   - "es6": true,
9   - "postcss": true,
10   - "minified": true,
11   - "newFeature": true
12   - },
13   - "compileType": "miniprogram",
  2 + "description": "项目配置文件",
  3 + "packOptions": {
  4 + "ignore": []
  5 + },
  6 + "setting": {
  7 + "urlCheck": false,
  8 + "es6": true,
  9 + "postcss": true,
  10 + "minified": true,
  11 + "newFeature": true
  12 + },
  13 + "compileType": "miniprogram",
14 14 "libVersion": "2.2.2",
15 15 "appid": "wxe91c67adba6ac02d",
16 16 "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
17   - "isGameTourist": false,
18   - "condition": {
19   - "search": {
20   - "current": -1,
21   - "list": []
22   - },
23   - "conversation": {
24   - "current": -1,
25   - "list": []
26   - },
27   - "game": {
28   - "currentL": -1,
29   - "list": []
30   - },
31   - "miniprogram": {
32   - "current": -1,
33   - "list": []
34   - }
35   - }
  17 + "isGameTourist": false,
  18 + "condition": {
  19 + "search": {
  20 + "current": -1,
  21 + "list": []
  22 + },
  23 + "conversation": {
  24 + "current": -1,
  25 + "list": []
  26 + },
  27 + "game": {
  28 + "currentL": -1,
  29 + "list": []
  30 + },
  31 + "miniprogram": {
  32 + "current": -1,
  33 + "list": []
  34 + }
  35 + }
36 36 }
\ No newline at end of file
... ...
请 注册 或 登录 后发表评论