wangyu / naturalPersonTax · 提交

提交 49d503a7b2976e8c06dcec6e83aa89cbd54ed76a

作者 wangyu
1 个父辈 1f4e2e32
构建： 未知

优化

内嵌 并排对比
正在显示 16 个修改的文件 包含 853 行增加 和 284 行删除
@@ -126,8 +126,8 @@ App({ @@ -126,8 +126,8 @@ App({
126 onshow_count: 0, 126 onshow_count: 0,
127 // baseUrl: "http://47.99.47.16:20000/", 127 // baseUrl: "http://47.99.47.16:20000/",
128 // baseUrl: "http://47.96.75.229:20000/", 128 // baseUrl: "http://47.96.75.229:20000/",
129 - // baseUrl: "http://192.144.144.220:20000/",  
130 - baseUrl: "http://154.8.229.55:20000/", 129 + baseUrl: "http://192.144.144.220:20000/",
  130 + // baseUrl: "http://154.8.229.55:20000/",
131 // baseUrl: "https://api.workai.com.cn/", 131 // baseUrl: "https://api.workai.com.cn/",
132 OSSUrl: "",//"https://oss.workai.com.cn/", 132 OSSUrl: "",//"https://oss.workai.com.cn/",
133 userInfo: null, 133 userInfo: null,
@@ -7,15 +7,72 @@ Page({ @@ -7,15 +7,72 @@ Page({
7 * Page initial data 7 * Page initial data
8 */ 8 */
9 data: { 9 data: {
10 - lable:0,  
11 - title_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"], 10 + lable: 0,
  11 + datas02: [],
  12 + curdata: {},
  13 + title: '',
12 extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"], 14 extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
13 - cur_index:0, 15 + cur_index: 0,
  16 + lovercardtypeData: {
  17 + label: '身份证件类型',
  18 + bindtype: 'lovercardtype',
  19 + selected: '',
  20 + isblack: 'true',
  21 + placeholder: '请选择身份证件类型',
  22 + values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
  23 + '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
  24 + ],
  25 + onChange: 'onPickerSelect'
  26 + },
  27 + loverbirthDate: {
  28 + label: '出生日期',
  29 + bindtype: 'loverbirthday',
  30 + selected: '',
  31 + isblack: 'true',
  32 + placeholder: '请选择出生日期',
  33 + mode: "date",
  34 + fields: "day",
  35 + start: '1949-01-01',
  36 + end: '2018-01-01',
  37 + onChange: 'onPickerSelect',
  38 + },
  39 + taxperson_relativeData: {
  40 + label: '与纳税人的关系',
  41 + bindtype: 'taxperson_relative',
  42 + selected: '',
  43 + isblack: 'true',
  44 + placeholder: '请选择与纳税人的关系',
  45 + values: ["父子", "父女", "母子", "母女"],
  46 + onChange: 'onPickerSelect'
  47 + },
  48 + childrencardtypeData: {
  49 + label: '身份证件类型',
  50 + bindtype: 'childrencardtype',
  51 + selected: '',
  52 + isblack: 'true',
  53 + placeholder: '请选择身份证件类型',
  54 + values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
  55 + '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
  56 + ],
  57 + onChange: 'onPickerSelect'
  58 + },
  59 + childrenbirthDate: {
  60 + label: '出生日期',
  61 + bindtype: 'childrenbirthday',
  62 + selected: '',
  63 + isblack: 'true',
  64 + placeholder: '请选择出生日期',
  65 + mode: "date",
  66 + fields: "day",
  67 + start: '1970-01-01',
  68 + end: '2018-01-01',
  69 + onChange: 'onPickerSelect',
  70 + },
14 edudegreeData: { 71 edudegreeData: {
15 label: '教育阶段', 72 label: '教育阶段',
16 bindtype: 'edu_degree', 73 bindtype: 'edu_degree',
17 selected: '', 74 selected: '',
18 - isblack:'true', 75 + isblack: 'true',
19 values: ["小学", "初中", "高中", "大学"], 76 values: ["小学", "初中", "高中", "大学"],
20 placeholder: '请选择教育阶段', 77 placeholder: '请选择教育阶段',
21 onChange: 'onPickerSelect' 78 onChange: 'onPickerSelect'
@@ -29,16 +86,39 @@ Page({ @@ -29,16 +86,39 @@ Page({
29 placeholder: '请选择教育类型', 86 placeholder: '请选择教育类型',
30 onChange: 'onPickerSelect' 87 onChange: 'onPickerSelect'
31 }, 88 },
32 - olderrelativeData: {  
33 - label: '与老人的关系',  
34 - bindtype: 'older_relative', 89 + supporttypeData: {
  90 + label: '赡养类型',
  91 + bindtype: 'support_type',
35 selected: '', 92 selected: '',
36 isblack: 'true', 93 isblack: 'true',
37 - values: ["父子", "父女", "母子", "母女"],  
38 - placeholder: '请选择与老人的关系', 94 + values: ["独立赡养", "共同赡养"],
  95 + placeholder: '请选择赡养类型',
39 onChange: 'onPickerSelect' 96 onChange: 'onPickerSelect'
40 }, 97 },
41 - singlechildData:{ 98 + oldercardtypeData: {
  99 + label: '被赡养人证件类型',
  100 + bindtype: 'oldercardtype',
  101 + selected: '',
  102 + isblack: 'true',
  103 + placeholder: '请选择被赡养人证件类型',
  104 + values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
  105 + '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
  106 + ],
  107 + onChange: 'onPickerSelect'
  108 + },
  109 + olderbirthDate: {
  110 + label: '被赡养人出生日期',
  111 + bindtype: 'olderbirthday',
  112 + selected: '',
  113 + isblack: 'true',
  114 + placeholder: '请选择被赡养人出生日期',
  115 + mode: "date",
  116 + fields: "day",
  117 + start: '1970-01-01',
  118 + end: '2018-01-01',
  119 + onChange: 'onPickerSelect',
  120 + },
  121 + singlechildData: {
42 label: '是否独生子女', 122 label: '是否独生子女',
43 bindtype: 'single_child', 123 bindtype: 'single_child',
44 selected: '', 124 selected: '',
@@ -47,6 +127,30 @@ Page({ @@ -47,6 +127,30 @@ Page({
47 placeholder: '请选择是否独生子女', 127 placeholder: '请选择是否独生子女',
48 onChange: 'onPickerSelect' 128 onChange: 'onPickerSelect'
49 }, 129 },
  130 + studystartdate: {
  131 + label: '受教育日期起',
  132 + bindtype: 'study_start_date',
  133 + selected: '',
  134 + isblack: 'true',
  135 + values: ["是", "否"],
  136 + placeholder: '请选择受教育日期',
  137 + onChange: 'onPickerSelect',
  138 + mode: "date",
  139 + fields: "day",
  140 + start: '1970-01-01',
  141 + },
  142 + studyenddate: {
  143 + label: '预计受教育日期止',
  144 + bindtype: 'study_end_date',
  145 + selected: '',
  146 + isblack: 'true',
  147 + values: ["是", "否"],
  148 + placeholder: '请选择受教育日期止',
  149 + onChange: 'onPickerSelect',
  150 + mode: "date",
  151 + fields: "day",
  152 + start: '1970-01-01',
  153 + },
50 reducedateData: { 154 reducedateData: {
51 label: '扣除时间', 155 label: '扣除时间',
52 bindtype: 'reduce_date', 156 bindtype: 'reduce_date',
@@ -59,15 +163,16 @@ Page({ @@ -59,15 +163,16 @@ Page({
59 fields: "month", 163 fields: "month",
60 start: '1970-01', 164 start: '1970-01',
61 }, 165 },
62 - edu_lable:"",  
63 - long_reduce_date:0,  
64 - img_path:"/images/upload_img.png" 166 + edu_lable: "",
  167 + oldersupport_lable: "",
  168 + long_reduce_date: 0,
  169 + img_path: "/images/upload_img.png"
65 }, 170 },
66 171
67 /** 172 /**
68 * Lifecycle function--Called when page load 173 * Lifecycle function--Called when page load
69 */ 174 */
70 - onLoad: function (options) { 175 + onLoad: function(options) {
71 var that = this 176 var that = this
72 console.log("options", options); 177 console.log("options", options);
73 this.setData({ 178 this.setData({
@@ -75,17 +180,18 @@ Page({ @@ -75,17 +180,18 @@ Page({
75 }) 180 })
76 wx.getStorage({ 181 wx.getStorage({
77 key: 'selectitems', 182 key: 'selectitems',
78 - success: function (res) { 183 + success: function(res) {
79 console.log("selectitems", res.data) 184 console.log("selectitems", res.data)
80 - var new_title = '添加'+res.data[options.index].message 185 + var new_title = '添加' + res.data[options.index].message
81 if (new_title == '添加住房') { 186 if (new_title == '添加住房') {
82 - new_title = '添加'+res.data[options.index].extra_message 187 + new_title = '添加' + res.data[options.index].extra_message
83 } 188 }
84 wx.setNavigationBarTitle({ 189 wx.setNavigationBarTitle({
85 title: new_title, 190 title: new_title,
86 }) 191 })
87 that.setData({ 192 that.setData({
88 title: new_title, 193 title: new_title,
  194 + curdata: res.data[options.index].data,
89 datas02: res.data 195 datas02: res.data
90 }) 196 })
91 }, 197 },
@@ -95,7 +201,7 @@ Page({ @@ -95,7 +201,7 @@ Page({
95 this.initOSS() 201 this.initOSS()
96 }, 202 },
97 203
98 - initOSS: function () { 204 + initOSS: function() {
99 var that = this 205 var that = this
100 var Authorization = getApp().globalData.Authorization; 206 var Authorization = getApp().globalData.Authorization;
101 //OSS 上传前init 207 //OSS 上传前init
@@ -112,15 +218,15 @@ Page({ @@ -112,15 +218,15 @@ Page({
112 "instance_id": "", 218 "instance_id": "",
113 "object_type": "wx_image" 219 "object_type": "wx_image"
114 }, 220 },
115 - success: function (result) { 221 + success: function(result) {
116 222
117 OSSInit = result.data 223 OSSInit = result.data
118 console.log(' OSS init 成功', OSSInit) 224 console.log(' OSS init 成功', OSSInit)
119 }, 225 },
120 - fail: function (res) { 226 + fail: function(res) {
121 console.log('OSS init 失败', res) 227 console.log('OSS init 失败', res)
122 }, 228 },
123 - complete: function () { 229 + complete: function() {
124 wx.hideLoading() 230 wx.hideLoading()
125 } 231 }
126 }) 232 })
@@ -129,30 +235,250 @@ Page({ @@ -129,30 +235,250 @@ Page({
129 /** 235 /**
130 * Lifecycle function--Called when page is initially rendered 236 * Lifecycle function--Called when page is initially rendered
131 */ 237 */
132 - onReady: function () { 238 + onReady: function() {
133 239
134 }, 240 },
135 241
136 /** 242 /**
137 * Lifecycle function--Called when page show 243 * Lifecycle function--Called when page show
138 */ 244 */
139 - onShow: function () { 245 + onShow: function() {
  246 +
  247 + },
  248 +
  249 + formSubmit: function(e) {
  250 + console.log("formSubmit", e);
  251 + var formdata = e.detail.value
  252 + var newdata = formdata;
  253 + switch (this.data.cur_index + '') {
  254 + case '0':
  255 + if (!formdata.lover_name || formdata.lover_name.length < 1) {
  256 + this.showToast('请填写配偶姓名')
  257 + return
  258 + } else if (!formdata.lover_idno || formdata.lover_idno.length < 1) {
  259 + this.showToast('请填写配偶证件号码')
  260 + return
  261 + } else if (!formdata.children_name || formdata.children_name.length < 1) {
  262 + this.showToast('请填写子女姓名')
  263 + return
  264 + } else if (!formdata.children_idno || formdata.children_idno.length < 1) {
  265 + this.showToast('请填写子女身份证号')
  266 + return
  267 + } else if (!formdata.children_schoolno || formdata.children_schoolno.length < 1) {
  268 + this.showToast('请填写学籍号')
  269 + return
  270 + }
  271 + // else if (!formdata.reduce_money || formdata.reduce_money< 0) {
  272 + // this.showToast('请填写扣除金额')
  273 + // return
  274 + // }
  275 + else if (!formdata.reduce_ratio || formdata.reduce_ratio.length < 1) {
  276 + this.showToast('请填写扣除比例')
  277 + return
  278 + }
  279 + if (this.data.lovercardtypeData.selected.length < 1) {
  280 + this.showToast('请选择配偶证件类型')
  281 + return
  282 + }
  283 + if (this.data.loverbirthDate.selected.length < 1) {
  284 + this.showToast('请选择配偶出生日期')
  285 + return
  286 + }
  287 + if (this.data.taxperson_relativeData.selected.length < 1) {
  288 + this.showToast('请选择与纳税人关系')
  289 + return
  290 + }
  291 + if (this.data.childrencardtypeData.selected.length < 1) {
  292 + this.showToast('请选择子女证件类型')
  293 + return
  294 + }
  295 + if (this.data.childrenbirthDate.selected.length < 1) {
  296 + this.showToast('请选择子女出生日期')
  297 + return
  298 + }
  299 + if (this.data.studystartdate.selected.length < 1) {
  300 + this.showToast('请选择受教育日期')
  301 + return
  302 + }
  303 + if (this.data.studyenddate.selected.length < 1) {
  304 + this.showToast('请选择受教育日期')
  305 + return
  306 + }
  307 + if (this.data.edudegreeData.selected.length < 1) {
  308 + this.showToast('请选择教育阶段')
  309 + return
  310 + }
  311 + newdata.lover_cardtype = this.data.lovercardtypeData.selected
  312 + newdata.lover_birthdate = this.data.loverbirthDate.selected
  313 + newdata.taxperson_relative = this.data.taxperson_relativeData.selected
  314 + newdata.children_cardtype = this.data.childrencardtypeData.selected
  315 + newdata.children_birthDate = this.data.childrenbirthDate.selected
  316 + newdata.study_startdate = this.data.studystartdate.selected
  317 + newdata.study_enddate = this.data.studyenddate.selected
  318 + newdata.edu_degree = this.data.edudegreeData.selected
  319 + break;
  320 + case '1':
  321 + if (this.data.edutypeData.selected.length < 1) {
  322 + this.showToast('请选择教育类型')
  323 + return
  324 + } else if (this.data.edutypeData.edu_lable == 'school') {
  325 + newdata.edu_type_lable = '0'
  326 + newdata.study_startdate = this.data.studystartdate.selected
  327 + newdata.study_enddate = this.data.studyenddate.selected
  328 + if (!formdata.degree_level || formdata.degree_level.length < 1) {
  329 + this.showToast('请选择教育阶段')
  330 + return
  331 + }
  332 + if (this.data.studystartdate.selected.length < 1) {
  333 + this.showToast('请选择受教育日期')
  334 + return
  335 + }
  336 + if (this.data.studyenddate.selected.length < 1) {
  337 + this.showToast('请选择受教育日期')
  338 + return
  339 + }
  340 + } else if (this.data.edutypeData.edu_lable == 'tech') {
  341 + newdata.edu_type_lable = '1'
  342 + newdata.license_unit = formdata.license_unit
  343 + if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) {
  344 + this.showToast('请填写证书名称')
  345 + return
  346 + }
  347 + if (!formdata.occupational_qualifiy_no || formdata.occupational_qualifiy_no.length < 1) {
  348 + this.showToast('请填写证书编号')
  349 + return
  350 + }
  351 + if (!formdata.license_unit || formdata.license_unit.length < 1) {
  352 + this.showToast('请填写发证机关')
  353 + return
  354 + }
  355 + }
  356 + newdata.edu_type = this.data.edutypeData.selected
  357 + break;
  358 + case '2':
  359 + if (this.data.supporttypeData.selected.length < 1) {
  360 + this.showToast('请选择赡养类型')
  361 + return
  362 + } else if (!formdata.older_name || formdata.older_name.length < 1) {
  363 + this.showToast('请填写赡养人姓名')
  364 + return
  365 + } else if (this.data.oldercardtypeData.selected.length < 1) {
  366 + this.showToast('请填写赡养人证件类型')
  367 + return
  368 + } else if (!formdata.older_idno || formdata.older_idno.length < 1) {
  369 + this.showToast('请填写赡养人证件号')
  370 + return
  371 + }
  372 + if (this.data.oldersupport_lable == 'single') {
  373 + if (this.data.olderbirthDate.selected.length < 1) {
  374 + this.showToast('请选择赡养人出生日期')
  375 + return
  376 + }
  377 + if (this.data.taxperson_relativeData.selected.length < 1) {
  378 + this.showToast('请选择与纳税人关系')
  379 + return
  380 + }
  381 + newdata.older_birthday = this.data.olderbirthDate.selected
  382 + newdata.taxperson_relative = this.data.taxperson_relativeData.selected
  383 + }
140 384
  385 + newdata.support_type = this.data.supporttypeData.selected
  386 + newdata.older_cardtype = this.data.oldercardtypeData.selected
  387 + break;
  388 + break;
  389 + case '3':
  390 + if (!formdata.reduce_money || formdata.reduce_money < 0) {
  391 + this.showToast('请填写扣除金额')
  392 + return
  393 + }
  394 + break;
  395 + case '4':
  396 + if (!formdata.lover_name || formdata.lover_name.length < 1) {
  397 + this.showToast('请填写配偶姓名')
  398 + return
  399 + }
  400 + if (!formdata.lover_idno || formdata.lover_idno.length < 1) {
  401 + this.showToast('请填写配偶身份证号')
  402 + return
  403 + }
  404 + break;
  405 + }
  406 +
  407 + // if (this.data.reducedateData.selected.length < 1) {
  408 + // this.showToast('请选择扣除时间')
  409 + // return
  410 + // }
  411 + newdata.reduce_date = this.data.reducedateData.selected
  412 + this.gosave(newdata)
141 }, 413 },
142 414
143 - gosave:function(){ 415 + gosave: function(data) {
  416 + var selectitems = this.data.datas02;
  417 + selectitems[this.data.cur_index].path = this.data.img_path
  418 + selectitems[this.data.cur_index].data = data
144 wx.setStorage({ 419 wx.setStorage({
145 - key: 'image',  
146 - data: this.data.img_path, 420 + key: 'selectitems',
  421 + data: selectitems,
147 }) 422 })
  423 +
148 wx.navigateBack({ 424 wx.navigateBack({
149 delta: 1 425 delta: 1
150 }) 426 })
151 }, 427 },
152 428
153 - onPickerSelect: function (e) { 429 + onPickerSelect: function(e) {
154 console.log('picker发送选择改变，携带值为', e) 430 console.log('picker发送选择改变，携带值为', e)
155 switch (e.currentTarget.id) { 431 switch (e.currentTarget.id) {
  432 + case 'lovercardtype':
  433 + var lover_cardtypeData = this.data.lovercardtypeData
  434 + lover_cardtypeData.selected = lover_cardtypeData.values[e.detail.value]
  435 + this.setData({
  436 + lovercardtypeData: lover_cardtypeData
  437 + })
  438 + break;
  439 + case 'loverbirthday':
  440 + var lover_birthDate = this.data.loverbirthDate
  441 + lover_birthDate.selected = e.detail.value
  442 + this.setData({
  443 + loverbirthDate: lover_birthDate
  444 + })
  445 + break;
  446 + case 'taxperson_relative':
  447 + var taxperson_relativedata = this.data.taxperson_relativeData
  448 + taxperson_relativedata.selected = taxperson_relativedata.values[e.detail.value]
  449 + this.setData({
  450 + taxperson_relativeData: taxperson_relativedata
  451 + })
  452 + break;
  453 + case 'childrencardtype':
  454 + var children_cardtypedata = this.data.childrencardtypeData
  455 + children_cardtypedata.selected = children_cardtypedata.values[e.detail.value]
  456 + this.setData({
  457 + childrencardtypeData: children_cardtypedata
  458 + })
  459 + break;
  460 +
  461 + case 'childrenbirthday':
  462 + var children_birthDate = this.data.childrenbirthDate
  463 + children_birthDate.selected = e.detail.value
  464 + this.setData({
  465 + childrenbirthDate: children_birthDate
  466 + })
  467 + break;
  468 + case 'study_start_date':
  469 + var study_startdate = this.data.studystartdate
  470 + study_startdate.selected = e.detail.value
  471 + this.setData({
  472 + studystartdate: study_startdate
  473 + })
  474 + break;
  475 + case 'study_end_date':
  476 + var study_enddate = this.data.studyenddate
  477 + study_enddate.selected = e.detail.value
  478 + this.setData({
  479 + studyenddate: study_enddate
  480 + })
  481 + break;
156 case 'edu_degree': 482 case 'edu_degree':
157 var edudegree_data = this.data.edudegreeData 483 var edudegree_data = this.data.edudegreeData
158 edudegree_data.selected = edudegree_data.values[e.detail.value] 484 edudegree_data.selected = edudegree_data.values[e.detail.value]
@@ -160,32 +486,40 @@ Page({ @@ -160,32 +486,40 @@ Page({
160 edudegreeData: edudegree_data 486 edudegreeData: edudegree_data
161 }) 487 })
162 break; 488 break;
163 - case 'edu_type':  
164 - var edutypee_data = this.data.edutypeData  
165 - edutypee_data.selected = edutypee_data.values[e.detail.value] 489 + case 'support_type':
  490 + var support_typeData = this.data.supporttypeData
  491 + support_typeData.selected = support_typeData.values[e.detail.value]
166 this.setData({ 492 this.setData({
167 - edu_lable: e.detail.value == 0 ?'school':'tech',  
168 - edutypeData: edutypee_data 493 + oldersupport_lable: e.detail.value == 0 ? 'single' : 'together',
  494 + supporttypeData: support_typeData
169 }) 495 })
170 break; 496 break;
171 - case 'older_relative':  
172 - var olderrelative_data = this.data.olderrelativeData  
173 - olderrelative_data.selected = olderrelative_data.values[e.detail.value] 497 + case 'oldercardtype':
  498 + var older_cardtypeData = this.data.oldercardtypeData
  499 + older_cardtypeData.selected = older_cardtypeData.values[e.detail.value]
174 this.setData({ 500 this.setData({
175 - olderrelativeData: olderrelative_data 501 + oldercardtypeData: older_cardtypeData
176 }) 502 })
177 break; 503 break;
178 - case 'single_child':  
179 - var singlechild_data = this.data.singlechildData  
180 - singlechild_data.selected = singlechild_data.values[e.detail.value] 504 + case 'olderbirthday':
  505 + var older_birthDate = this.data.olderbirthDate
  506 + older_birthDate.selected = e.detail.value
181 this.setData({ 507 this.setData({
182 - singlechildData: singlechild_data 508 + olderbirthDate: older_birthDate
  509 + })
  510 + break;
  511 + case 'edu_type':
  512 + var edutypee_data = this.data.edutypeData
  513 + edutypee_data.selected = edutypee_data.values[e.detail.value]
  514 + this.setData({
  515 + edu_lable: e.detail.value == 0 ? 'school' : 'tech',
  516 + edutypeData: edutypee_data
183 }) 517 })
184 break; 518 break;
185 case 'reduce_date': 519 case 'reduce_date':
186 var reducedate_data = this.data.reducedateData 520 var reducedate_data = this.data.reducedateData
187 reducedate_data.selected = e.detail.value 521 reducedate_data.selected = e.detail.value
188 - console.log('birthdayChange', Date.parse(new Date(e.detail.value))) 522 + console.log('reduce_date', Date.parse(new Date(e.detail.value)))
189 this.setData({ 523 this.setData({
190 long_reduce_date: Date.parse(new Date(e.detail.value)) / 1000, 524 long_reduce_date: Date.parse(new Date(e.detail.value)) / 1000,
191 reducedateData: reducedate_data 525 reducedateData: reducedate_data
@@ -198,24 +532,24 @@ Page({ @@ -198,24 +532,24 @@ Page({
198 // }) 532 // })
199 }, 533 },
200 534
201 - goupload:function(e){ 535 + goupload: function(e) {
202 console.log(e) 536 console.log(e)
203 var that = this 537 var that = this
204 wx.chooseImage({ 538 wx.chooseImage({
205 sourceType: ['camera', 'album'], 539 sourceType: ['camera', 'album'],
206 // sizeType: ['original'], 540 // sizeType: ['original'],
207 count: 1, 541 count: 1,
208 - success: function (res) { 542 + success: function(res) {
209 console.log('success', res) 543 console.log('success', res)
210 - that.setData({  
211 - img_path: res.tempFilePaths[0]  
212 - }) 544 + that.setData({
  545 + img_path: res.tempFilePaths[0]
  546 + })
213 that.uploadImage(that.data.img_path) 547 that.uploadImage(that.data.img_path)
214 } 548 }
215 }) 549 })
216 }, 550 },
217 -  
218 - uploadImage: function (path) { 551 +
  552 + uploadImage: function(path) {
219 var that = this 553 var that = this
220 wx.showLoading({ 554 wx.showLoading({
221 title: '上传图片中...', 555 title: '上传图片中...',
@@ -234,7 +568,7 @@ Page({ @@ -234,7 +568,7 @@ Page({
234 'x:access_token': OSSInit.callback_token, 568 'x:access_token': OSSInit.callback_token,
235 'success_action_status': '200', 569 'success_action_status': '200',
236 }, 570 },
237 - success: function (res) { 571 + success: function(res) {
238 console.log('uploadFile', res.data) 572 console.log('uploadFile', res.data)
239 if (res.statusCode == 200) { 573 if (res.statusCode == 200) {
240 var data = JSON.parse(res.data) 574 var data = JSON.parse(res.data)
@@ -255,7 +589,7 @@ Page({ @@ -255,7 +589,7 @@ Page({
255 } 589 }
256 wx.hideLoading() 590 wx.hideLoading()
257 }, 591 },
258 - fail: function (err) { 592 + fail: function(err) {
259 console.log('fail', err) 593 console.log('fail', err)
260 wx.showModal({ 594 wx.showModal({
261 title: '上传失败', 595 title: '上传失败',
@@ -272,38 +606,47 @@ Page({ @@ -272,38 +606,47 @@ Page({
272 }) 606 })
273 }, 607 },
274 608
  609 + showToast: function(data) {
  610 + if (data && data.length > 0) {
  611 + wx.showToast({
  612 + title: data,
  613 + })
  614 + }
  615 + },
  616 +
275 /** 617 /**
276 * Lifecycle function--Called when page hide 618 * Lifecycle function--Called when page hide
277 */ 619 */
278 - onHide: function () { 620 + onHide: function() {
279 621
280 }, 622 },
281 623
282 /** 624 /**
283 * Lifecycle function--Called when page unload 625 * Lifecycle function--Called when page unload
284 */ 626 */
285 - onUnload: function () { 627 + onUnload: function() {
286 628
287 }, 629 },
288 630
289 /** 631 /**
290 * Page event handler function--Called when user drop down 632 * Page event handler function--Called when user drop down
291 */ 633 */
292 - onPullDownRefresh: function () { 634 + onPullDownRefresh: function() {
293 635
294 }, 636 },
295 637
296 /** 638 /**
297 * Called when page reach bottom 639 * Called when page reach bottom
298 */ 640 */
299 - onReachBottom: function () { 641 + onReachBottom: function() {
300 642
301 }, 643 },
302 644
303 /** 645 /**
304 * Called when user click on the top right corner to share 646 * Called when user click on the top right corner to share
305 */ 647 */
306 - onShareAppMessage: function () { 648 + onShareAppMessage: function() {
307 649
308 } 650 }
  651 +
309 }) 652 })
1 <!--pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml--> 1 <!--pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml-->
2 <import src="../../../common/picker_cell" /> 2 <import src="../../../common/picker_cell" />
3 3
4 -<scroll-view class='page'>  
5 - <view style='padding:0 30rpx'>  
6 - <!-- 添加子女 -->  
7 - <view wx:if="{{cur_index==0}}">  
8 - <view style='height:90rpx'>  
9 - <text class='text_black_30 float_left'>子女姓名</text>  
10 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女姓名'></input>  
11 - </view>  
12 - <view class='divide_line_f5f5f5'></view>  
13 - <view style='height:90rpx'>  
14 - <text class='text_black_30 float_left'>子女母亲姓名</text>  
15 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女母亲姓名'></input>  
16 - </view>  
17 - <view class='divide_line_f5f5f5'></view>  
18 - <view style='height:90rpx'>  
19 - <text class='text_black_30 float_left'>子女身份证号</text>  
20 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女身份证号'type='idcard'></input>  
21 - </view>  
22 - <view class='divide_line_f5f5f5'></view>  
23 - <view style='height:90rpx'>  
24 - <text class='text_black_30 float_left'>子女学籍号</text>  
25 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号'></input>  
26 - </view>  
27 - <view class='divide_line_f5f5f5'></view> 4 +<view class='page'>
  5 + <form bindsubmit='formSubmit'>
  6 + <view style='padding:0 30rpx'>
  7 + <!-- 添加子女 -->
  8 + <view wx:if="{{cur_index==0}}">
  9 + <view style='height:90rpx'>
  10 + <text class='text_black_30 float_left'>配偶姓名</text>
  11 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='lover_name'></input>
  12 + </view>
  13 + <view class='divide_line_f5f5f5'></view>
28 14
29 - <!-- <picker bindchange="eduPickerChange" value="{{edu_name}}" range="{{edu_array}}"> 15 + <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
  16 + <view class='divide_line_f5f5f5'></view>
  17 + <view style='height:90rpx'>
  18 + <text class='text_black_30 float_left'>配偶证件号码</text>
  19 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='lover_idno'></input>
  20 + </view>
  21 + <view class='divide_line_f5f5f5'></view>
  22 + <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
  23 + <view class='divide_line_f5f5f5'></view>
30 <view style='height:90rpx'> 24 <view style='height:90rpx'>
31 - <text class='text_black_30 float_left'>教育阶段</text> 25 + <text class='text_black_30 float_left'>国籍</text>
32 <image class='arrow_wrap' src='/images/arrow_right.png'></image> 26 <image class='arrow_wrap' src='/images/arrow_right.png'></image>
33 - <text wx:if='{{!edu_name}}' class='text_999_30 float_right' style='line-height: 90rpx;text-align:right'>请选择教育阶段</text>  
34 - <text wx:else class='text_333_30 float_right' style='line-height: 90rpx;text-align:right'>{{edu_name}}</text> 27 + <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
35 </view> 28 </view>
36 - </picker> -->  
37 - <template is="picker_cell_normal" data="{{...edudegreeData}}" />  
38 - <view class='divide_line_f5f5f5'></view>  
39 - <view style='height:90rpx'>  
40 - <text class='text_black_30 float_left'>扣除金额</text>  
41 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;;text-align: right' placeholder='请输入扣除金额' type='digit'></input>  
42 - </view>  
43 - <view class='divide_line_f5f5f5'></view>  
44 - <view style='height:90rpx;'>  
45 - <text class='text_black_30 float_left'>扣除比例</text>  
46 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除比例'></input>  
47 - </view>  
48 - </view>  
49 - <!-- 继续教育 -->  
50 - <view wx:if="{{cur_index==1}}">  
51 - <!-- <view style='height:90rpx'>  
52 - <text class='text_black_30 float_left'>教育类型</text>  
53 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
54 - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right'>请选择教育类型</text>  
55 - </view> -->  
56 - <template is="picker_cell_normal" data="{{...edutypeData}}" />  
57 - <view class='divide_line_f5f5f5'></view>  
58 - <view wx:if="{{edu_lable=='school'}}"> 29 + <view style='width:100%;height:20rpx;background:#f5f5f5'></view>
  30 +
  31 + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
  32 + <view class='divide_line_f5f5f5'></view>
59 <view style='height:90rpx'> 33 <view style='height:90rpx'>
60 - <text class='text_black_30 float_left'>学历教育阶段</text>  
61 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段'></input> 34 + <text class='text_black_30 float_left'>子女姓名</text>
  35 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女姓名' name='children_name'></input>
62 </view> 36 </view>
63 <view class='divide_line_f5f5f5'></view> 37 <view class='divide_line_f5f5f5'></view>
  38 +
  39 + <template is="picker_cell_normal" data="{{...childrencardtypeData}}" />
  40 + <view class='divide_line_f5f5f5'></view>
64 <view style='height:90rpx'> 41 <view style='height:90rpx'>
65 - <text class='text_black_30 float_left'>学籍号</text>  
66 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学籍号'></input> 42 + <text class='text_black_30 float_left'>身份证件号码</text>
  43 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女证件号码' type='idcard' name='children_idno'></input>
67 </view> 44 </view>
68 - </view>  
69 - <view wx:elif="{{edu_lable=='tech'}}"> 45 + <view class='divide_line_f5f5f5'></view>
  46 +
  47 + <template is="picker_cell_normal" data="{{...childrenbirthDate}}" />
  48 + <view class='divide_line_f5f5f5'></view>
70 <view style='height:90rpx'> 49 <view style='height:90rpx'>
71 - <text class='text_black_30 float_left'>职业资格名称</text>  
72 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格名称'></input> 50 + <text class='text_black_30 float_left'>国籍</text>
  51 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
  52 + <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
73 </view> 53 </view>
74 <view class='divide_line_f5f5f5'></view> 54 <view class='divide_line_f5f5f5'></view>
75 <view style='height:90rpx'> 55 <view style='height:90rpx'>
76 - <text class='text_black_30 float_left'>职业资格编号</text>  
77 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格编号'></input> 56 + <text class='text_black_30 float_left'>子女学籍号</text>
  57 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_schoolno'></input>
  58 + </view>
  59 + <view class='divide_line_f5f5f5'></view>
  60 +
  61 + <template is="picker_cell_normal" data="{{...edudegreeData}}" />
  62 + <view class='divide_line_f5f5f5'></view>
  63 +
  64 + <template is="picker_cell_normal" data="{{...studystartdate}}" />
  65 + <view class='divide_line_f5f5f5'></view>
  66 +
  67 + <template is="picker_cell_normal" data="{{...studyenddate}}" />
  68 + <view class='divide_line_f5f5f5'></view>
  69 + <template is="picker_cell_normal" data="{{...edudegreeData}}" />
  70 + <view class='divide_line_f5f5f5'></view>
  71 +
  72 + <view style='height:90rpx;'>
  73 + <text class='text_black_30 float_left'>分配比例</text>
  74 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分配比例' name='reduce_ratio'></input>
78 </view> 75 </view>
79 </view> 76 </view>
80 - </view> 77 + <!-- 继续教育 -->
  78 + <view wx:if="{{cur_index==1}}">
  79 +
  80 + <template is="picker_cell_normal" data="{{...edutypeData}}" />
  81 + <view class='divide_line_f5f5f5'></view>
  82 + <view wx:if="{{edu_lable=='school'}}">
  83 + <view style='height:90rpx'>
  84 + <text class='text_black_30 float_left'>学历教育阶段</text>
  85 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段' name='degree_level'></input>
  86 + </view>
  87 + <view class='divide_line_f5f5f5'></view>
  88 + <template is="picker_cell_normal" data="{{...studystartdate}}" />
  89 + <view class='divide_line_f5f5f5'></view>
  90 + <template is="picker_cell_normal" data="{{...studyenddate}}" />
  91 +
  92 + </view>
  93 + <view wx:elif="{{edu_lable=='tech'}}">
  94 + <view style='height:90rpx'>
  95 + <text class='text_black_30 float_left'>职业资格名称</text>
  96 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格名称' name='occupational_qualifiy_name'></input>
  97 + </view>
  98 + <view class='divide_line_f5f5f5'></view>
  99 + <view style='height:90rpx'>
  100 + <text class='text_black_30 float_left'>职业资格编号</text>
  101 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格编号' name='occupational_qualifiy_no'></input>
  102 + </view>
  103 + <view class='divide_line_f5f5f5'></view>
  104 + <view style='height:90rpx'>
  105 + <text class='text_black_30 float_left'>发证机关</text>
  106 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='license_unit'></input>
  107 + </view>
  108 + </view>
81 109
82 - <!-- 赡养老人 -->  
83 - <view wx:if="{{cur_index==2}}">  
84 - <view style='height:90rpx'>  
85 - <text class='text_black_30 float_left'>老人姓名</text>  
86 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入老人姓名'></input>  
87 </view> 110 </view>
88 - <view class='divide_line_f5f5f5'></view>  
89 - <view style='height:90rpx'>  
90 - <text class='text_black_30 float_left'>老人身份证号</text>  
91 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入老人身份证号'type='idcard'></input> 111 + <!-- 赡养老人 -->
  112 + <view wx:if="{{cur_index==2}}">
  113 + <template is="picker_cell_normal" data="{{...supporttypeData}}" />
  114 + <view class='divide_line_f5f5f5'></view>
  115 + <view style='height:90rpx'>
  116 + <text class='text_black_30 float_left'>被赡养人姓名</text>
  117 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='older_name'></input>
  118 + </view>
  119 + <view class='divide_line_f5f5f5'></view>
  120 + <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
  121 + <view class='divide_line_f5f5f5'></view>
  122 + <view style='height:90rpx'>
  123 + <text class='text_black_30 float_left'>被赡养人证件号码</text>
  124 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' type='idcard' name='older_idno'></input>
  125 + </view>
  126 + <view wx:if="{{oldersupport_lable=='single'}}">
  127 + <view class='divide_line_f5f5f5'></view>
  128 + <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
  129 + <view class='divide_line_f5f5f5'></view>
  130 + <view style='height:90rpx'>
  131 + <text class='text_black_30 float_left'>国籍</text>
  132 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
  133 + <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='older_country'>中国</text>
  134 + </view>
  135 + <view class='divide_line_f5f5f5'></view>
  136 +
  137 + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
  138 + </view>
  139 +
  140 + <!-- <view class='divide_line_f5f5f5'></view>
  141 + <view style='height:90rpx'>
  142 + <text class='text_black_30 float_left'>分摊比例</text>
  143 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' name='allocation_ratio'></input>
  144 + </view> -->
92 </view> 145 </view>
93 - <view class='divide_line_f5f5f5'></view>  
94 - <!-- <view style='height:90rpx'>  
95 - <text class='text_black_30 float_left'>与老人关系</text>  
96 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
97 - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right'>请选择与老人关系</text>  
98 - </view> -->  
99 - <template is="picker_cell_normal" data="{{...olderrelativeData}}" />  
100 - <view class='divide_line_f5f5f5'></view>  
101 - <!-- <view style='height:90rpx'>  
102 - <text class='text_black_30 float_left'>是否独生子女</text>  
103 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
104 - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right'>请选择是否独生子女</text>  
105 - </view> -->  
106 - <template is="picker_cell_normal" data="{{...singlechildData}}" />  
107 - <view class='divide_line_f5f5f5'></view>  
108 - <view style='height:90rpx'>  
109 - <text class='text_black_30 float_left'>分摊比例</text>  
110 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例'></input> 146 + <!-- 大病医疗 -->
  147 + <view wx:if="{{cur_index==3}}">
  148 + <view style='height:90rpx'>
  149 + <text class='text_black_30 float_left'>扣除金额</text>
  150 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input>
  151 + </view>
111 </view> 152 </view>
112 - </view>  
113 -  
114 - <!-- 大病医疗 -->  
115 - <view wx:if="{{cur_index==3}}">  
116 - <view style='height:90rpx'>  
117 - <text class='text_black_30 float_left'>扣除金额</text>  
118 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额'type='digit'></input> 153 + <!-- 住房 -->
  154 + <view wx:if="{{cur_index==4}}">
  155 + <view style='height:90rpx'>
  156 + <text class='text_black_30 float_left'>配偶姓名</text>
  157 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='lover_name'></input>
  158 + </view>
  159 + <view class='divide_line_f5f5f5'></view>
  160 + <view style='height:90rpx'>
  161 + <text class='text_black_30 float_left'>配偶身份证号</text>
  162 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶身份证号' type='idcard' name='lover_idno'></input>
  163 + </view>
119 </view> 164 </view>
120 - </view>  
121 165
122 - <!-- 住房 -->  
123 - <view wx:if="{{cur_index==4}}">  
124 - <view style='height:90rpx'>  
125 - <text class='text_black_30 float_left'>配偶姓名</text>  
126 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额'></input>  
127 - </view>  
128 <view class='divide_line_f5f5f5'></view> 166 <view class='divide_line_f5f5f5'></view>
129 - <view style='height:90rpx'>  
130 - <text class='text_black_30 float_left'>配偶身份证号</text>  
131 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶身份证号'type='idcard'></input>  
132 - </view> 167 + <view class='text_black_30 float_left'>上传材料</view>
133 </view> 168 </view>
134 - <view class='divide_line_f5f5f5'></view>  
135 - <!-- <view style='height:90rpx'>  
136 - <text class='text_black_30 float_left'>扣除时间</text>  
137 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
138 - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right'>请选择扣除时间</text>  
139 - </view> -->  
140 - <template is="picker_cell_normal" data="{{...reducedateData}}" />  
141 - <view class='divide_line_f5f5f5'></view>  
142 - <view class='text_black_30 float_left'>上传材料</view>  
143 - </view>  
144 - <view style='margin-bottom:140rpx'>  
145 - <image src='{{img_path}}' style='width:100%;height:380rpx' bindtap='goupload'></image>  
146 - <view class='text_999_30' style='text-align:center;margin:20rpx 30rpx'>{{extrainfo_arr[cur_index]}}</view>  
147 - </view>  
148 -  
149 - <view class="btn_bottom" bindtap='gosave'>  
150 - <button class="btn_bottom"> 保存</button>  
151 - </view>  
152 -</scroll-view>  
  169 + <view style='margin-bottom:140rpx'>
  170 + <image src='{{img_path}}' style='width:100%;height:380rpx' bindtap='goupload'></image>
  171 + <view class='text_999_30' style='text-align:center;margin:20rpx 30rpx'>{{extrainfo_arr[cur_index]}}</view>
  172 + </view>
  173 + <view class="btn_bottom">
  174 + <button class="btn_bottom" formType="submit"> 保存</button>
  175 + </view>
  176 + </form>
  177 +</view>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 } 8 }
9 9
10 .input_wrap { 10 .input_wrap {
11 - width: 500rpx; 11 + width: 460rpx;
12 height: 90rpx; 12 height: 90rpx;
13 font-size: 30rpx; 13 font-size: 30rpx;
14 color: #333; 14 color: #333;
@@ -10,22 +10,32 @@ Page({ @@ -10,22 +10,32 @@ Page({
10 selectIndex: [{ 10 selectIndex: [{
11 message: '子女教育', 11 message: '子女教育',
12 disable_change: '', 12 disable_change: '',
  13 + path: '',
  14 + data: {},
13 sureid: false 15 sureid: false
14 }, { 16 }, {
15 message: '继续教育', 17 message: '继续教育',
16 disable_change: '', 18 disable_change: '',
  19 + path: '',
  20 + data: {},
17 sureid: false 21 sureid: false
18 }, { 22 }, {
19 message: '赡养老人', 23 message: '赡养老人',
20 disable_change: '', 24 disable_change: '',
  25 + path: '',
  26 + data: {},
21 sureid: false 27 sureid: false
22 }, { 28 }, {
23 message: '大病医疗', 29 message: '大病医疗',
24 disable_change: '', 30 disable_change: '',
  31 + path: '',
  32 + data: {},
25 sureid: false 33 sureid: false
26 }, { 34 }, {
27 message: '住房', 35 message: '住房',
28 sureid: false, 36 sureid: false,
  37 + path: '',
  38 + data: {},
29 disable_change: '', 39 disable_change: '',
30 extra_message: '' 40 extra_message: ''
31 }, ], 41 }, ],
@@ -22,6 +22,7 @@ Page({ @@ -22,6 +22,7 @@ Page({
22 }) 22 })
23 }, 23 },
24 }) 24 })
  25 +
25 }, 26 },
26 27
27 /** 28 /**
1 <!--pages/main/addtionalreduce/godetail/godetail.wxml--> 1 <!--pages/main/addtionalreduce/godetail/godetail.wxml-->
2 <view class='page' style='margin-bottom:30rpx'> 2 <view class='page' style='margin-bottom:30rpx'>
3 - <view class='text_gray_30' style='padding:30rpx'>您在“北京小爱科技”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view> 3 + <view class='text_gray_30' style='padding:30rpx'>您在“北京小爱智能科技”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
4 <view style='padding-left:30rpx;padding-right:30rpx'> 4 <view style='padding-left:30rpx;padding-right:30rpx'>
5 <image class='icon_wrap' src="/images/rectangle_icon.png"></image> 5 <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
6 <text style='padding-left:20rpx' class='text_gray_32'>北京小爱智能科技</text> 6 <text style='padding-left:20rpx' class='text_gray_32'>北京小爱智能科技</text>
@@ -12,12 +12,13 @@ @@ -12,12 +12,13 @@
12 <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text> 12 <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text>
13 <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text> 13 <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text>
14 <view style='margin:20rpx 0'> 14 <view style='margin:20rpx 0'>
15 - <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>  
16 - <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text> 15 + <text class='text_gray_22 float_left'>累计已使用额度：4890.00</text>
  16 + <text class='text_gray_22 float_right'>本月可用额度：12810.00</text>
17 </view> 17 </view>
18 <view class='divide_line_f5f5f5'></view> 18 <view class='divide_line_f5f5f5'></view>
19 <view style='padding:20rpx 0' bindtap='lookandadd' id='{{index}}'> 19 <view style='padding:20rpx 0' bindtap='lookandadd' id='{{index}}'>
20 - <text class='text_blue_28'>查看并调整</text> 20 + <text wx:if="{{datas02[index].message!='大病医疗'}}" class='text_blue_28' >查看并调整</text>
  21 + <text wx:else class='text_blue_28' >提交抵扣凭据</text>
21 <image class='arrow_img_wrap' src='/images/arrow_right.png'></image> 22 <image class='arrow_img_wrap' src='/images/arrow_right.png'></image>
22 </view> 23 </view>
23 </view> 24 </view>
@@ -33,11 +33,12 @@ @@ -33,11 +33,12 @@
33 <view> 33 <view>
34 <text class='text_666_30 float_left' wx:if="datas02[index].message!='住房'">{{datas02[index].message}}</text> 34 <text class='text_666_30 float_left' wx:if="datas02[index].message!='住房'">{{datas02[index].message}}</text>
35 <text class='text_666_30 float_left' wx:if="datas02[index].message=='住房'">{{datas02[index].extra_message}}</text> 35 <text class='text_666_30 float_left' wx:if="datas02[index].message=='住房'">{{datas02[index].extra_message}}</text>
36 - <text class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text> 36 + <text wx:if="{{datas02[index].message!='大病医疗'}}" class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text>
  37 + <text wx:else class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>提交抵扣凭据</text>
37 </view> 38 </view>
38 <view style='margin-top:20rpx'> 39 <view style='margin-top:20rpx'>
39 - <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>  
40 - <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text> 40 + <text class='text_gray_22 float_left'>累计已使用额度：4890.00</text>
  41 + <text class='text_gray_22 float_right'>本月可用额度：12810.00</text>
41 </view> 42 </view>
42 </view> 43 </view>
43 </view> 44 </view>
@@ -5,108 +5,113 @@ Page({ @@ -5,108 +5,113 @@ Page({
5 * Page initial data 5 * Page initial data
6 */ 6 */
7 data: { 7 data: {
8 - cur_index:0,  
9 - add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"], title:'', 8 + cur_index: 0,
  9 + add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"],
  10 + title: '',
  11 + imgpath: '',
  12 + new_data:{},
10 datas02: [] 13 datas02: []
11 }, 14 },
12 15
13 /** 16 /**
14 * Lifecycle function--Called when page load 17 * Lifecycle function--Called when page load
15 */ 18 */
16 - onLoad: function (options) {  
17 - var that= this 19 + onLoad: function(options) {
  20 + var that = this
18 console.log("options", options); 21 console.log("options", options);
19 this.setData({ 22 this.setData({
20 cur_index: options.index 23 cur_index: options.index
21 }) 24 })
  25 + },
  26 +
  27 + /**
  28 + * Lifecycle function--Called when page is initially rendered
  29 + */
  30 + onReady: function() {
  31 +
  32 + },
  33 +
  34 + /**
  35 + * Lifecycle function--Called when page show
  36 + */
  37 + onShow: function() {
  38 + var that = this
  39 + var index = this.data.cur_index
22 wx.getStorage({ 40 wx.getStorage({
23 key: 'selectitems', 41 key: 'selectitems',
24 success: function (res) { 42 success: function (res) {
25 console.log("selectitems", res.data) 43 console.log("selectitems", res.data)
26 - var new_title = res.data[options.index].message  
27 - if (new_title=='住房'){  
28 - new_title = res.data[options.index].extra_message 44 + var new_title = res.data[index].message
  45 + if (new_title == '住房') {
  46 + new_title = res.data[index].extra_message
29 } 47 }
30 wx.setNavigationBarTitle({ 48 wx.setNavigationBarTitle({
31 title: new_title, 49 title: new_title,
32 }) 50 })
33 that.setData({ 51 that.setData({
34 title: new_title, 52 title: new_title,
  53 + imgpath: res.data[index].path,
  54 + new_data: res.data[index].data,
35 datas02: res.data 55 datas02: res.data
36 - }) 56 + })
  57 + console.log('new_data', res.data[index].data)
37 }, 58 },
38 }) 59 })
39 -  
40 - // if (this.data.datas02 && this.data.datas02.length>0){  
41 - // for (var i = 0; i < this.data.datas02.length;i++){  
42 -  
43 - // }  
44 - // }  
45 }, 60 },
46 61
47 - /**  
48 - * Lifecycle function--Called when page is initially rendered  
49 - */  
50 - onReady: function () { 62 + lookimg: function() { //查看材料
51 63
52 - }, 64 + if (this.data.imgpath && this.data.imgpath.length > 0) {
  65 + wx.previewImage({
  66 + urls: [this.data.imgpath],
  67 + })
  68 + } else {
  69 + wx.showToast({
  70 + title: '暂无可查看资料',
  71 + })
  72 + }
53 73
54 - /**  
55 - * Lifecycle function--Called when page show  
56 - */  
57 - onShow: function () {  
58 - // wx.showLoading({  
59 - // title: '加载中',  
60 - // })  
61 - // setTimeout(function(){  
62 - // wx.hideLoading()  
63 - // },2000)  
64 }, 74 },
65 75
66 - lookimg:function(){//查看材料  
67 - wx.showToast({  
68 - title: '查看材料',  
69 - })  
70 - },  
71 -  
72 - goadd:function(e){//添加 76 + goadd: function(e) { //添加
73 wx.navigateTo({ 77 wx.navigateTo({
74 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index, 78 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index,
75 }) 79 })
  80 +
76 }, 81 },
77 82
78 /** 83 /**
79 * Lifecycle function--Called when page hide 84 * Lifecycle function--Called when page hide
80 */ 85 */
81 - onHide: function () { 86 + onHide: function() {
82 87
83 }, 88 },
84 89
85 /** 90 /**
86 * Lifecycle function--Called when page unload 91 * Lifecycle function--Called when page unload
87 */ 92 */
88 - onUnload: function () { 93 + onUnload: function() {
89 94
90 }, 95 },
91 96
92 /** 97 /**
93 * Page event handler function--Called when user drop down 98 * Page event handler function--Called when user drop down
94 */ 99 */
95 - onPullDownRefresh: function () { 100 + onPullDownRefresh: function() {
96 101
97 }, 102 },
98 103
99 /** 104 /**
100 * Called when page reach bottom 105 * Called when page reach bottom
101 */ 106 */
102 - onReachBottom: function () { 107 + onReachBottom: function() {
103 108
104 }, 109 },
105 110
106 /** 111 /**
107 * Called when user click on the top right corner to share 112 * Called when user click on the top right corner to share
108 */ 113 */
109 - onShareAppMessage: function () { 114 + onShareAppMessage: function() {
110 115
111 } 116 }
112 }) 117 })
@@ -23,36 +23,77 @@ @@ -23,36 +23,77 @@
23 <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>专项附加扣除概览</text> 23 <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>专项附加扣除概览</text>
24 </view> 24 </view>
25 <view class='divide_line_f5f5f5'></view> 25 <view class='divide_line_f5f5f5'></view>
26 - <view style='margin:30rpx;' class='card_rectangle_bg_column'> 26 + <view wx:if='{{new_data&&new_data.reduce_date}}' style='margin:30rpx;' class='card_rectangle_bg_column'>
27 <!-- 子女教育 --> 27 <!-- 子女教育 -->
28 <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'> 28 <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
  29 + <view style='height:40rpx'>
  30 + <text class='text_999_28 float_left'>配偶姓名</text>
  31 + <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
  32 + </view>
  33 + <view style='height:40rpx'>
  34 + <text class='text_999_28 float_left'>配偶身份证件类型</text>
  35 + <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text>
  36 + </view>
  37 + <view style='height:40rpx'>
  38 + <text class='text_999_28 float_left'>配偶身份证号</text>
  39 + <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text>
  40 + </view>
  41 + <view style='height:40rpx'>
  42 + <text class='text_999_28 float_left'>出生日期</text>
  43 + <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text>
  44 + </view>
  45 + <view style='height:40rpx'>
  46 + <text class='text_999_28 float_left'>国籍</text>
  47 + <text class='text_333_28 float_right'>中国</text>
  48 + </view>
  49 + <view style='height:40rpx'>
  50 + <text class='text_999_28 float_left'>与纳税人关系</text>
  51 + <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text>
  52 + </view>
  53 +
29 <view style='height:40rpx'> 54 <view style='height:40rpx'>
30 <text class='text_999_28 float_left'>子女姓名</text> 55 <text class='text_999_28 float_left'>子女姓名</text>
31 - <text class='text_333_28 float_right'>纳兰嫣然</text> 56 + <text class='text_333_28 float_right'>{{new_data.children_name}}</text>
32 </view> 57 </view>
33 <view style='height:40rpx'> 58 <view style='height:40rpx'>
34 - <text class='text_999_28 float_left'>子女母亲姓名</text>  
35 - <text class='text_333_28 float_right'>纳兰容若</text> 59 + <text class='text_999_28 float_left'>子女身份证件类型</text>
  60 + <text class='text_333_28 float_right'>{{new_data.children_cardtype}}</text>
36 </view> 61 </view>
37 <view style='height:40rpx'> 62 <view style='height:40rpx'>
38 <text class='text_999_28 float_left'>子女身份证号</text> 63 <text class='text_999_28 float_left'>子女身份证号</text>
39 - <text class='text_333_28 float_right'>4225238975982724781</text> 64 + <text class='text_333_28 float_right'>{{new_data.children_idno}}</text>
  65 + </view>
  66 + <view style='height:40rpx'>
  67 + <text class='text_999_28 float_left'>出生日期</text>
  68 + <text class='text_333_28 float_right'>{{new_data.children_birthDate}}</text>
  69 + </view>
  70 + <view style='height:40rpx'>
  71 + <text class='text_999_28 float_left'>国籍</text>
  72 + <text class='text_333_28 float_right'>中国</text>
40 </view> 73 </view>
41 <view style='height:40rpx'> 74 <view style='height:40rpx'>
42 <text class='text_999_28 float_left'>学籍号</text> 75 <text class='text_999_28 float_left'>学籍号</text>
43 - <text class='text_333_28 float_right'>86309486903</text> 76 + <text class='text_333_28 float_right'>{{new_data.children_schoolno}}</text>
44 </view> 77 </view>
45 <view style='height:40rpx'> 78 <view style='height:40rpx'>
46 - <text class='text_999_28 float_left'>教育阶段</text>  
47 - <text class='text_333_28 float_right'>高中</text> 79 + <text class='text_999_28 float_left'>受教育阶段</text>
  80 + <text class='text_333_28 float_right'>{{new_data.edu_degree}}</text>
48 </view> 81 </view>
49 <view style='height:40rpx'> 82 <view style='height:40rpx'>
50 - <text class='text_999_28 float_left'>扣除金额</text>  
51 - <text class='text_333_28 float_right'>3232.0</text> 83 + <text class='text_999_28 float_left'>受教育日期起</text>
  84 + <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text>
52 </view> 85 </view>
53 <view style='height:40rpx'> 86 <view style='height:40rpx'>
  87 + <text class='text_999_28 float_left'>预计受教育日期止</text>
  88 + <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text>
  89 + </view>
  90 + <!-- <view style='height:40rpx'>
  91 + <text class='text_999_28 float_left'>扣除金额</text>
  92 + <text class='text_333_28 float_right'>{{new_data.reduce_money}}</text>
  93 + </view> -->
  94 + <view style='height:40rpx'>
54 <text class='text_999_28 float_left'>扣除比例</text> 95 <text class='text_999_28 float_left'>扣除比例</text>
55 - <text class='text_333_28 float_right'>40%</text> 96 + <text class='text_333_28 float_right'>{{new_data.reduce_ratio}}</text>
56 </view> 97 </view>
57 </view> 98 </view>
58 99
@@ -60,39 +101,60 @@ @@ -60,39 +101,60 @@
60 <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 101 <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
61 <view style='height:40rpx'> 102 <view style='height:40rpx'>
62 <text class='text_999_28 float_left'>教育类型</text> 103 <text class='text_999_28 float_left'>教育类型</text>
63 - <text class='text_333_28 float_right'>消防工程师</text> 104 + <text class='text_333_28 float_right'>{{new_data.edu_type}}</text>
64 </view> 105 </view>
65 - <view style='height:40rpx'>  
66 - <text class='text_999_28 float_left'>职业资格名称</text>  
67 - <text class='text_333_28 float_right'>pmp</text> 106 + <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==0}}'>
  107 + <text class='text_999_28 float_left'>教育阶段</text>
  108 + <text class='text_333_28 float_right'>{{new_data.degree_level}}</text>
  109 + </view>
  110 + <view style='height:40rpx'>
  111 + <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期起</text>
  112 + <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text>
68 </view> 113 </view>
69 <view style='height:40rpx'> 114 <view style='height:40rpx'>
70 - <text class='text_999_28 float_left'>职业资格编号</text>  
71 - <text class='text_333_28 float_right'>ed29839284</text> 115 + <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期止</text>
  116 + <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text>
  117 + </view>
  118 +
  119 + <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
  120 + <text class='text_999_28 float_left'>证书名称名称</text>
  121 + <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_name}}</text>
  122 + </view>
  123 + <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
  124 + <text class='text_999_28 float_left'>证书编号</text>
  125 + <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_no}}</text>
  126 + </view>
  127 + <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
  128 + <text class='text_999_28 float_left'>发证机关</text>
  129 + <text class='text_333_28 float_right'>{{new_data.license_unit}}</text>
72 </view> 130 </view>
73 </view> 131 </view>
74 132
75 <!-- 赡养老人 --> 133 <!-- 赡养老人 -->
76 <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 134 <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
77 <view style='height:40rpx'> 135 <view style='height:40rpx'>
  136 + <text class='text_999_28 float_left'>赡养类型</text>
  137 + <text class='text_333_28 float_right'>{{new_data.older_name}}</text>
  138 + </view>
  139 + <view style='height:40rpx'>
78 <text class='text_999_28 float_left'>老人姓名</text> 140 <text class='text_999_28 float_left'>老人姓名</text>
79 - <text class='text_333_28 float_right'>任我行</text> 141 + <text class='text_333_28 float_right'>{{new_data.older_name}}</text>
80 </view> 142 </view>
81 <view style='height:40rpx'> 143 <view style='height:40rpx'>
82 <text class='text_999_28 float_left'>老人身份证号</text> 144 <text class='text_999_28 float_left'>老人身份证号</text>
83 - <text class='text_333_28 float_right'>9523</text> 145 + <text class='text_333_28 float_right'>{{new_data.older_idno}}</text>
84 </view> 146 </view>
85 <view style='height:40rpx'> 147 <view style='height:40rpx'>
86 - <text class='text_999_28 float_left'>与老人关系</text>  
87 - <text class='text_333_28 float_right'>父子</text> 148 + <text class='text_999_28 float_left'>与老人的关系</text>
  149 + <text class='text_333_28 float_right'>{{new_data.older_relative}}</text>
88 </view> 150 </view>
89 <view style='height:40rpx'> 151 <view style='height:40rpx'>
90 <text class='text_999_28 float_left'>是否独生子女</text> 152 <text class='text_999_28 float_left'>是否独生子女</text>
91 - <text class='text_333_28 float_right'>否</text> 153 + <text class='text_333_28 float_right'>{{new_data.singlechildData}}</text>
92 </view> 154 </view>
93 <view style='height:40rpx'> 155 <view style='height:40rpx'>
94 <text class='text_999_28 float_left'>分摊比例</text> 156 <text class='text_999_28 float_left'>分摊比例</text>
95 - <text class='text_333_28 float_right'>5:5</text> 157 + <text class='text_333_28 float_right'>{{new_data.allocation_ratio}}</text>
96 </view> 158 </view>
97 </view> 159 </view>
98 160
@@ -100,7 +162,7 @@ @@ -100,7 +162,7 @@
100 <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 162 <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
101 <view style='height:40rpx'> 163 <view style='height:40rpx'>
102 <text class='text_999_28 float_left'>扣除金额</text> 164 <text class='text_999_28 float_left'>扣除金额</text>
103 - <text class='text_333_28 float_right'>42895</text> 165 + <text class='text_333_28 float_right'>{{new_data.reduce_money}}</text>
104 </view> 166 </view>
105 </view> 167 </view>
106 168
@@ -108,16 +170,16 @@ @@ -108,16 +170,16 @@
108 <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> 170 <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
109 <view style='height:40rpx'> 171 <view style='height:40rpx'>
110 <text class='text_999_28 float_left'>配偶姓名</text> 172 <text class='text_999_28 float_left'>配偶姓名</text>
111 - <text class='text_333_28 float_right'>刘顺丰</text> 173 + <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
112 </view> 174 </view>
113 <view style='height:40rpx'> 175 <view style='height:40rpx'>
114 <text class='text_999_28 float_left'>配偶身份证号</text> 176 <text class='text_999_28 float_left'>配偶身份证号</text>
115 - <text class='text_333_28 float_right'>42902384023855252</text> 177 + <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text>
116 </view> 178 </view>
117 </view> 179 </view>
118 <view style='height:40rpx;padding:0 30rpx 30rpx 30rpx;'> 180 <view style='height:40rpx;padding:0 30rpx 30rpx 30rpx;'>
119 <text class='text_999_28 float_left'>扣除时间</text> 181 <text class='text_999_28 float_left'>扣除时间</text>
120 - <text class='text_333_28 float_right'>2019年10月</text> 182 + <text class='text_333_28 float_right'>{{new_data.reduce_date}}</text>
121 </view> 183 </view>
122 184
123 <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view> 185 <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view>
@@ -88,19 +88,19 @@ @@ -88,19 +88,19 @@
88 <view style='margin-top:2rpx;background:#ffffff;padding-bottom:30rpx'> 88 <view style='margin-top:2rpx;background:#ffffff;padding-bottom:30rpx'>
89 <view style='padding:30rpx'> 89 <view style='padding:30rpx'>
90 <text class='text_wrap_left'>公司名称</text> 90 <text class='text_wrap_left'>公司名称</text>
91 - <text class='text_wrap_right'>400000.00</text> 91 + <text class='text_wrap_right'>北京小爱智能科技</text>
92 </view> 92 </view>
93 <view style='padding:30rpx'> 93 <view style='padding:30rpx'>
94 <text class='text_wrap_left'>计薪时间</text> 94 <text class='text_wrap_left'>计薪时间</text>
95 - <text class='text_wrap_right'>400000.00</text> 95 + <text class='text_wrap_right'>2018/09/09 20:10</text>
96 </view> 96 </view>
97 <view style='padding:30rpx'> 97 <view style='padding:30rpx'>
98 <text class='text_wrap_left'>发薪时间</text> 98 <text class='text_wrap_left'>发薪时间</text>
99 - <text class='text_wrap_right'>400000.00</text> 99 + <text class='text_wrap_right'>2018/09/10 09:00 </text>
100 </view> 100 </view>
101 <view style='padding:30rpx'> 101 <view style='padding:30rpx'>
102 <text class='text_wrap_left'>实发工资</text> 102 <text class='text_wrap_left'>实发工资</text>
103 - <text class='text_wrap_right'>400000.00</text> 103 + <text class='text_wrap_right'>13860.00</text>
104 </view> 104 </view>
105 </view> 105 </view>
106 </scroll-view> 106 </scroll-view>
@@ -11,6 +11,8 @@ Page({ @@ -11,6 +11,8 @@ Page({
11 data: { 11 data: {
12 cur_index:0, 12 cur_index:0,
13 choosed_date: '', 13 choosed_date: '',
  14 + typearray:['工资薪金','劳务费'],
  15 + choosed_type:'',
14 long_date: 0 16 long_date: 0
15 }, 17 },
16 18
@@ -65,6 +67,13 @@ Page({ @@ -65,6 +67,13 @@ Page({
65 }); 67 });
66 }, 68 },
67 69
  70 + salarytypeChange:function(e){
  71 + var that = this
  72 + that.setData({
  73 + choosed_type: that.data.typearray[e.detail.value]
  74 + })
  75 + },
  76 +
68 /** 77 /**
69 * Lifecycle function--Called when page is initially rendered 78 * Lifecycle function--Called when page is initially rendered
70 */ 79 */
1 <!--pages/main/finalpayment/historydetail/historydetail.wxml--> 1 <!--pages/main/finalpayment/historydetail/historydetail.wxml-->
2 <view class='page'> 2 <view class='page'>
3 -<picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">  
4 - <view style='padding:30rpx;'>  
5 - <text class='text_gray_32'>当前选择月份</text>  
6 - <view class='float_right'>  
7 - <text class='text_gray_32'>{{choosed_date}}</text>  
8 - <image class='arrow_wrap' style='margin-top: 8rpx' src='/images/arrow_right.png'></image> 3 + <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
  4 + <view style='padding:30rpx;'>
  5 + <text class='text_gray_32'>当前选择月份</text>
  6 + <view class='float_right'>
  7 + <text class='text_gray_32'>{{choosed_date}}</text>
  8 + <image class='arrow_wrap' style='margin-top: 8rpx' src='/images/arrow_right.png'></image>
  9 + </view>
9 </view> 10 </view>
10 - </view>  
11 </picker> 11 </picker>
12 <view style='height:20rpx;width:100%;background:#f5f5f5'></view> 12 <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
13 13
14 <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'> 14 <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'>
15 <image class='icon_wrap' src="/images/rectangle_icon.png"></image> 15 <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
16 - <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>专项附加扣除概览</text> 16 + <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>月度缴纳概览</text>
17 </view> 17 </view>
18 <view class='divide_line_f5f5f5'></view> 18 <view class='divide_line_f5f5f5'></view>
19 19
@@ -24,14 +24,14 @@ @@ -24,14 +24,14 @@
24 <view class='divide_line_f5f5f5'></view> 24 <view class='divide_line_f5f5f5'></view>
25 25
26 <view style='display: flex;flex-wrap: nowrap;height:144rpx'> 26 <view style='display: flex;flex-wrap: nowrap;height:144rpx'>
27 - <view style='flex-grow: 1;justify-content:center;display: flex;flex-direction: column;'>  
28 - <text class='text_num_wrap'>24138.2</text>  
29 - <text class='text_text_wrap'>所得(元)</text> 27 + <view style='flex-grow: 1;justify-content:center;display: flex;flex-direction: column;'>
  28 + <text class='text_num_wrap'>24138.2</text>
  29 + <text class='text_text_wrap'>所得(元)</text>
30 </view> 30 </view>
31 <view style='width:2rpx;height:84rpx;background:#f5f5f5;'></view> 31 <view style='width:2rpx;height:84rpx;background:#f5f5f5;'></view>
32 <view style='flex-grow: 1;justify-content:center;display: flex;flex-direction: column;'> 32 <view style='flex-grow: 1;justify-content:center;display: flex;flex-direction: column;'>
33 - <text class='text_num_wrap'>5861.8</text>  
34 - <text class='text_text_wrap'>应纳税额(元)</text> 33 + <text class='text_num_wrap'>5861.8</text>
  34 + <text class='text_text_wrap'>应纳税额(元)</text>
35 </view> 35 </view>
36 </view> 36 </view>
37 37
@@ -39,27 +39,133 @@ @@ -39,27 +39,133 @@
39 <view style='padding:0 30rpx;height:100rpx'> 39 <view style='padding:0 30rpx;height:100rpx'>
40 <text class='text_333_28_bold ' style='line-height:100rpx'>专项扣除</text> 40 <text class='text_333_28_bold ' style='line-height:100rpx'>专项扣除</text>
41 </view> 41 </view>
42 -  
43 <view> 42 <view>
44 <view style='height:2rpx;width:94%;background:#f5f5f5;align-self:center'></view> 43 <view style='height:2rpx;width:94%;background:#f5f5f5;align-self:center'></view>
45 <view style='padding:0 30rpx;height:80rpx'> 44 <view style='padding:0 30rpx;height:80rpx'>
46 <text class='text_333_28 float_left'>基本养老保险</text> 45 <text class='text_333_28 float_left'>基本养老保险</text>
47 - <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input> 46 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1100.00'> </input>
48 </view> 47 </view>
49 <view style='height:2rpx;width:94%;background:#f5f5f5'></view> 48 <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
50 <view style='padding:0 30rpx;height:80rpx'> 49 <view style='padding:0 30rpx;height:80rpx'>
51 <text class='text_333_28 float_left'>基本失业保险</text> 50 <text class='text_333_28 float_left'>基本失业保险</text>
52 - <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input> 51 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='380.00'> </input>
53 </view> 52 </view>
54 <view style='height:2rpx;width:94%;background:#f5f5f5'></view> 53 <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
55 <view style='padding:0 30rpx;height:80rpx'> 54 <view style='padding:0 30rpx;height:80rpx'>
56 <text class='text_333_28 float_left'>基本医疗保险</text> 55 <text class='text_333_28 float_left'>基本医疗保险</text>
57 - <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input> 56 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='120.00'> </input>
58 </view> 57 </view>
59 <view style='height:2rpx;width:94%;background:#f5f5f5'></view> 58 <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
60 <view style='padding:0 30rpx;height:80rpx'> 59 <view style='padding:0 30rpx;height:80rpx'>
61 <text class='text_333_28 float_left'>住房公积金</text> 60 <text class='text_333_28 float_left'>住房公积金</text>
62 - <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input> 61 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  62 + </view>
  63 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  64 + <view style='padding:0 30rpx;height:80rpx'>
  65 + <text class='text_333_28 float_left'>总额</text>
  66 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  67 + </view>
  68 + </view>
  69 +
  70 + <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
  71 + <view style='padding:0 30rpx;height:100rpx'>
  72 + <text class='text_333_28_bold ' style='line-height:100rpx'>法定扣除</text>
  73 + </view>
  74 + <view>
  75 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  76 + <view style='padding:0 30rpx;height:80rpx'>
  77 + <text class='text_333_28 float_left'>捐赠</text>
  78 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='120.00'> </input>
  79 + </view>
  80 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  81 + <view style='padding:0 30rpx;height:80rpx'>
  82 + <text class='text_333_28 float_left'>总额</text>
  83 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  84 + </view>
  85 + </view>
  86 +
  87 + <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
  88 + <view style='padding:0 30rpx;height:100rpx'>
  89 + <text class='text_333_28_bold ' style='line-height:100rpx'>专项附加扣除</text>
  90 + </view>
  91 + <view>
  92 + <view style='height:2rpx;width:94%;background:#f5f5f5;align-self:center'></view>
  93 + <view style='padding:0 30rpx;height:80rpx'>
  94 + <text class='text_333_28 float_left'>继续教育</text>
  95 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1100.00'> </input>
  96 + </view>
  97 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  98 + <view style='padding:0 30rpx;height:80rpx'>
  99 + <text class='text_333_28 float_left'>子女教育</text>
  100 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='380.00'> </input>
  101 + </view>
  102 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  103 + <view style='padding:0 30rpx;height:80rpx'>
  104 + <text class='text_333_28 float_left'>大病医疗</text>
  105 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='120.00'> </input>
  106 + </view>
  107 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  108 + <view style='padding:0 30rpx;height:80rpx'>
  109 + <text class='text_333_28 float_left'>住房贷款利息</text>
  110 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  111 + </view>
  112 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  113 + <view style='padding:0 30rpx;height:80rpx'>
  114 + <text class='text_333_28 float_left'>住房租金</text>
  115 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  116 + </view>
  117 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  118 + <view style='padding:0 30rpx;height:80rpx'>
  119 + <text class='text_333_28 float_left'>赡养老人</text>
  120 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  121 + </view>
  122 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  123 + <view style='padding:0 30rpx;height:80rpx'>
  124 + <text class='text_333_28 float_left'>总额</text>
  125 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
  126 + </view>
  127 + </view>
  128 +
  129 + <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
  130 + <view style='padding:0 30rpx;height:100rpx'>
  131 + <text class='text_333_28_bold ' style='line-height:100rpx'>收入及个税</text>
  132 + </view>
  133 + <view>
  134 + <view style='height:2rpx;width:94%;background:#f5f5f5;align-self:center'></view>
  135 +
  136 + <picker bindchange="salarytypeChange" value="" range="{{typearray}}">
  137 + <view style='padding:0 30rpx;height:80rpx'>
  138 + <text class='text_333_28 float_left'>收入类型</text>
  139 + <view class='float_right'>
  140 + <text class='text_999_28'>{{choosed_type}}</text>
  141 + <image class='arrow_wrap' style='margin-top: 20rpx' src='/images/arrow_right.png'></image>
  142 + </view>
  143 + </view>
  144 + </picker>
  145 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  146 + <view style='padding:0 30rpx;height:80rpx'>
  147 + <text class='text_333_28 float_left'>收入金额(含免税部分)</text>
  148 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='380.00'> </input>
  149 + </view>
  150 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  151 + <view style='padding:0 30rpx;height:80rpx'>
  152 + <text class='text_333_28 float_left'>已申报个税</text>
  153 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='120.00'> </input>
  154 + </view>
  155 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  156 + <view style='padding:0 30rpx;height:80rpx'>
  157 + <text class='text_333_28 float_left'>申报单位</text>
  158 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='北京小爱智能科技'> </input>
  159 + </view>
  160 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  161 + <view style='padding:0 30rpx;height:80rpx'>
  162 + <text class='text_333_28 float_left'>申报地</text>
  163 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='北京市/朝阳区'> </input>
  164 + </view>
  165 + <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
  166 + <view style='padding:0 30rpx;height:80rpx'>
  167 + <text class='text_333_28 float_left'>含税收入总额</text>
  168 + <input class='text_999_28 float_right' style='margin-top:12rpx' value='1800.00'> </input>
63 </view> 169 </view>
64 </view> 170 </view>
65 171
@@ -69,6 +69,12 @@ Page({ @@ -69,6 +69,12 @@ Page({
69 }, { 69 }, {
70 name: '住房已扣除金额', 70 name: '住房已扣除金额',
71 data: 78, 71 data: 78,
  72 + }, {
  73 + name: '剩余扣除额度可扣除金额',
  74 + data: 35,
  75 + }, {
  76 + name: '剩余扣除额度已扣除金额',
  77 + data: 78,
72 },], 78 },],
73 width: windowWidth, 79 width: windowWidth,
74 height: 320, 80 height: 320,
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <view style='background:#fff'> 4 <view style='background:#fff'>
5 <picker mode="date" fields="year" start="1970" end="2100" bindchange="datePickerChange"> 5 <picker mode="date" fields="year" start="1970" end="2100" bindchange="datePickerChange">
6 <view style='padding:30rpx;'> 6 <view style='padding:30rpx;'>
7 - <text class='text_gray_32'>本人年度累计缴税情况</text> 7 + <text class='text_gray_32'>本人年度缴税情况</text>
8 <view class='float_right'> 8 <view class='float_right'>
9 <text class='text_gray_32'>{{choosed_date}}</text> 9 <text class='text_gray_32'>{{choosed_date}}</text>
10 <image class='arrow_wrap' src='/images/arrow_right.png'></image> 10 <image class='arrow_wrap' src='/images/arrow_right.png'></image>
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <view style='width:2rpx;height:84rpx;background:#E5E5E5;'></view> 70 <view style='width:2rpx;height:84rpx;background:#E5E5E5;'></view>
71 <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'> 71 <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>
72 <text class='text_333_bold_36'>133.09</text> 72 <text class='text_333_bold_36'>133.09</text>
73 - <text class='text_333_22'>剩余已抵扣额度</text> 73 + <text class='text_333_22'>剩余可抵扣额度</text>
74 </view> 74 </view>
75 </view> 75 </view>
76 76
@@ -20,7 +20,7 @@ var config = { @@ -20,7 +20,7 @@ var config = {
20 columePadding: 3, 20 columePadding: 3,
21 fontSize: 10, 21 fontSize: 10,
22 dataPointShape: ['diamond', 'circle', 'triangle', 'rect'], 22 dataPointShape: ['diamond', 'circle', 'triangle', 'rect'],
23 - colors: ['#FF76A5', '#FF9FC0', '#00CFBC', '#4DDDD0', '#FFBB23','#FFCF65', '#2092FF','#63B2FF', '#6F39FF', '#9A74FF' ], 23 + colors: ['#FF76A5', '#FF9FC0', '#00CFBC', '#4DDDD0', '#FFBB23', '#FFCF65', '#2092FF', '#63B2FF', '#6F39FF', '#9A74FF','#FF4848', '#FF7F7F' ],
24 pieChartLinePadding: 25, 24 pieChartLinePadding: 25,
25 pieChartTextPadding: 15, 25 pieChartTextPadding: 15,
26 xAxisTextPadding: 3, 26 xAxisTextPadding: 3,
请 注册 或 登录 后发表评论