wangyu / naturalPersonTax · 提交

提交 c53f66eec60868c43ad823e36983a6a042c1f2b9

作者 wangyu
2 个父辈 3f7a52b4 2d652cf2

Merge branch 'dev_无非居民' into 海峡 

# Conflicts:
#	app.js
#	project.config.json
内嵌 并排对比
正在显示 14 个修改的文件 包含 333 行增加 和 116 行删除
@@ -88,7 +88,11 @@ App({ @@ -88,7 +88,11 @@ App({
88 fail: function(res) { 88 fail: function(res) {
89 console.log("login-res-fail", res); 89 console.log("login-res-fail", res);
90 }, 90 },
  91 +<<<<<<< HEAD
91 complete: function(res) { 92 complete: function(res) {
  93 +=======
  94 + complete:function(res){
  95 +>>>>>>> dev_无非居民
92 96
93 } 97 }
94 }) 98 })
@@ -37,7 +37,7 @@ Page({ @@ -37,7 +37,7 @@ Page({
37 name: curdata.co_supporter, 37 name: curdata.co_supporter,
38 id_card_no: curdata.id_card_no, 38 id_card_no: curdata.id_card_no,
39 birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "", 39 birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
40 - birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000 40 + birthday_datelong: curdata.birthday
41 }) 41 })
42 } 42 }
43 43
@@ -740,9 +740,9 @@ Page({ @@ -740,9 +740,9 @@ Page({
740 if (data.children_name && data.children_name.length) { 740 if (data.children_name && data.children_name.length) {
741 setData.children_name = data.children_name 741 setData.children_name = data.children_name
742 } 742 }
743 - if (data.student_no && data.student_no.length) {  
744 - setData.children_student_no = data.student_no  
745 - } 743 + // if (data.student_no && data.student_no.length) {
  744 + // setData.children_student_no = data.student_no
  745 + // }
746 if (data.education_period && data.education_period.length) { 746 if (data.education_period && data.education_period.length) {
747 var childedudegreeData = this.data.childedudegreeData 747 var childedudegreeData = this.data.childedudegreeData
748 childedudegreeData.selected = data.education_period 748 childedudegreeData.selected = data.education_period
@@ -1289,10 +1289,10 @@ Page({ @@ -1289,10 +1289,10 @@ Page({
1289 this.showToast('请选择分配比例') 1289 this.showToast('请选择分配比例')
1290 return 1290 return
1291 } 1291 }
1292 - if (!formdata.children_student_no || formdata.children_student_no.length < 1) {  
1293 - this.showToast('请填写学籍号')  
1294 - return  
1295 - } 1292 + // if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
  1293 + // this.showToast('请填写学籍号')
  1294 + // return
  1295 + // }
1296 if (this.data.childedudegreeData.selected.length < 1) { 1296 if (this.data.childedudegreeData.selected.length < 1) {
1297 this.showToast('请选择教育阶段') 1297 this.showToast('请选择教育阶段')
1298 return 1298 return
@@ -1338,13 +1338,13 @@ Page({ @@ -1338,13 +1338,13 @@ Page({
1338 this.showToast('请选择配偶出生日期') 1338 this.showToast('请选择配偶出生日期')
1339 return 1339 return
1340 } 1340 }
1341 - newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected 1341 + newdata.spouse_id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
1342 newdata.spouse_birthday = this.data.loverbirthDate.datelong 1342 newdata.spouse_birthday = this.data.loverbirthDate.datelong
1343 } 1343 }
1344 newdata.has_spouse = this.data.hasLover?'y':'n' 1344 newdata.has_spouse = this.data.hasLover?'y':'n'
1345 newdata.relationship = this.data.taxperson_relativeData.selected 1345 newdata.relationship = this.data.taxperson_relativeData.selected
1346 - newdata.percent = parseFloat(this.data.childrenpercentData.selected.replace("%",""))  
1347 - newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected 1346 + newdata.percent = this.data.childrenpercentData.selected.replace("%","")
  1347 + newdata.children_id_card_type = '居民身份证' //this.data.childrencardtypeData.selected
1348 newdata.children_birthday = this.data.commonbirthDate.datelong 1348 newdata.children_birthday = this.data.commonbirthDate.datelong
1349 newdata.education_period_end = this.data.studyPeriodDate.datelong 1349 newdata.education_period_end = this.data.studyPeriodDate.datelong
1350 newdata.education_end = this.data.studyEndDate.datelong 1350 newdata.education_end = this.data.studyEndDate.datelong
@@ -1474,7 +1474,7 @@ Page({ @@ -1474,7 +1474,7 @@ Page({
1474 } 1474 }
1475 newdata.birthday = this.data.olderbirthDate.datelong 1475 newdata.birthday = this.data.olderbirthDate.datelong
1476 newdata.relationship = this.data.older_relativeData.selected 1476 newdata.relationship = this.data.older_relativeData.selected
1477 - newdata.id_card_type = '1' //this.data.oldercardtypeData.selected 1477 + newdata.id_card_type = '居民身份证' //this.data.oldercardtypeData.selected
1478 newdata.nation = "中国" 1478 newdata.nation = "中国"
1479 break; 1479 break;
1480 case 'medical_fund': 1480 case 'medical_fund':
@@ -1513,7 +1513,7 @@ Page({ @@ -1513,7 +1513,7 @@ Page({
1513 1513
1514 newdata.total_amount = parseFloat(formdata.total_amount) 1514 newdata.total_amount = parseFloat(formdata.total_amount)
1515 newdata.amount_by_person = parseFloat(formdata.amount_by_person) 1515 newdata.amount_by_person = parseFloat(formdata.amount_by_person)
1516 - newdata.id_card_type = '1'//this.data.cardtypeData.selected 1516 + newdata.id_card_type = '居民身份证'//this.data.cardtypeData.selected
1517 newdata.relationship = this.data.taxperson_relativeData.selected 1517 newdata.relationship = this.data.taxperson_relativeData.selected
1518 newdata.patient_birthday = this.data.commonbirthDate.datelong 1518 newdata.patient_birthday = this.data.commonbirthDate.datelong
1519 newdata.patient_nation = "中国" 1519 newdata.patient_nation = "中国"
@@ -1622,7 +1622,7 @@ Page({ @@ -1622,7 +1622,7 @@ Page({
1622 this.showToast('身份证格式有误') 1622 this.showToast('身份证格式有误')
1623 return 1623 return
1624 } 1624 }
1625 - newdata.owner_id_card_type = '1'//this.data.cardtypeData.selected 1625 + newdata.owner_id_card_type = '居民身份证'//this.data.cardtypeData.selected
1626 } 1626 }
1627 // if (this.data.rentLocateInfo.address_value[0].length < 1) { 1627 // if (this.data.rentLocateInfo.address_value[0].length < 1) {
1628 // this.showToast('请选择房屋地址') 1628 // this.showToast('请选择房屋地址')
@@ -1680,7 +1680,7 @@ Page({ @@ -1680,7 +1680,7 @@ Page({
1680 return 1680 return
1681 } 1681 }
1682 newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : '' 1682 newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
1683 - newdata.id_card_type = '1' //this.data.lovercardtypeData.selected 1683 + newdata.id_card_type = '居民身份证' //this.data.lovercardtypeData.selected
1684 newdata.birthday = this.data.loverbirthDate.datelong 1684 newdata.birthday = this.data.loverbirthDate.datelong
1685 newdata.nation = "中国" 1685 newdata.nation = "中国"
1686 } 1686 }
@@ -47,12 +47,12 @@ @@ -47,12 +47,12 @@
47 <template is="picker_cell_normal" data="{{...childrenpercentData}}" /> 47 <template is="picker_cell_normal" data="{{...childrenpercentData}}" />
48 48
49 <view class='divide_line_30'></view> 49 <view class='divide_line_30'></view>
50 - <view style='height:90rpx'> 50 + <!-- <view style='height:90rpx'>
51 <text class='red_star_right_10'>*</text> 51 <text class='red_star_right_10'>*</text>
52 <text class='text_777_30 float_left'>子女学籍号</text> 52 <text class='text_777_30 float_left'>子女学籍号</text>
53 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input> 53 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
54 </view> 54 </view>
55 - <view class='divide_line_30'></view> 55 + <view class='divide_line_30'></view> -->
56 56
57 <template is="picker_cell_normal" data="{{...childedudegreeData}}" /> 57 <template is="picker_cell_normal" data="{{...childedudegreeData}}" />
58 <view class='divide_line_30'></view> 58 <view class='divide_line_30'></view>
@@ -32,10 +32,10 @@ @@ -32,10 +32,10 @@
32 <text class='text_left'>分配比例</text> 32 <text class='text_left'>分配比例</text>
33 <text class='text_right_333'>{{datas.percent}}%</text> 33 <text class='text_right_333'>{{datas.percent}}%</text>
34 </view> 34 </view>
35 - <view style='height:90rpx;width:100%;clear:both;'> 35 + <!-- <view style='height:90rpx;width:100%;clear:both;'>
36 <text class='text_left'>子女学籍号</text> 36 <text class='text_left'>子女学籍号</text>
37 <text class='text_right_333'>{{datas.student_no}}</text> 37 <text class='text_right_333'>{{datas.student_no}}</text>
38 - </view> 38 + </view> -->
39 <view style='height:90rpx;width:100%;clear:both;'> 39 <view style='height:90rpx;width:100%;clear:both;'>
40 <text class='text_left'>子女受教育阶段</text> 40 <text class='text_left'>子女受教育阶段</text>
41 <text class='text_right_333'>{{datas.education_period}}</text> 41 <text class='text_right_333'>{{datas.education_period}}</text>
@@ -12,36 +12,38 @@ Page({ @@ -12,36 +12,38 @@ Page({
12 flag_housing02: false, 12 flag_housing02: false,
13 legal_entity_id: '', 13 legal_entity_id: '',
14 legal_entity: '', 14 legal_entity: '',
15 - 15 + type: "",
  16 + selectdata: {},
16 selectIndex: [{ 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,9 +53,13 @@ Page({
51 console.log("onLoad", options) 53 console.log("onLoad", options)
52 this.setData({ 54 this.setData({
53 legal_entity_id: options.legal_entity_id, 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,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 selectRep: function(e) { 125 selectRep: function(e) {
74 let index = e.currentTarget.dataset.selectindex; 126 let index = e.currentTarget.dataset.selectindex;
75 let selectIndex = this.data.selectIndex; //取到data里的selectIndex 127 let selectIndex = this.data.selectIndex; //取到data里的selectIndex
@@ -136,7 +188,7 @@ Page({ @@ -136,7 +188,7 @@ Page({
136 } else { 188 } else {
137 wx.showToast({ 189 wx.showToast({
138 title: '请选择住房类型', 190 title: '请选择住房类型',
139 - icon:"none" 191 + icon: "none"
140 }) 192 })
141 return; 193 return;
142 } 194 }
@@ -155,8 +207,12 @@ Page({ @@ -155,8 +207,12 @@ Page({
155 }) 207 })
156 return; 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 goDeclare: function(array) { 218 goDeclare: function(array) {
@@ -175,11 +231,46 @@ Page({ @@ -175,11 +231,46 @@ Page({
175 "Authorization": Authorization 231 "Authorization": Authorization
176 }, 232 },
177 success: function(res) { 233 success: function(res) {
178 - if (res && res.data) {  
179 - console.log("res", res) 234 + if (res.statusCode == 200) {
180 wx.redirectTo({ 235 wx.redirectTo({
181 url: '../godetail/godetail?datas=' + JSON.stringify(res.data) 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,7 +12,7 @@
12 <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text> 12 <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
13 13
14 <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx'> 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 <view class='float_left'> 16 <view class='float_left'>
17 <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" style='margin-top:20rpx' /> 17 <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" style='margin-top:20rpx' />
18 </view> 18 </view>
@@ -8,36 +8,76 @@ Page({ @@ -8,36 +8,76 @@ Page({
8 * Page initial data 8 * Page initial data
9 */ 9 */
10 data: { 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 additiondata: {} 25 additiondata: {}
12 }, 26 },
13 27
14 /** 28 /**
15 * Lifecycle function--Called when page load 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 * Lifecycle function--Called when page is initially rendered 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 * Lifecycle function--Called when page show 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 console.log("lookandadd", e); 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 var newstatus = this.data.additiondata.options[e.currentTarget.id] 81 var newstatus = this.data.additiondata.options[e.currentTarget.id]
42 // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){ 82 // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
43 // newstatus = "house_fund" 83 // newstatus = "house_fund"
@@ -48,38 +88,48 @@ Page({ @@ -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 * Lifecycle function--Called when page hide 102 * Lifecycle function--Called when page hide
53 */ 103 */
54 - onHide: function () { 104 + onHide: function() {
55 105
56 }, 106 },
57 107
58 /** 108 /**
59 * Lifecycle function--Called when page unload 109 * Lifecycle function--Called when page unload
60 */ 110 */
61 - onUnload: function () { 111 + onUnload: function() {
62 112
63 }, 113 },
64 114
65 /** 115 /**
66 * Page event handler function--Called when user drop down 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 * Called when page reach bottom 123 * Called when page reach bottom
74 */ 124 */
75 - onReachBottom: function () { 125 + onReachBottom: function() {
76 126
77 }, 127 },
78 128
79 /** 129 /**
80 * Called when user click on the top right corner to share 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 })
@@ -3,12 +3,12 @@ @@ -3,12 +3,12 @@
3 <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view> 3 <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
4 4
5 <view wx:if="{{additiondata.options&&additiondata.options.length>0}}"> 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 <view style='height:40rpx'> 8 <view style='height:40rpx'>
9 <text class='text_333_32 float_left'>子女教育</text> 9 <text class='text_333_32 float_left'>子女教育</text>
10 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> 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 </view> 12 </view>
13 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> 13 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
14 <view class='float_left' style='flex:1'> 14 <view class='float_left' style='flex:1'>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </view> 66 </view>
67 </view> --> 67 </view> -->
68 </view> 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 <view style='height:40rpx'> 70 <view style='height:40rpx'>
71 <text class='text_333_32 float_left'>大病医疗</text> 71 <text class='text_333_32 float_left'>大病医疗</text>
72 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> 72 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
@@ -83,11 +83,11 @@ @@ -83,11 +83,11 @@
83 </view> 83 </view>
84 </view> 84 </view>
85 </view> 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 <view style='height:40rpx'> 87 <view style='height:40rpx'>
88 <text class='text_333_32 float_left'>赡养老人</text> 88 <text class='text_333_32 float_left'>赡养老人</text>
89 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> 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 </view> 91 </view>
92 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> 92 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
93 <view class='float_left' style='flex:1'> 93 <view class='float_left' style='flex:1'>
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 <view style='height:40rpx'> 104 <view style='height:40rpx'>
105 <text class='text_333_32 float_left'>住房</text> 105 <text class='text_333_32 float_left'>住房</text>
106 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> 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 </view> 108 </view>
109 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> 109 <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
110 <view class='float_left' style='flex:1'> 110 <view class='float_left' style='flex:1'>
@@ -121,4 +121,65 @@ @@ -121,4 +121,65 @@
121 </block> 121 </block>
122 </view> 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 </view> 185 </view>
@@ -45,7 +45,15 @@ Page({ @@ -45,7 +45,15 @@ Page({
45 console.log("godeclare", e); 45 console.log("godeclare", e);
46 var newdata = this.data.additionlist[e.currentTarget.id] 46 var newdata = this.data.additionlist[e.currentTarget.id]
47 wx.navigateTo({ 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,6 +9,9 @@
9 <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> --> 9 <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
10 立即申报 10 立即申报
11 </view> 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 </view> 15 </view>
13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}"> 16 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02"> 17 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text> 20 <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
21 </view> --> 21 </view> -->
22 <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'> 22 <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
23 - <template is="picker_cell_normal" data="{{...issinglechildData}}" /> 23 + <template wx:if="{{employee_status!='inactive'}}" is="picker_cell_normal" data="{{...issinglechildData}}" />
24 <view wx:if="{{issinglechildData.selected=='否'}}"> 24 <view wx:if="{{issinglechildData.selected=='否'}}">
25 <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view> 25 <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
26 <template is="picker_cell_normal" data="{{...shareMethodData}}" /> 26 <template is="picker_cell_normal" data="{{...shareMethodData}}" />
@@ -231,7 +231,7 @@ @@ -231,7 +231,7 @@
231 </view> 231 </view>
232 <view style='height:70rpx'> 232 <view style='height:70rpx'>
233 <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text> 233 <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照类型：</text>
234 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>居民身份证</text> 234 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_type=='1'?"居民身份证":itemdetail.id_card_type}}</text>
235 </view> 235 </view>
236 <view style='height:70rpx'> 236 <view style='height:70rpx'>
237 <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text> 237 <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
@@ -376,7 +376,7 @@ @@ -376,7 +376,7 @@
376 </view> 376 </view>
377 </view> 377 </view>
378 </view> 378 </view>
379 - <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}"> 379 + <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)||(additionInfo[0].support_duties&&additionInfo[0].support_duties.length<1)}}">
380 <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image> 380 <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
381 </view> 381 </view>
382 </view> 382 </view>
@@ -310,7 +310,7 @@ Page({ @@ -310,7 +310,7 @@ Page({
310 this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 310 this.data.endDate.selected = format.formatTime_date(tax_info.separate_date)
311 } 311 }
312 312
313 - this.data.professionData.selected = tax_info.profession.three_level_name 313 + // this.data.professionData.selected = tax_info.profession.three_level_name
314 314
315 this.data.birthDate.end = curdate 315 this.data.birthDate.end = curdate
316 this.data.startDate.end = curdate 316 this.data.startDate.end = curdate
1 { 1 {
2 - "description": "项目配置文件",  
3 - "packOptions": {  
4 - "ignore": []  
5 - },  
6 - "setting": {  
7 - "urlCheck": true,  
8 - "es6": true,  
9 - "postcss": true,  
10 - "minified": true,  
11 - "newFeature": true  
12 - },  
13 - "compileType": "miniprogram",  
14 - "libVersion": "2.2.2",  
15 - "appid": "wx04262fa98a7de5b6",  
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 - } 2 + "description": "项目配置文件",
  3 + "packOptions": {
  4 + "ignore": []
  5 + },
  6 + "setting": {
  7 + "urlCheck": true,
  8 + "es6": true,
  9 + "postcss": true,
  10 + "minified": true,
  11 + "newFeature": true
  12 + },
  13 + "compileType": "miniprogram",
  14 + "libVersion": "2.2.2",
  15 + "appid": "wx04262fa98a7de5b6",
  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 + }
36 } 36 }
请 注册 或 登录 后发表评论