wangyu / naturalPersonTax · 提交

提交 c4b76bf73adc3377a78044659d56e334c4ba9d4b

作者 pangy
2 个父辈 1de02238 a5d28342
构建： 未知

Merge branch 'dev_py' into dev2.0

内嵌 并排对比
正在显示 2 个修改的文件 包含 52 行增加 和 42 行删除
@@ -33,6 +33,8 @@ Page({ @@ -33,6 +33,8 @@ Page({
33 idcard_belong: null, //照片信息获取返回时判断所属 33 idcard_belong: null, //照片信息获取返回时判断所属
34 legal_entity_id: "", 34 legal_entity_id: "",
35 legal_entity: "", 35 legal_entity: "",
  36 + supporttype:"",
  37 + share_method:"",
36 data: { 38 data: {
37 hasLover:false, 39 hasLover:false,
38 house_type: "", 40 house_type: "",
@@ -185,16 +187,16 @@ Page({ @@ -185,16 +187,16 @@ Page({
185 placeholder: '请选择学历教育阶段', 187 placeholder: '请选择学历教育阶段',
186 onChange: 'onPickerSelect' 188 onChange: 'onPickerSelect'
187 }, 189 },
188 - supporttypeData: {  
189 - label: '赡养类型',  
190 - isrequre: true,  
191 - bindtype: 'support_type',  
192 - selected: '',  
193 - isblack: 'true',  
194 - values: ["独生子女", "非独生子女"],  
195 - placeholder: '请选择赡养类型',  
196 - onChange: 'onPickerSelect'  
197 - }, 190 + // supporttypeData: {
  191 + // label: '赡养类型',
  192 + // isrequre: true,
  193 + // bindtype: 'support_type',
  194 + // selected: '',
  195 + // isblack: 'true',
  196 + // values: ["独生子女", "非独生子女"],
  197 + // placeholder: '请选择赡养类型',
  198 + // onChange: 'onPickerSelect'
  199 + // },
198 shareMethodData: { 200 shareMethodData: {
199 label: '分摊方式', 201 label: '分摊方式',
200 isrequre: true, 202 isrequre: true,
@@ -509,6 +511,10 @@ Page({ @@ -509,6 +511,10 @@ Page({
509 cardtypeData: cardtype_data, 511 cardtypeData: cardtype_data,
510 commonbirthDate: commonbirth_date 512 commonbirthDate: commonbirth_date
511 }) 513 })
  514 + } else if ("support_duty" == options.status) {
  515 + deduction_amount = frontPage.data.reduce_amount
  516 + this.supporttype = frontPage.data.issinglechildData.selected == '是' ? 'D' : 'S',//是否独生
  517 + this.share_method = frontPage.data.shareMethodData.selected
512 } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 518 } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") {
513 this.getbanklist() 519 this.getbanklist()
514 house_type = "house_fund_rent" 520 house_type = "house_fund_rent"
@@ -1127,17 +1133,17 @@ Page({ @@ -1127,17 +1133,17 @@ Page({
1127 break; 1133 break;
1128 case 'support_duty': 1134 case 'support_duty':
1129 subUrl = 'persontax/v1/support-duties' 1135 subUrl = 'persontax/v1/support-duties'
1130 - if (this.data.supporttypeData.selected.length < 1) {  
1131 - this.showToast('请选择赡养类型')  
1132 - return  
1133 - }  
1134 - if (!this.data.shareMethodData.hidden) {  
1135 - if (this.data.shareMethodData.selected.length < 1){  
1136 - this.showToast('请选择分摊方式')  
1137 - return  
1138 - }  
1139 - newdata.share_method = this.data.shareMethodData.selected  
1140 - } 1136 + // if (this.data.supporttypeData.selected.length < 1) {
  1137 + // this.showToast('请选择赡养类型')
  1138 + // return
  1139 + // }
  1140 + // if (!this.data.shareMethodData.hidden) {
  1141 + // if (this.data.shareMethodData.selected.length < 1){
  1142 + // this.showToast('请选择分摊方式')
  1143 + // return
  1144 + // }
  1145 + // newdata.share_method = this.data.shareMethodData.selected
  1146 + // }
1141 if (!formdata.supported_name || formdata.supported_name.length < 1) { 1147 if (!formdata.supported_name || formdata.supported_name.length < 1) {
1142 this.showToast('请填写赡养人姓名') 1148 this.showToast('请填写赡养人姓名')
1143 return 1149 return
@@ -1165,9 +1171,12 @@ Page({ @@ -1165,9 +1171,12 @@ Page({
1165 // } else { 1171 // } else {
1166 // newdata.percentage = parseFloat(formdata.percentage) 1172 // newdata.percentage = parseFloat(formdata.percentage)
1167 // } 1173 // }
  1174 + newdata.support_type = this.supporttype
  1175 + if (this.supporttype == 'S' && this.share_method.length){
  1176 + newdata.share_method = this.share_method
  1177 + }
1168 newdata.birthday = this.data.olderbirthDate.datelong 1178 newdata.birthday = this.data.olderbirthDate.datelong
1169 newdata.relationship = this.data.older_relativeData.selected 1179 newdata.relationship = this.data.older_relativeData.selected
1170 - newdata.support_type = this.data.supporttypeData.selected =='独生子女'?'D':'S'  
1171 newdata.id_card_type = '1' //this.data.oldercardtypeData.selected 1180 newdata.id_card_type = '1' //this.data.oldercardtypeData.selected
1172 newdata.nation = "中国" 1181 newdata.nation = "中国"
1173 break; 1182 break;
@@ -1352,6 +1361,7 @@ Page({ @@ -1352,6 +1361,7 @@ Page({
1352 } 1361 }
1353 newdata.legal_entity_id = this.legal_entity_id 1362 newdata.legal_entity_id = this.legal_entity_id
1354 newdata.legal_entity = this.legal_entity 1363 newdata.legal_entity = this.legal_entity
  1364 + console.log("newdata", newdata);
1355 this.addDatas(newdata, subUrl) 1365 this.addDatas(newdata, subUrl)
1356 }, 1366 },
1357 1367
@@ -1562,24 +1572,24 @@ Page({ @@ -1562,24 +1572,24 @@ Page({
1562 schoolCountryData: schoolCountry_data 1572 schoolCountryData: schoolCountry_data
1563 }) 1573 })
1564 break; 1574 break;
1565 - case 'support_type':  
1566 - var support_typeData = this.data.supporttypeData  
1567 - support_typeData.selected = support_typeData.values[e.detail.value]  
1568 - var share_methodData = this.data.shareMethodData  
1569 - share_methodData.hidden = e.detail.value == 0  
1570 - this.setData({  
1571 - oldersupport_lable: e.detail.value == 0 ? 'single' : 'together',  
1572 - supporttypeData: support_typeData,  
1573 - shareMethodData: share_methodData  
1574 - })  
1575 - break;  
1576 - case 'share_method':  
1577 - var share_methodData = this.data.shareMethodData  
1578 - share_methodData.selected = share_methodData.values[e.detail.value]  
1579 - this.setData({  
1580 - shareMethodData: share_methodData  
1581 - })  
1582 - break; 1575 + // case 'support_type':
  1576 + // var support_typeData = this.data.supporttypeData
  1577 + // support_typeData.selected = support_typeData.values[e.detail.value]
  1578 + // var share_methodData = this.data.shareMethodData
  1579 + // share_methodData.hidden = e.detail.value == 0
  1580 + // this.setData({
  1581 + // oldersupport_lable: e.detail.value == 0 ? 'single' : 'together',
  1582 + // supporttypeData: support_typeData,
  1583 + // shareMethodData: share_methodData
  1584 + // })
  1585 + // break;
  1586 + // case 'share_method':
  1587 + // var share_methodData = this.data.shareMethodData
  1588 + // share_methodData.selected = share_methodData.values[e.detail.value]
  1589 + // this.setData({
  1590 + // shareMethodData: share_methodData
  1591 + // })
  1592 + // break;
1583 case 'oldercardtype': 1593 case 'oldercardtype':
1584 var older_cardtypeData = this.data.oldercardtypeData 1594 var older_cardtypeData = this.data.oldercardtypeData
1585 older_cardtypeData.selected = older_cardtypeData.values[e.detail.value] 1595 older_cardtypeData.selected = older_cardtypeData.values[e.detail.value]
@@ -116,8 +116,8 @@ @@ -116,8 +116,8 @@
116 </view> 116 </view>
117 <!-- 赡养老人 --> 117 <!-- 赡养老人 -->
118 <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'> 118 <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
119 - <template is="picker_cell_normal" data="{{...supporttypeData}}" />  
120 - <template is="picker_cell_normal" data="{{...shareMethodData}}" /> 119 + <!-- <template is="picker_cell_normal" data="{{...supporttypeData}}" />
  120 + <template is="picker_cell_normal" data="{{...shareMethodData}}" /> -->
121 <view class='divide_line_f5f5f5'></view> 121 <view class='divide_line_f5f5f5'></view>
122 <view style='height:90rpx'> 122 <view style='height:90rpx'>
123 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 123 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
请 注册 或 登录 后发表评论