wangyu / naturalPersonTax · 提交

提交 6052a0a9849fc53b45140f79441115833e43d815

作者 wangyu
2 个父辈 8585cd0b abe98f07
构建： 未知

Merge branch 'dev2.0' into 海峡 

# Conflicts:
#	app.js
#	pages/getPhone/getPhone.json
#	pages/login/login.json
#	pages/main/guide/guide.json
#	pages/main/taxperson/home.json
内嵌 并排对比
正在显示 23 个修改的文件 包含 1156 行增加 和 455 行删除
1 1 const appId = 'wx04262fa98a7de5b6';
2   -
3 2 App({
4 3 onLaunch: function() {
5 4 var that = this;
... ...

8.4 KB | 宽: | 高:

5.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

10.1 KB | 宽: | 高:

7.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

68.8 KB | 宽: | 高:

108.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

9.5 KB | 宽: | 高:

7.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
1 1 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
2 2 var format = require('../../../../utils/util.js');
3   -var countryInfo = require('../../../../utils/country.js');
  3 +// var countryInfo = require('../../../../utils/country.js');
4 4 var OSSInit;
5 5 var app = getApp();
6 6 var baseUrl = app.globalData.baseUrl;
... ... @@ -313,10 +313,10 @@ Page({
313 313 },
314 314 studyEndDate: {
315 315 label: '受教育时间止',
316   - isrequre: true,
  316 + // isrequre: true,
317 317 bindtype: 'study_end_date',
318 318 selected: '',
319   - isblack: 'true',
  319 + // isblack: 'true',
320 320 values: ["是", "否"],
321 321 placeholder: '请选择时间',
322 322 onChange: 'onPickerSelect',
... ... @@ -384,7 +384,7 @@ Page({
384 384 selected: '',
385 385 isrequre: true,
386 386 isblack: 'true',
387   - values: ["企业", "个人"],
  387 + values: ["组织", "个人"],
388 388 placeholder: '请选择出租方类型',
389 389 onChange: 'onPickerSelect'
390 390 },
... ... @@ -500,32 +500,32 @@ Page({
500 500 label: '就读国家(地区)',
501 501 bindtype: 'school_country',
502 502 isrequre: true,
503   - selected: '中国(大陆)',
  503 + selected: '中国',
504 504 isblack: 'true',
505 505 values: [],
506   - placeholder: '中国(大陆)',
  506 + placeholder: '中国',
507 507 onChange: 'onPickerSelect',
508 508 },
509   - bankInfo: {
510   - label: '公积金贷款银行',
511   - bindtype: 'bank',
512   - maxWidth: 400,
513   - isrequre: true,
514   - placeholder: '请选择贷款银行',
515   - selected: '',
516   - values: [],
517   - onChange: 'onPickerSelect'
518   - },
519   - bankInfo_2: {
520   - label: '商业贷款银行',
521   - bindtype: 'bank_2',
522   - maxWidth: 430,
523   - isrequre: true,
524   - placeholder: '请选择贷款银行',
525   - selected: '',
526   - values: [],
527   - onChange: 'onPickerSelect'
528   - },
  509 + // bankInfo: {
  510 + // label: '公积金贷款银行',
  511 + // bindtype: 'bank',
  512 + // maxWidth: 400,
  513 + // isrequre: true,
  514 + // placeholder: '请选择贷款银行',
  515 + // selected: '',
  516 + // values: [],
  517 + // onChange: 'onPickerSelect'
  518 + // },
  519 + // bankInfo_2: {
  520 + // label: '商业贷款银行',
  521 + // bindtype: 'bank_2',
  522 + // maxWidth: 430,
  523 + // isrequre: true,
  524 + // placeholder: '请选择贷款银行',
  525 + // selected: '',
  526 + // values: [],
  527 + // onChange: 'onPickerSelect'
  528 + // },
529 529 edu_lable: "school",
530 530 oldersupport_lable: "",
531 531 img_path: "/images/upload_img.png"
... ... @@ -536,6 +536,7 @@ Page({
536 536 */
537 537 onLoad: function(options) {
538 538
  539 + this.getTaxHostInfo()
539 540 var pages = getCurrentPages()
540 541 var frontPage = pages[pages.length - 2]
541 542 console.log('---------frontPage', frontPage.data)
... ... @@ -556,10 +557,14 @@ Page({
556 557 // deduction_amount = Deduce_amounts_year[nameKey] ? Deduce_amounts_year[nameKey] : 0
557 558 }
558 559 if ("children_education" == options.status) {
559   - this.loadCountry()
  560 + this.getCountry()
560 561 if (options.isedit != 'true'){
561 562 this.getTaxList()
562 563 }
  564 + this.data.taxperson_relativeData.values = ['子','女']
  565 + this.setData({
  566 + taxperson_relativeData: this.data.taxperson_relativeData
  567 + })
563 568 } else if ("continuing_education" == options.status) {
564 569 this.getCertificates()
565 570 var studystart_date = this.data.studystartdate
... ... @@ -590,7 +595,7 @@ Page({
590 595 deduction_amount: deduction_amount
591 596 })
592 597 } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") {
593   - this.getbanklist()
  598 + // this.getbanklist()
594 599 if (options.isedit != 'true') {
595 600 this.getTaxList()
596 601 }
... ... @@ -604,7 +609,7 @@ Page({
604 609 reduce_typeData.selected = '年度'
605 610 }
606 611 } else if (frontPage.data.house_type == "house_fund_loan") {
607   - this.getbanklist()
  612 + // this.getbanklist()
608 613 if (options.isedit != 'true') {
609 614 this.getTaxList()
610 615 }
... ... @@ -642,6 +647,37 @@ Page({
642 647 }
643 648 }
644 649 },
  650 +
  651 + getTaxHostInfo: function () {
  652 + var that = this;
  653 + var Authorization = app.globalData.Authorization;
  654 + wx.request({
  655 + url: baseUrl + 'persontax/v1/personal-taxes',
  656 + method: "GET",
  657 + header: {
  658 + 'content-type': 'application/json', // 默认值
  659 + "Authorization": Authorization
  660 + },
  661 + data: {
  662 + 'all': true
  663 + },
  664 + success: function (res) {
  665 + if (res.statusCode == 200) {
  666 + var data = res.data
  667 + if (data.items && data.items.length > 0) {
  668 + for (var i = 0; i < data.items.length; i++) {
  669 + if (data.items[i].family_ties == "本人") {
  670 + app.globalData.hostInfo = data.items[i]
  671 + break;
  672 + }
  673 + }
  674 + }
  675 + }
  676 + }
  677 + })
  678 + },
  679 +
  680 +
645 681 getTaxList: function () {
646 682 var that = this;
647 683 wx.showLoading({
... ... @@ -690,16 +726,56 @@ Page({
690 726 }
691 727 })
692 728 },
693   - loadCountry: function() {
694   - countryInfo.init(this)
695   - var countrylist = this.data.country
696   - var country_data = this.data.schoolCountryData
697   - for (var i = 0; i < countrylist.length; i++) {
698   - country_data.values.push(countrylist[i].name)
699   - }
700   - console.log("countrydata", country_data)
701   - this.setData({
702   - schoolCountryData: country_data
  729 + // loadCountry: function() {
  730 + // countryInfo.init(this)
  731 + // var countrylist = this.data.country
  732 + // var country_data = this.data.schoolCountryData
  733 + // for (var i = 0; i < countrylist.length; i++) {
  734 + // country_data.values.push(countrylist[i].name)
  735 + // }
  736 + // console.log("countrydata", country_data)
  737 + // this.setData({
  738 + // schoolCountryData: country_data
  739 + // })
  740 + // },
  741 +
  742 + //****************获取国籍数据************/
  743 + getCountry: function () {
  744 + var that = this
  745 + wx.showLoading()
  746 + var Authorization = app.globalData.Authorization;
  747 + wx.request({
  748 + url: baseUrl + 'persontax/v1/nation-list',
  749 + method: "GET",
  750 + header: {
  751 + 'content-type': 'application/json', // 默认值
  752 + "Authorization": Authorization
  753 + },
  754 + success: function (res) {
  755 + var countrys = res.data.concat()
  756 + if (countrys.indexOf('中国') > -1) {
  757 + countrys.splice(countrys.indexOf('中国'), 1);
  758 + }
  759 + if (countrys.indexOf('中国台湾') > -1) {
  760 + countrys.splice(countrys.indexOf('中国台湾'), 1);
  761 + }
  762 + if (countrys.indexOf('香港') > -1) {
  763 + countrys.splice(countrys.indexOf('香港'), 1);
  764 + }
  765 + if (countrys.indexOf('澳门') > -1) {
  766 + countrys.splice(countrys.indexOf('澳门'), 1);
  767 + }
  768 + // that.data.countryData.values = countrys
  769 + that.data.schoolCountryData.values = res.data
  770 + that.countrys = countrys
  771 + that.setData({
  772 + // countryData: that.data.countryData,
  773 + schoolCountryData: that.data.schoolCountryData
  774 + })
  775 + },
  776 + complete() {
  777 + wx.hideLoading()
  778 + }
703 779 })
704 780 },
705 781 handlEditData: function (data) {
... ... @@ -709,6 +785,10 @@ Page({
709 785 switch (this.data.cur_index + '') {
710 786 case 'children_education':
711 787 var setData = {}
  788 + if (data.relationship && data.relationship.length) {
  789 + this.data.taxperson_relativeData.selected = data.relationship
  790 + setData.taxperson_relativeData = this.data.taxperson_relativeData
  791 + }
712 792 var commonbirthDate = this.data.commonbirthDate
713 793 commonbirthDate.selected = format.formatTime_date(data.birth_date)
714 794 commonbirthDate.datelong = data.birth_date
... ... @@ -721,9 +801,11 @@ Page({
721 801 studystartdate.datelong = data.education_start
722 802 setData.studystartdate = studystartdate
723 803 var studyEndDate = this.data.studyEndDate
724   - studyEndDate.selected = format.formatTime_month(data.education_end)
725   - studyEndDate.datelong = data.education_end
726   - setData.studyEndDate = studyEndDate
  804 + if (data.education_end > 0) {
  805 + studyEndDate.selected = format.formatTime_month(data.education_end)
  806 + studyEndDate.datelong = data.education_end
  807 + setData.studyEndDate = studyEndDate
  808 + }
727 809 var studyPeriodDate = this.data.studyPeriodDate
728 810 if (data.education_period_end > 0){
729 811 studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
... ... @@ -905,7 +987,7 @@ Page({
905 987 })
906 988 var leasetype_Data = this.data.leasetypeData
907 989 leasetype_Data.selected = data.owner_type
908   - this.data.cardtypeData.hidden = data.owner_type == "企业"
  990 + this.data.cardtypeData.hidden = data.owner_type == "组织"
909 991 setData.leasetypeData = leasetype_Data,
910 992 setData.cardtypeData = this.data.cardtypeData
911 993 setData.owner_name = data.owner_name
... ... @@ -973,9 +1055,9 @@ Page({
973 1055 setData.loan_contract_no = data.loan_contract_no
974 1056 }
975 1057 if (data.loan_bank && data.loan_bank.length) {
976   - var bank_data = this.data.bankInfo
977   - bank_data.selected = data.loan_bank
978   - setData.bankInfo = bank_data
  1058 + // var bank_data = this.data.bankInfo
  1059 + // bank_data.selected = data.loan_bank
  1060 + setData.loan_bank = data.loan_bank
979 1061 }
980 1062 var firstpayback_Date = this.data.firstpaybackDate
981 1063 firstpayback_Date.selected = format.formatTime_date(data.loan_start)
... ... @@ -988,9 +1070,10 @@ Page({
988 1070 setData.sec_loan_contract_no = data.sec_loan_contract_no
989 1071 }
990 1072 if (data.sec_loan_bank && data.sec_loan_bank.length) {
991   - var bank_data = this.data.bankInfo_2
992   - bank_data.selected = data.sec_loan_bank
993   - setData.bankInfo_2 = bank_data
  1073 + // var bank_data = this.data.bankInfo_2
  1074 + // bank_data.selected = data.sec_loan_bank
  1075 + // setData.bankInfo_2 = bank_data
  1076 + setData.sec_loan_bank = data.sec_loan_bank
994 1077 }
995 1078 var firstpaybackDate_2 = this.data.firstpaybackDate_2
996 1079 firstpaybackDate_2.selected = format.formatTime_date(data.sec_loan_start)
... ... @@ -1024,6 +1107,11 @@ Page({
1024 1107 if (data.name && data.name.length) {
1025 1108 setData.children_name = data.name
1026 1109 }
  1110 + if (data.family_ties && data.family_ties.length) {
  1111 + var taxperson_relativeData = this.data.taxperson_relativeData
  1112 + taxperson_relativeData.selected = data.family_ties
  1113 + setData.taxperson_relativeData = taxperson_relativeData
  1114 + }
1027 1115 this.setData(setData)
1028 1116 break;
1029 1117 case 'support_duty':
... ... @@ -1039,6 +1127,11 @@ Page({
1039 1127 setData.id_card_no = data.id_card_no
1040 1128 this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
1041 1129 }
  1130 + if (data.family_ties && data.family_ties.length) {
  1131 + var older_relativeData = this.data.older_relativeData
  1132 + older_relativeData.selected = data.family_ties
  1133 + setData.older_relativeData = older_relativeData
  1134 + }
1042 1135 this.setData(setData)
1043 1136 break;
1044 1137 case 'medical_fund':
... ... @@ -1185,36 +1278,36 @@ Page({
1185 1278 })
1186 1279 },
1187 1280
1188   - getbanklist: function() {
1189   - var that = this
1190   - var Authorization = app.globalData.Authorization;
1191   - var bank_info = that.data.bankInfo
1192   - var bank_info_2 = that.data.bankInfo_2
1193   - wx.request({
1194   - url: baseUrl + 'persontax/v1/bank-list',
1195   - method: "GET",
1196   - header: {
1197   - 'content-type': 'application/json', // 默认值
1198   - "Authorization": Authorization
1199   - },
1200   - success: function(res) {
1201   - console.log(res)
1202   - bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
1203   - bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
1204   - that.setData({
1205   - bankInfo: bank_info,
1206   - bankInfo_2: bank_info_2
1207   - })
1208   - console.log("bankInfo", that.data.bankInfo)
1209   - },
1210   - fail(res) {
1211   - console.log(res)
1212   - },
1213   - complete() {
1214   - wx.hideLoading()
1215   - }
1216   - })
1217   - },
  1281 + // getbanklist: function() {
  1282 + // var that = this
  1283 + // var Authorization = app.globalData.Authorization;
  1284 + // var bank_info = that.data.bankInfo
  1285 + // var bank_info_2 = that.data.bankInfo_2
  1286 + // wx.request({
  1287 + // url: baseUrl + 'persontax/v1/bank-list',
  1288 + // method: "GET",
  1289 + // header: {
  1290 + // 'content-type': 'application/json', // 默认值
  1291 + // "Authorization": Authorization
  1292 + // },
  1293 + // success: function(res) {
  1294 + // console.log(res)
  1295 + // bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
  1296 + // bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
  1297 + // that.setData({
  1298 + // bankInfo: bank_info,
  1299 + // bankInfo_2: bank_info_2
  1300 + // })
  1301 + // console.log("bankInfo", that.data.bankInfo)
  1302 + // },
  1303 + // fail(res) {
  1304 + // console.log(res)
  1305 + // },
  1306 + // complete() {
  1307 + // wx.hideLoading()
  1308 + // }
  1309 + // })
  1310 + // },
1218 1311 getCertificates: function () {
1219 1312 var that = this
1220 1313 var Authorization = app.globalData.Authorization;
... ... @@ -1249,13 +1342,13 @@ Page({
1249 1342 }
1250 1343 })
1251 1344 },
1252   - handleBankinfo: function(data) {
1253   - var bank_name = []
1254   - for (var i = 0; i < data.length; i++) {
1255   - bank_name.push(data[i].bank_name)
1256   - }
1257   - return bank_name
1258   - },
  1345 + // handleBankinfo: function(data) {
  1346 + // var bank_name = []
  1347 + // for (var i = 0; i < data.length; i++) {
  1348 + // bank_name.push(data[i].bank_name)
  1349 + // }
  1350 + // return bank_name
  1351 + // },
1259 1352
1260 1353 formSubmit: function(e) {
1261 1354 console.log("formSubmit", e);
... ... @@ -1277,6 +1370,10 @@ Page({
1277 1370 this.showToast('子女年龄小于3岁,不可申报')
1278 1371 return
1279 1372 }
  1373 + if (this.data.commonbirthDate.datelong < app.globalData.hostInfo.birth_date) {
  1374 + this.showToast('子女年龄不得大于本人');
  1375 + return
  1376 + }
1280 1377 if (!formdata.children_name || formdata.children_name.length < 1) {
1281 1378 this.showToast('请填写子女姓名')
1282 1379 return
... ... @@ -1285,6 +1382,11 @@ Page({
1285 1382 // this.showToast('请选择子女出生日期')
1286 1383 // return
1287 1384 // }
  1385 +
  1386 + if (this.data.taxperson_relativeData.selected.length < 1) {
  1387 + this.showToast('请选择与纳税人关系')
  1388 + return
  1389 + }
1288 1390 if (this.data.childrenpercentData.selected.length < 1) {
1289 1391 this.showToast('请选择分配比例')
1290 1392 return
... ... @@ -1302,8 +1404,8 @@ Page({
1302 1404 return
1303 1405 }
1304 1406 if (this.data.studyEndDate.selected.length < 1) {
1305   - this.showToast('请选择受教育时间止')
1306   - return
  1407 + // this.showToast('请选择受教育时间止')
  1408 + // return
1307 1409 }else{
1308 1410 var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
1309 1411 if (this.data.studyEndDate.datelong < activedDate) {
... ... @@ -1457,6 +1559,10 @@ Page({
1457 1559 this.showToast('被赡养人年龄不足60岁,不可申报')
1458 1560 return
1459 1561 }
  1562 + if (this.data.olderbirthDate.datelong > app.globalData.hostInfo.birth_date) {
  1563 + this.showToast('被赡养人年龄应大于本人');
  1564 + return
  1565 + }
1460 1566 if (this.data.older_relativeData.selected.length < 1) {
1461 1567 this.showToast('请选择与纳税人关系')
1462 1568 return
... ... @@ -1553,7 +1659,7 @@ Page({
1553 1659 if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
1554 1660 this.showToast('请填写公积金贷款合同编号')
1555 1661 return
1556   - } else if (this.data.bankInfo.selected.length < 1) {
  1662 + } else if (!formdata.loan_bank || formdata.loan_bank.length < 1) {
1557 1663 this.showToast('请选择公积金贷款银行')
1558 1664 return
1559 1665 } else if (this.data.firstpaybackDate.selected.length < 1) {
... ... @@ -1563,7 +1669,7 @@ Page({
1563 1669 this.showToast('请填写公积金贷款期限')
1564 1670 return
1565 1671 }
1566   - newdata.loan_bank = this.data.bankInfo.selected
  1672 + newdata.loan_bank = formdata.loan_bank
1567 1673 newdata.loan_start = this.data.firstpaybackDate.datelong
1568 1674 newdata.loan_months = parseInt(formdata.loan_months)
1569 1675 }
... ... @@ -1571,7 +1677,7 @@ Page({
1571 1677 if (!formdata.sec_loan_contract_no || formdata.sec_loan_contract_no.length < 1) {
1572 1678 this.showToast('请填写商业贷款合同编号')
1573 1679 return
1574   - } else if (this.data.bankInfo_2.selected.length < 1) {
  1680 + } else if (!formdata.sec_loan_bank || formdata.sec_loan_bank.length < 1) {
1575 1681 this.showToast('请选择商业贷款银行')
1576 1682 return
1577 1683 } else if (this.data.firstpaybackDate_2.selected.length < 1) {
... ... @@ -1581,7 +1687,7 @@ Page({
1581 1687 this.showToast('请填写商业贷款期限')
1582 1688 return
1583 1689 }
1584   - newdata.sec_loan_bank = this.data.bankInfo_2.selected
  1690 + newdata.sec_loan_bank = formdata.sec_loan_bank
1585 1691 newdata.sec_loan_start = this.data.firstpaybackDate_2.datelong
1586 1692 newdata.sec_loan_months = parseInt(formdata.sec_loan_months)
1587 1693 }
... ... @@ -1608,7 +1714,7 @@ Page({
1608 1714 this.showToast('请填写出租方名称')
1609 1715 return
1610 1716 }
1611   - if (this.data.leasetypeData.selected=='企业'){
  1717 + if (this.data.leasetypeData.selected =='组织'){
1612 1718 if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
1613 1719 this.showToast('请填写统一社会信用代码')
1614 1720 return
... ... @@ -1734,6 +1840,7 @@ Page({
1734 1840 },
1735 1841 data: newdata,
1736 1842 success(res) {
  1843 + wx.hideLoading()
1737 1844 if (res && res.statusCode < 300) {
1738 1845 wx.navigateBack({
1739 1846 delta: 1
... ... @@ -1741,7 +1848,8 @@ Page({
1741 1848 } else {
1742 1849 wx.showToast({
1743 1850 title: res.data.message ? res.data.message : '请求出错',
1744   - icon: 'none'
  1851 + icon: 'none',
  1852 + duration: 2000
1745 1853 })
1746 1854 }
1747 1855 },
... ... @@ -2228,7 +2336,7 @@ Page({
2228 2336 case 'lease_type':
2229 2337 var leasetype_Data = this.data.leasetypeData
2230 2338 leasetype_Data.selected = leasetype_Data.values[e.detail.value]
2231   - this.data.cardtypeData.hidden = leasetype_Data.selected == "企业"
  2339 + this.data.cardtypeData.hidden = leasetype_Data.selected == "组织"
2232 2340 this.setData({
2233 2341 leasetypeData: leasetype_Data,
2234 2342 cardtypeData: this.data.cardtypeData
... ... @@ -2254,20 +2362,20 @@ Page({
2254 2362 this.showToast('终止日期不符合要求，无法申报')
2255 2363 }
2256 2364 break;
2257   - case 'bank':
2258   - var bank_data = this.data.bankInfo
2259   - bank_data.selected = bank_data.values[e.detail.value]
2260   - this.setData({
2261   - bankInfo: bank_data
2262   - })
2263   - break;
2264   - case 'bank_2':
2265   - var bank_data_2 = this.data.bankInfo_2
2266   - bank_data_2.selected = bank_data_2.values[e.detail.value]
2267   - this.setData({
2268   - bankInfo_2: bank_data_2
2269   - })
2270   - break;
  2365 + // case 'bank':
  2366 + // var bank_data = this.data.bankInfo
  2367 + // bank_data.selected = bank_data.values[e.detail.value]
  2368 + // this.setData({
  2369 + // bankInfo: bank_data
  2370 + // })
  2371 + // break;
  2372 + // case 'bank_2':
  2373 + // var bank_data_2 = this.data.bankInfo_2
  2374 + // bank_data_2.selected = bank_data_2.values[e.detail.value]
  2375 + // this.setData({
  2376 + // bankInfo_2: bank_data_2
  2377 + // })
  2378 + // break;
2271 2379 case 'house_locate':
2272 2380 console.log('house_locate', e)
2273 2381 var house_address = this.data.houseLocateInfo;
... ...
... ... @@ -33,6 +33,8 @@
33 33 <text class='text_777_30 float_left'>国籍</text>
34 34 <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
35 35 </view>
  36 + <view class='divide_line_30'></view>
  37 + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
36 38 </view>
37 39
38 40 <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
... ... @@ -235,8 +237,14 @@
235 237 <text class='text_777_30 float_left'>公积金贷款合同编号</text>
236 238 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_contract_no' value='{{loan_contract_no}}' bindinput="loan_input" id='loan_contract_no'></input>
237 239 </view>
  240 + <!-- <view class='divide_line_30'></view>
  241 + <template is="picker_cell_normal" data="{{...bankInfo}}" /> -->
238 242 <view class='divide_line_30'></view>
239   - <template is="picker_cell_normal" data="{{...bankInfo}}" />
  243 + <view style='height:90rpx'>
  244 + <text class='red_star_right_10'>*</text>
  245 + <text class='text_777_30 float_left'>公积金贷款银行</text>
  246 + <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_bank' value='{{loan_bank}}'></input>
  247 + </view>
240 248 <view class='divide_line_30'></view>
241 249 <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
242 250 <view class='divide_line_30'></view>
... ... @@ -254,8 +262,14 @@
254 262 <text class='text_777_30 float_left'>商业贷款合同编号</text>
255 263 <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;width:400rpx;' placeholder='请输入贷款合同编号' name='sec_loan_contract_no' value='{{sec_loan_contract_no}}' bindinput="loan_input" id='sec_loan_contract_no' ></input>
256 264 </view>
  265 + <!-- <view class='divide_line_30'></view>
  266 + <template is="picker_cell_normal" data="{{...bankInfo_2}}" /> -->
257 267 <view class='divide_line_30'></view>
258   - <template is="picker_cell_normal" data="{{...bankInfo_2}}" />
  268 + <view style='height:90rpx'>
  269 + <text class='red_star_right_10'>*</text>
  270 + <text class='text_777_30 float_left'>商业贷款银行</text>
  271 + <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入商业贷款银行' name='sec_loan_bank' value='{{sec_loan_bank}}'></input>
  272 + </view>
259 273 <view class='divide_line_30'></view>
260 274 <template is="picker_cell_normal" data="{{...firstpaybackDate_2}}" />
261 275 <view class='divide_line_30'></view>
... ...
... ... @@ -54,7 +54,7 @@
54 54 </view>
55 55 <view style='height:90rpx;width:100%;clear:both;'>
56 56 <text class='text_left'>就读国家(地区)</text>
57   - <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国(大陆)'}}</text>
  57 + <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国'}}</text>
58 58 </view>
59 59 <view style='width:100%;clear:both;'>
60 60 <text class='text_left'>就读学校名称</text>
... ...
... ... @@ -82,7 +82,7 @@ Page({
82 82 // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
83 83 // newstatus = "house_fund"
84 84 // }
85   - wx.navigateTo({
  85 + wx.redirectTo({
86 86 url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
87 87 })
88 88 }
... ... @@ -92,7 +92,7 @@ Page({
92 92 console.log("lookandadd02", e);
93 93 if (this.data.additiondata.addition_items && this.data.additiondata.addition_items.length > 0) {
94 94 var newstatus = this.data.additiondata.addition_items[e.currentTarget.id].addition_category
95   - wx.navigateTo({
  95 + wx.redirectTo({
96 96 url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
97 97 })
98 98 }
... ...
... ... @@ -53,7 +53,7 @@
53 53 <view style='height:110rpx'>
54 54 <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
55 55 <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
56   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  56 + <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
57 57 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
58 58
59 59 </view>
... ... @@ -63,7 +63,7 @@
63 63 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
64 64 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
65 65 </view>
66   - <view style='height:70rpx'>
  66 + <view style='height:70rpx'>
67 67 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
68 68 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
69 69 </view>
... ... @@ -92,8 +92,8 @@
92 92 <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
93 93 <view style='height:110rpx'>
94 94 <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
95   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
96   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  95 + <view wx:if="{{additionInfo[0].title_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  96 + <view wx:elif="{{additionInfo[0].title_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
97 97 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
98 98 </view>
99 99 <view wx:for="{{additionInfo[0].title_items}}">
... ... @@ -133,8 +133,8 @@
133 133 <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
134 134 <view style='height:110rpx'>
135 135 <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
136   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
137   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  136 + <view wx:if="{{additionInfo[0].profession_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  137 + <view wx:elif="{{additionInfo[0].profession_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
138 138 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
139 139 </view>
140 140 <view wx:for="{{additionInfo[0].profession_items}}">
... ... @@ -186,8 +186,8 @@
186 186 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
187 187 <view style='height:110rpx'>
188 188 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
189   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
190   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  189 + <view wx:if="{{additionInfo[0].support_duties[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  190 + <view wx:elif="{{additionInfo[0].support_duties[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
191 191 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
192 192 </view>
193 193 <view wx:for="{{additionInfo[0].support_duties}}">
... ... @@ -249,7 +249,7 @@
249 249 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
250 250 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
251 251 </view>
252   - <view class='float_right' wx:if="{{employee_status!='inactive'}}">
  252 + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}">
253 253 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
254 254 <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
255 255 </view>
... ... @@ -278,13 +278,13 @@
278 278 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
279 279 <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
280 280 </view>
281   - <view class='divide_line_f5f5f5' ></view>
  281 + <view class='divide_line_f5f5f5'></view>
282 282 <view wx:for="{{additionInfo}}">
283 283 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
284 284 <view style='height:110rpx'>
285 285 <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
286 286 <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
287   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  287 + <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
288 288 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
289 289 </view>
290 290 <view style='padding-right:30rpx'>
... ... @@ -336,10 +336,10 @@
336 336 <view style='height:110rpx'>
337 337 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
338 338 <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
339   - <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  339 + <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
340 340 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
341 341 </view>
342   - <view style='padding-right: 30rpx' >
  342 + <view style='padding-right: 30rpx'>
343 343 <view class='divide_line_f5f5f5' style="margin-bottom:6rpx"></view>
344 344 <view style='display:flex;flex-direction:row'>
345 345 <view wx:if="{{house_type=='house_fund_rent'}}">
... ... @@ -382,29 +382,29 @@
382 382 </view>
383 383
384 384 <!-- <view class='bottom_btn_wrap' hidden="{{additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}"> -->
385   - <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}" >
  385 + <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}">
386 386 <view class='btn_blue_radius' bindtap="goadd">
387 387 <view class='text_white_34'>添加</view>
388 388 </view>
389 389 </view>
390 390
391 391 <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
392   -<!-- 申报说明 -->
393   -<view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
394   - <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
395   - <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
396   - <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
397   - <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
398   - <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
399   - <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
  392 + <!-- 申报说明 -->
  393 + <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
  394 + <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
  395 + <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
  396 + <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
  397 + <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
  398 + <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
  399 + <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
  400 + </view>
400 401 </view>
401   -</view>
402 402
403   -<!-- 扣除类型 -->
404   -<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
405   - <text class='text_modal_title'>请选择扣除方式</text>
406   - <view class='divide_line_f5f5f5'></view>
407   - <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  403 + <!-- 扣除类型 -->
  404 + <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
  405 + <text class='text_modal_title'>请选择扣除方式</text>
  406 + <view class='divide_line_f5f5f5'></view>
  407 + <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
408 408 <view wx:for="{{reducetypeData}}" wx:for-index="idx">
409 409 <view wx:if="{{selected_reduceindex==idx}}">
410 410 <text class='text_item_blue float_left'>{{item}}</text>
... ... @@ -416,32 +416,32 @@
416 416 <view class='divide_line_f5f5f5'></view>
417 417 </view>
418 418 </view> -->
419   - <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
420   - <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
421   - <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
422   - <view class='text_item_blue float_left'>{{item}}</view>
423   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
424   - </view>
425   - <view wx:else style='display:flex'>
426   - <text class='text_item_black float_left'>{{item}}</text>
  419 + <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
  420 + <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
  421 + <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
  422 + <view class='text_item_blue float_left'>{{item}}</view>
  423 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  424 + </view>
  425 + <view wx:else style='display:flex'>
  426 + <text class='text_item_black float_left'>{{item}}</text>
  427 + </view>
  428 + <view class='divide_line_f5f5f5'></view>
427 429 </view>
428   - <view class='divide_line_f5f5f5'></view>
429 430 </view>
430   - </view>
431   - <view class='divide_line_f5f5f5'></view>
  431 + <view class='divide_line_f5f5f5'></view>
432 432
433   - <view style='width:100%;display: flex;'>
434   - <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
435   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
436   - <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  433 + <view style='width:100%;display: flex;'>
  434 + <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
  435 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  436 + <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  437 + </view>
437 438 </view>
438   -</view>
439 439
440   -<!-- 添加子女 老人 大病-->
441   -<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
442   - <text class='text_modal_title'>{{modalData.title}}</text>
443   - <view class='divide_line_f5f5f5'></view>
444   - <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  440 + <!-- 添加子女 老人 大病-->
  441 + <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
  442 + <text class='text_modal_title'>{{modalData.title}}</text>
  443 + <view class='divide_line_f5f5f5'></view>
  444 + <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
445 445 <block wx:for="{{modalData.datas}}" wx:for-index="idx">
446 446 <view wx:if="{{idx==selected_addindex}}">
447 447 <text class='text_item_blue float_left'>{{item.name}}</text>
... ... @@ -453,26 +453,24 @@
453 453 <view class='divide_line_f5f5f5'></view>
454 454 </block>
455 455 </view> -->
456   - <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
457   - <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
458   - <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
459   - <text class='text_item_blue float_left'>{{item.name}}</text>
460   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
461   - </view>
462   - <view wx:else style='display:flex'>
463   - <text class='text_item_black float_left'>{{item.name}}</text>
  456 + <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
  457 + <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
  458 + <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
  459 + <text class='text_item_blue float_left'>{{item.name}}</text>
  460 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  461 + </view>
  462 + <view wx:else style='display:flex'>
  463 + <text class='text_item_black float_left'>{{item.name}}</text>
  464 + </view>
  465 + <view class='divide_line_f5f5f5'></view>
464 466 </view>
465   - <view class='divide_line_f5f5f5'></view>
  467 + </view>
  468 + <view class='divide_line_f5f5f5'></view>
  469 + <view style='width:100%;display: flex;'>
  470 + <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
  471 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  472 + <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
466 473 </view>
467 474 </view>
468   - <view class='divide_line_f5f5f5'></view>
469   - <view style='width:100%;display: flex;'>
470   - <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
471   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
472   - <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
473   - </view>
474   -</view>
475   -
476   -</view>
477   -
478 475
  476 +</view>
\ No newline at end of file
... ...
... ... @@ -11,13 +11,15 @@ Page({
11 11 currentTab: 0,
12 12 taxDatas: {},
13 13 choosed_date: '',
14   - long_date: 0
  14 + long_date: 0,
  15 + isForeign:false
15 16 },
16 17 onLoad: function (options) {
17 18 if (options.date){
18 19 var mydate = new Date();
19 20 this.setData({
20 21 choosed_date: options.date,
  22 + isForeign: options.taxpayer_type == 'non-resident'
21 23 })
22 24 }
23 25 if (!options.id) return
... ... @@ -33,7 +35,7 @@ Page({
33 35 success: function (result) {
34 36 console.log('成功', result)
35 37 self.setData({
36   - taxDatas: result.data
  38 + taxDatas: that.handleTaxData(result.data)
37 39 })
38 40 },
39 41 fail: function (res) {
... ... @@ -46,7 +48,21 @@ Page({
46 48 })
47 49 },
48 50
49   -
  51 + handleTaxData: function (items) {
  52 + for (var i = 0; i < items.length; ++i) {
  53 + var item = items[i]
  54 + var donation_way
  55 + if (item.donation_way == 'quota') {
  56 + method = '限额扣除'
  57 + } else if (item.donation_way == 'full') {
  58 + method = '全额扣除'
  59 + } else if (item.donation_way == 'mix') {
  60 + method = '混合'
  61 + }
  62 + item.method = method
  63 + }
  64 + return items;
  65 + },
50 66
51 67
52 68 })
\ No newline at end of file
... ...
1 1 <!--pages/main/advancepayment/adPayDetails/adPayDetails.wxml-->
2 2 <view>
3 3 <scroll-view style='margin-bottom:40rpx'>
4   - <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
5   - <view>
6   - <text class='text_blue_32'>{{choosed_date}}</text>
7   - <view class='float_right'>
8   - <image class='arrow_wrap' src='/images/arrow_right.png'></image>
  4 + <view wx:if="{{!isForeign}}">
  5 + <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
  6 + <view>
  7 + <text class='text_blue_32'>{{choosed_date}}</text>
  8 + <view class='float_right'>
  9 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
  10 + </view>
  11 + </view>
  12 + <!-- <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
  13 + </picker> -->
  14 + <view class='divide_line_f5f5f5'></view>
  15 + <view style='padding:30rpx 0'>
  16 + <text class='text_666_30 float_left'>当期收入额</text>
  17 + <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
  18 + </view>
  19 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  20 + <view style='padding:30rpx 0'>
  21 + <text class='text_666_30 float_left'>当期免税收入</text>
  22 + <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
  23 + </view>
  24 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  25 + <view style='padding:30rpx 0'>
  26 + <text class='text_666_30 float_left'>专项扣除合计</text>
  27 + <text class='text_number float_right'>{{taxDatas.special_deduction}}</text>
  28 + </view>
  29 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  30 + <view style='padding:30rpx 0'>
  31 + <text class='text_666_30 float_left'>减除费用</text>
  32 + <text class='text_number float_right'>{{taxDatas.reduction_cost}}</text>
  33 + </view>
  34 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  35 + <view style='padding:30rpx 0'>
  36 + <text class='text_666_30 float_left'>专项附加扣除合计</text>
  37 + <text class='text_number float_right'>{{taxDatas.special_additional_deduction}}</text>
  38 + </view>
  39 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  40 + <view style='padding:30rpx 0'>
  41 + <text class='text_666_30 float_left'>其他扣除合计</text>
  42 + <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
  43 + </view>
  44 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  45 + <view style='padding:30rpx 0'>
  46 + <text class='text_666_30 float_left'>累计应纳税所得额</text>
  47 + <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
  48 + </view>
  49 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  50 + <view style='padding:30rpx 0'>
  51 + <text class='text_666_30 float_left'>税率</text>
  52 + <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
  53 + </view>
  54 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  55 + <view style='padding:30rpx 0'>
  56 + <text class='text_666_30 float_left'>速算扣除数</text>
  57 + <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
9 58 </view>
10 59 </view>
11   - <!-- <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
12   - </picker> -->
13   - <view class='divide_line_f5f5f5'></view>
14   - <view style='padding:30rpx 0'>
15   - <text class='text_666_30 float_left'>当期收入额</text>
16   - <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
17   - </view>
18   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
19   - <view style='padding:30rpx 0'>
20   - <text class='text_666_30 float_left'>当期免税收入</text>
21   - <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
22   - </view>
23   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
24   - <view style='padding:30rpx 0'>
25   - <text class='text_666_30 float_left'>专项扣除合计</text>
26   - <text class='text_number float_right'>{{taxDatas.special_deduction}}</text>
27   - </view>
28   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
29   - <view style='padding:30rpx 0'>
30   - <text class='text_666_30 float_left'>减除费用</text>
31   - <text class='text_number float_right'>{{taxDatas.reduction_cost}}</text>
32   - </view>
33   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
34   - <view style='padding:30rpx 0'>
35   - <text class='text_666_30 float_left'>专项附加扣除合计</text>
36   - <text class='text_number float_right'>{{taxDatas.special_additional_deduction}}</text>
37   - </view>
38   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
39   - <view style='padding:30rpx 0'>
40   - <text class='text_666_30 float_left'>其他扣除合计</text>
41   - <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
42   - </view>
43   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
44   - <view style='padding:30rpx 0'>
45   - <text class='text_666_30 float_left'>累计应纳税所得额</text>
46   - <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
47   - </view>
48   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
49   - <view style='padding:30rpx 0'>
50   - <text class='text_666_30 float_left'>税率</text>
51   - <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
52   - </view>
53   - <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
54   - <view style='padding:30rpx 0'>
55   - <text class='text_666_30 float_left'>速算扣除数</text>
56   - <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
  60 + <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
  61 + <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
  62 + <view>
  63 + <view class='view_bg_wrap' style='margin-top: 44rpx;'>
  64 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  65 + <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
  66 + <text class='text_text_wrap'>累计应扣缴税额</text>
  67 + </view>
  68 + <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
  69 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  70 + <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
  71 + <text class='text_text_wrap'>已扣缴税额</text>
  72 + </view>
  73 +
  74 + </view>
  75 +
  76 + <view class='view_bg_wrap' style='margin-top: 180rpx;'>
  77 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  78 + <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
  79 + <text class='text_text_wrap'>本期应缴税额</text>
  80 + </view>
  81 + </view>
  82 + </view>
57 83 </view>
58 84 </view>
59   - <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
60   - <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
61   - <view>
62   - <view class='view_bg_wrap' style='margin-top: 44rpx;'>
63   - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
64   - <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
65   - <text class='text_text_wrap'>累计应扣缴税额</text>
66   - </view>
67   - <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
68   - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
69   - <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
70   - <text class='text_text_wrap'>已扣缴税额</text>
  85 +
  86 + <view wx:else>
  87 + <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
  88 + <view>
  89 + <text class='text_blue_32'>{{choosed_date}}</text>
  90 + <view class='float_right'>
  91 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
71 92 </view>
72   -
73 93 </view>
74   -
75   - <view class='view_bg_wrap' style='margin-top: 180rpx;'>
76   - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
77   - <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
78   - <text class='text_text_wrap'>本期应缴税额</text>
  94 + <!-- <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
  95 + </picker> -->
  96 + <view class='divide_line_f5f5f5'></view>
  97 + <view style='padding:30rpx 0'>
  98 + <text class='text_666_30 float_left'>收入额</text>
  99 + <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
  100 + </view>
  101 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  102 + <view style='padding:30rpx 0'>
  103 + <text class='text_666_30 float_left'>免税收入</text>
  104 + <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
  105 + </view>
  106 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  107 + <view style='padding:30rpx 0'>
  108 + <text class='text_666_30 float_left'>其他扣除</text>
  109 + <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
  110 + </view>
  111 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  112 + <view style='padding:30rpx 0'>
  113 + <text class='text_666_30 float_left'>实际捐赠额</text>
  114 + <text class='text_number float_right'>{{taxDatas.actual_donation}}</text>
  115 + </view>
  116 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  117 + <view style='padding:30rpx 0'>
  118 + <text class='text_666_30 float_left'>捐赠方式</text>
  119 + <text class='text_number float_right'>{{taxDatas.donation_way}}</text>
  120 + </view>
  121 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  122 + <view style='padding:30rpx 0'>
  123 + <text class='text_666_30 float_left'>减免税额</text>
  124 + <text class='text_number float_right'>{{taxDatas.tax_savings}}</text>
  125 + </view>
  126 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  127 + <view style='padding:30rpx 0'>
  128 + <text class='text_666_30 float_left'>应纳税所得额</text>
  129 + <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
  130 + </view>
  131 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  132 + <view style='padding:30rpx 0'>
  133 + <text class='text_666_30 float_left'>税率</text>
  134 + <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
  135 + </view>
  136 + <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
  137 + <view style='padding:30rpx 0'>
  138 + <text class='text_666_30 float_left'>速算扣除数</text>
  139 + <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
  140 + </view>
  141 + </view>
  142 + <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
  143 + <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
  144 + <view>
  145 + <view class='view_bg_wrap' style='margin-top: 44rpx;'>
  146 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  147 + <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
  148 + <text class='text_text_wrap'>应扣缴税额</text>
  149 + </view>
  150 + <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
  151 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  152 + <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
  153 + <text class='text_text_wrap'>已扣缴税额</text>
  154 + </view>
79 155 </view>
80   -
81   - <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
82   - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
83   - <text class='text_num_wrap'>30.8%</text>
84   - <text class='text_text_wrap'>使用税率</text>
  156 + <view class='view_bg_wrap' style='margin-top: 180rpx;'>
  157 + <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
  158 + <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
  159 + <text class='text_text_wrap'>应补（退）税额</text>
  160 + </view>
85 161 </view>
86   - <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
87   - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
88   - <text class='text_num_wrap'>19106.91</text>
89   - <text class='text_text_wrap'>速算扣除数</text>
90   - </view> -->
91 162 </view>
92 163 </view>
93 164 </view>
94   -
95   - <!-- <view style='padding-left:30rpx;background:#ffffff'>
96   - <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
97   - <text style='padding-left:20rpx' class='text_gray_32'>工资明细</text>
98   - </view>
99   - <view style='margin-top:2rpx;background:#ffffff;padding-bottom:30rpx'>
100   - <view style='padding:30rpx'>
101   - <text class='text_wrap_left'>公司名称</text>
102   - <text class='text_wrap_right'>北京小爱智能科技</text>
103   - </view>
104   - <view style='padding:30rpx'>
105   - <text class='text_wrap_left'>计薪时间</text>
106   - <text class='text_wrap_right'>2018/09/09 20:10</text>
107   - </view>
108   - <view style='padding:30rpx'>
109   - <text class='text_wrap_left'>发薪时间</text>
110   - <text class='text_wrap_right'>2018/09/10 09:00 </text>
111   - </view>
112   - <view style='padding:30rpx'>
113   - <text class='text_wrap_left'>实发工资</text>
114   - <text class='text_wrap_right'>13860.00</text>
115   - </view>
116   - </view> -->
  165 +
117 166 </scroll-view>
118 167 </view>
... ...
... ... @@ -9,7 +9,7 @@ Page({
9 9 Authorization: null,
10 10 data: {
11 11 // tab切换
12   - isshow : false,
  12 + // isshow : false,
13 13 currentTab: 0,
14 14 taxDatas: [],
15 15 salaryDatas: {},
... ... @@ -96,7 +96,11 @@ Page({
96 96 } else if (item.taxation_method == '0103') {
97 97 method = '全年一次性奖金'
98 98 }
99   - item.method = method
  99 + if (item.taxpayer_type == 'non-resident'){//非居民
  100 + item.method = '外籍人' + method
  101 + }else{
  102 + item.method = method
  103 + }
100 104 }
101 105 return items;
102 106 },
... ... @@ -106,6 +110,7 @@ Page({
106 110 item.payroll_date = format.formatTime_date(item.payroll_date)
107 111 item.count_date = format.formatDate_min(item.start_time) + '-' + format.formatDate_min(item.end_time)
108 112 item.detals = this.handleDetailsData(item)
  113 + item.isshow = false
109 114 }
110 115 return items;
111 116 },
... ... @@ -151,9 +156,14 @@ Page({
151 156
152 157 gospan:function(e){
153 158 console.log(e)
  159 + var item = this.data.salaryDatas[e.currentTarget.id]
  160 + item.isshow = !item.isshow
154 161 this.setData({
155   - isshow: !this.data.isshow
  162 + salaryDatas: this.data.salaryDatas
156 163 })
  164 + // this.setData({
  165 + // isshow: !this.data.isshow
  166 + // })
157 167 // console.log('idddddd',e.currentTarget.id)
158 168 // if (!e.currentTarget.id) return
159 169 // var that = this
... ... @@ -183,11 +193,14 @@ Page({
183 193 var detail = JSON.parse(data['detail'])
184 194 var details = []
185 195 for (var i = 0; i < titles.length; ++i) {
186   - var titleData = titles[i]
187   - var value = detail[titleData['key']]
188   -
  196 + var titleData = titles[i]
  197 + var value = detail[titleData['key']]
  198 + var title = titleData['title']
  199 + if (!title){
  200 + title = titleData['original_column']
  201 + }
189 202 details.push({
190   - title: titleData['title'],
  203 + title: title,
191 204 value: value
192 205 })
193 206 }
... ... @@ -196,8 +209,9 @@ Page({
196 209 },
197 210
198 211 goItemDetails: function (e) {
  212 + var item = this.data.taxDatas[e.currentTarget.id]
199 213 wx.navigateTo({
200   - url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id + "&date=" + this.data.choosed_date
  214 + url: "adPayDetails/adPayDetails?id=" + item.id + "&date=" + this.data.choosed_date + "&taxpayer_type=" + item.taxpayer_type
201 215 })
202 216 },
203 217 })
\ No newline at end of file
... ...
1 1 {
2   - "navigationBarTitleText": "预扣预缴"
  2 + "navigationBarTitleText": "收入"
3 3 }
\ No newline at end of file
... ...
... ... @@ -20,7 +20,7 @@
20 20 <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view>
21 21 </view>
22 22 <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
23   - <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
  23 + <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{index}}' bindtap='goItemDetails'>
24 24 <text class='text_blue_36'>扣缴义务人: {{item.declaring_unit}}</text>
25 25 <text class='text_blue_36'>所得项目: {{item.method}}</text>
26 26 <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
... ... @@ -40,23 +40,23 @@
40 40 </view>
41 41 <view wx:for="{{salaryDatas}}" style='margin-bottom:20rpx'>
42 42 <view class='card_rectangle_bg_column' style='padding:30rpx'>
43   - <text class='text_blue_36'>薪酬批次工资: {{item.program}}</text>
  43 + <text class='text_blue_36'>薪酬批次工资: {{item.cycle_name}}</text>
44 44 <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
45 45 <text class='text_999_28'>发薪日:<text class='text_333_28'>{{item.payroll_date}}</text></text>
46 46 <text class='text_999_28'>计薪时间:<text class='text_333_28'>{{item.count_date}}</text></text>
47 47 <text class='text_999_28'>应发金额:<text class='text_333_28'>{{item.pay_salary}}</text></text>
48 48 <text class='text_999_28'>实发:<text class='text_333_28 text_color_28'>¥{{item.salary}}</text></text>
49 49 <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
50   - <view wx:if="{{!isshow}}" bindtap='gospan' id='{{item.id}}'>
  50 + <view wx:if="{{!item.isshow}}" bindtap='gospan' id='{{index}}'>
51 51 <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>
52 52 <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image>
53 53 </view>
54   - <view wx:if="{{isshow}}" bindtap='gospan'>
  54 + <view wx:if="{{item.isshow}}" bindtap='gospan' id='{{index}}'>
55 55 <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
56 56 <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
57 57 <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
58 58 </view>
59   - <view wx:if="{{isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
  59 + <view wx:if="{{item.isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
60 60 <view>
61 61 <text class='text_999_28'>{{detal.title}}</text>
62 62 <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
... ...
... ... @@ -10,8 +10,8 @@
10 10 <image class="icon_wrap" src="/images/tax_person.png"></image>
11 11 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
12 12 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
13   - <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
14   - <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
  13 + <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>个人和家庭信息</text>
  14 + <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>个人和家庭成员的基本信息</text>
15 15 </view>
16 16 <image class='arrow_wrap' src='/images/arrow_right.png'></image>
17 17 </view>
... ... @@ -21,7 +21,7 @@
21 21 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
22 22 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
23 23 <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
24   - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>申报专项附加扣除，提交详细信息</text>
  24 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的专项附加扣除信息</text>
25 25 </view>
26 26 <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
27 27 </view>
... ... @@ -30,8 +30,8 @@
30 30 <image class="icon_wrap" src="/images/advance_payment.png"></image>
31 31 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
32 32 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
33   - <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
34   - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
  33 + <text style='font-size: 36rpx;color: #000;font-weight:bold;'>收入</text>
  34 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的收入和个税明细</text>
35 35 </view>
36 36 <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
37 37 </view>
... ... @@ -60,4 +60,4 @@
60 60
61 61 <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
62 62
63   -</view>
\ No newline at end of file
  63 +</view>
... ...
... ... @@ -33,8 +33,8 @@
33 33 }
34 34
35 35 .icon_wrap {
36   - width: 112rpx;
37   - height: 102rpx;
  36 + width: 102rpx;
  37 + height: 96rpx;
38 38 align-self: center;
39 39 }
40 40
... ...
... ... @@ -2,6 +2,8 @@
2 2 var app = getApp();
3 3 var format = require('../../../../utils/util.js');
4 4 var baseUrl = app.globalData.baseUrl;
  5 +const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
  6 +
5 7 Page({
6 8 cur_id:null,
7 9 /**
... ... @@ -22,7 +24,7 @@ Page({
22 24 requestBody: {},
23 25 idInfoData: '',
24 26 profession_index: [],
25   -
  27 + overseas:'否',
26 28 relativeData: {
27 29 isrequre: true,
28 30 label: '与本人关系',
... ... @@ -37,13 +39,13 @@ Page({
37 39 cardtypeData: {
38 40 isrequre: true,
39 41 disabled: true,
  42 + selected:'居民身份证',
40 43 label: '证照类型',
41 44 bindtype: 'cardtype',
42   - selected: '居民身份证',
43 45 placeholder: '请选择证照类型',
44   - values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
45   - '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
46   - ],
  46 + values: cardTypeArray8,
  47 + // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
  48 + // range_key: 'name',
47 49 onChange: 'onPickerSelect'
48 50 },
49 51 forignerInfo: {
... ... @@ -58,14 +60,24 @@ Page({
58 60 genderData: {
59 61 label: '性别',
60 62 bindtype: 'gender',
61   - disabled: true,
  63 + isrequre: true,
  64 + // disabled: true,
62 65 selected: '',
63   - // placeholder: '请选择性别',
64   - placeholder: '性别',
  66 + placeholder: '请选择性别',
  67 + // placeholder: '性别',
65 68 values: ["男", "女"],
66 69 onChange: 'onPickerSelect'
67 70 },
68   -
  71 + countryData: {
  72 + label: '国籍',
  73 + bindtype: 'country',
  74 + isrequre: true,
  75 + selected: '中国',
  76 + disabled: true,
  77 + // range_key:'name',
  78 + placeholder: '请选择国籍',
  79 + onChange: 'onPickerSelect',
  80 + },
69 81 },
70 82
71 83 /**
... ... @@ -77,8 +89,50 @@ Page({
77 89 this.cur_id = options.id
78 90 this.getpersonalTax(options.id)
79 91 }
  92 + this.getCountry()
  93 + },
  94 + //****************获取国籍数据************/
  95 + getCountry: function () {
  96 + var that = this
  97 + wx.showLoading({
  98 + title: '',
  99 + })
  100 + var Authorization = app.globalData.Authorization;
  101 + wx.request({
  102 + url: baseUrl + 'persontax/v1/nation-list',
  103 + method: "GET",
  104 + header: {
  105 + 'content-type': 'application/json', // 默认值
  106 + "Authorization": Authorization
  107 + },
  108 + success: function (res) {
  109 + var countrys = res.data
  110 + if (countrys.indexOf('中国') > -1) {
  111 + countrys.splice(countrys.indexOf('中国'), 1);
  112 + }
  113 + if (countrys.indexOf('中国台湾') > -1) {
  114 + countrys.splice(countrys.indexOf('中国台湾'), 1);
  115 + }
  116 + if (countrys.indexOf('香港') > -1) {
  117 + countrys.splice(countrys.indexOf('香港'), 1);
  118 + }
  119 + if (countrys.indexOf('澳门') > -1) {
  120 + countrys.splice(countrys.indexOf('澳门'), 1);
  121 + }
  122 + that.data.countryData.values = countrys
  123 + that.countrys = countrys
  124 + that.setData({
  125 + countryData: that.data.countryData,
  126 + })
  127 + },
  128 + fail(res) {
  129 + wx.hideLoading()
  130 + },
  131 + complete() {
  132 + wx.hideLoading()
  133 + }
  134 + })
80 135 },
81   -
82 136 //****************获取自然人数据************/
83 137 getpersonalTax: function (id) {
84 138 var that = this
... ... @@ -112,25 +166,28 @@ Page({
112 166 },
113 167 //对各参数初始赋值
114 168 handleDatas: function (tax_info) {
  169 + this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
115 170
116 171 var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
117 172
118 173 this.data.relativeData.selected = tax_info.family_ties
119   - // this.data.cardtypeData.selected = tax_info.id_card_type
120 174 this.data.genderData.selected = tax_info.gender
  175 + this.data.countryData.selected = tax_info.native
121 176 // this.data.genderData.disabled = isDisable
122 177
123 178 this.setData({
124 179 isDisable: isDisable,
125 180 relativeData: this.data.relativeData,
126 181 name: tax_info.name,
127   - // cardtypeData: this.data.cardtypeData,
  182 + cardtypeData: this.data.cardtypeData,
  183 + age: tax_info.age,
128 184 mobile: tax_info.mobile,
129 185 genderData: this.data.genderData,
130 186 isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
131   - card_number: tax_info.id_card_no
  187 + card_number: tax_info.id_card_no,
  188 + countryData: this.data.countryData
132 189 })
133   - this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
  190 + // this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
134 191 },
135 192
136 193 /**
... ... @@ -162,8 +219,9 @@ Page({
162 219 } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
163 220 birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
164 221 }
165   - // var cardtype_Data = that.data.cardtypeData
166   - // cardtype_Data.selected = '居民身份证'
  222 + var cardtype_Data = that.data.cardtypeData
  223 + cardtype_Data.selected = '居民身份证'
  224 + // cardtypeData.selected_code = '1'
167 225 var gender_Data = that.data.genderData
168 226 gender_Data.selected = id_info.gender
169 227
... ... @@ -181,7 +239,7 @@ Page({
181 239 idInfoData: id_info,
182 240 name: id_info.name,
183 241 // birthday: birth_day,
184   - // cardtypeData: cardtype_Data,
  242 + cardtypeData: cardtype_Data,
185 243 genderData: gender_Data,
186 244 // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
187 245 // birthDate: that.data.birthDate,
... ... @@ -199,6 +257,46 @@ Page({
199 257 })
200 258 },
201 259
  260 + dealCardType: function (new_type) {
  261 + var is_idcard = this.data.isIdCard
  262 + this.data.cardtypeData.selected = new_type
  263 +
  264 + if ('居民身份证' == new_type) {
  265 + is_idcard = true
  266 + this.data.genderData.disabled = true
  267 + } else {
  268 + is_idcard = false
  269 + this.data.genderData.disabled = false
  270 + }
  271 + this.data.overseas = '否'
  272 + if ('居民身份证' == new_type || '中国护照' == new_type) {
  273 + this.data.countryData.selected = '中国'
  274 + this.data.countryData.disabled = true
  275 + } else if (new_type.indexOf("港澳") != -1) {
  276 + this.data.countryData.values = ['中国香港', '中国澳门']
  277 + this.data.countryData.selected = ''
  278 + this.data.countryData.disabled = false
  279 + } else if (new_type.indexOf("台湾") != -1) {
  280 + this.data.countryData.selected = '中国台湾'
  281 + this.data.countryData.disabled = true
  282 + } else {
  283 + this.data.overseas = '是'
  284 + this.data.countryData.selected = ''
  285 + this.data.countryData.values = this.countrys ? this.countrys : []
  286 + this.data.countryData.disabled = false
  287 + }
  288 + this.setData({
  289 + isIdCard: is_idcard,
  290 + genderData: this.data.genderData,
  291 + countryData: this.data.countryData,
  292 + cardtypeData: this.data.cardtypeData,
  293 + overseas: this.data.overseas,
  294 + })
  295 +
  296 +
  297 + },
  298 +
  299 +
202 300 // =============普通单列picker选中处理==============
203 301 onPickerSelect: function(e) {
204 302 console.log('picker发送选择改变，携带值为', e)
... ... @@ -211,18 +309,15 @@ Page({
211 309 })
212 310 break;
213 311 case 'cardtype':
214   - var is_idcard = this.data.isIdCard
215   - var cardtype_data = this.data.cardtypeData
216   - cardtype_data.selected = cardtype_data.values[e.detail.value]
217   - if (0 == e.detail.value) {
218   - is_idcard = true
219   - } else {
220   - is_idcard = false
  312 + var cardtypeData = this.data.cardtypeData
  313 + var new_type = cardtypeData.values[e.detail.value] //['name']
  314 + // var new_type_code = cardtypeData.values[e.detail.value]['code']
  315 + if (new_type != cardtypeData.selected) {
  316 + this.dealCardType(new_type)
  317 + this.setData({
  318 + card_number: ""
  319 + })
221 320 }
222   - this.setData({
223   - isIdCard: is_idcard,
224   - cardtypeData: cardtype_data
225   - })
226 321 break;
227 322 case 'gender':
228 323 var gender_data = this.data.genderData
... ... @@ -231,7 +326,16 @@ Page({
231 326 genderData: gender_data
232 327 })
233 328 break;
234   -
  329 + case 'country':
  330 + var countryData = this.data.countryData
  331 + var new_country = countryData.values[e.detail.value]
  332 + if (new_country != countryData.selected) {
  333 + countryData.selected = new_country
  334 + this.setData({
  335 + countryData: countryData
  336 + })
  337 + }
  338 + break;
235 339 }
236 340
237 341 },
... ... @@ -263,7 +367,8 @@ Page({
263 367 // console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
264 368 var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/;
265 369 var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
266   - var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
  370 + var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;
  371 + // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
267 372 var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
268 373 var formdata = e.detail.value;
269 374 console.log("formdata", formdata);
... ... @@ -271,6 +376,7 @@ Page({
271 376 this.showtoast('请选择关系');
272 377 return
273 378 }
  379 + var rel = this.data.relativeData.selected
274 380 if (this.data.card_number.length < 1) {
275 381 this.showtoast('请填写证照号码');
276 382 return
... ... @@ -278,41 +384,52 @@ Page({
278 384 this.showtoast('证照号码有误');
279 385 return
280 386 }
281   - var rel = this.data.relativeData.selected
282   - var hostInfo = format.analyzeIDCard(app.globalData.hostInfo.id_card_no)
283   - if ((rel == '子' || rel =='女') && formdata.age > hostInfo.age) {
284   - this.showtoast('子女年龄有误');
285   - return
286   - }
287   - if (rel == '父母' && formdata.age < hostInfo.age) {
288   - this.showtoast('父母年龄有误');
289   - return
290   - }
291 387 var name = formdata.person_name.length ? formdata.person_name : this.data.name
292 388 if (name.length < 1 ) {
293   - this.showtoast('姓名未填写');
  389 + this.showtoast('请输入姓名');
294 390 return
295 391 } else if (!regname.test(name)) {
296 392 this.showtoast('请输入正确姓名');
297 393 return
298 394 }
299   - if (formdata.mobile.length > 0 && !format.isMobile(formdata.mobile)) {
300   - this.showtoast('手机号码有误');
  395 + if (this.data.genderData.selected.length < 1) {
  396 + this.showtoast('请选择性别');
301 397 return
302   - }
303   - if (this.data.genderData.selected == '男') {
304   - if (rel == '女'){
  398 + }else {
  399 + if (this.data.genderData.selected == '男') {
  400 + if (rel == '女') {
  401 + this.showtoast('关系和性别冲突');
  402 + return
  403 + }
  404 + } else {
  405 + if (rel == '子') {
  406 + this.showtoast('关系和性别冲突');
  407 + return
  408 + }
  409 + }
  410 + if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
305 411 this.showtoast('关系和性别冲突');
306 412 return
307 413 }
308   - }else{
309   - if (rel == '子') {
310   - this.showtoast('关系和性别冲突');
  414 + }
  415 + if (!formdata.age) {
  416 + this.showtoast('请填写年龄');
  417 + return
  418 + } else {
  419 + var host_birth = format.formatTime_date(app.globalData.hostInfo.birth_date)
  420 + var host_age = format.getAge(host_birth)
  421 + console.log('host_age',host_age,'hostInfo', app.globalData.hostInfo)
  422 + if ((rel == '子' || rel == '女') && formdata.age > host_age) {
  423 + this.showtoast('子女年龄有误');
  424 + return
  425 + }
  426 + if (rel == '父母' && formdata.age < host_age) {
  427 + this.showtoast('父母年龄有误');
311 428 return
312 429 }
313   - }
314   - if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
315   - this.showtoast('关系和性别冲突');
  430 + }
  431 + if (formdata.mobile.length > 0 && !format.isMobile(formdata.mobile)) {
  432 + this.showtoast('手机号码有误');
316 433 return
317 434 }
318 435 this.goCommit(formdata);
... ... @@ -338,14 +455,15 @@ Page({
338 455 data: {
339 456 'certification_status': that.getCertifyStatus(formdata),
340 457 "family_ties": that.data.relativeData.selected,
341   - "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
  458 + "id_card_type": that.data.cardtypeData.selected,//_code,
342 459 "id_card_no": that.data.card_number,
343 460 "name": name,
344 461 "gender": that.data.genderData.selected,
345 462 "mobile": formdata.mobile,
346 463 //"age": formdata.age ? formdata.age : '',//不传
347   - "native": "中国",
348   - "is_overseas_personnel": "否",
  464 + "age": formdata.age ? formdata.age : '',
  465 + "native": that.data.countryData.selected,
  466 + "is_overseas_personnel": that.data.overseas,
349 467 },
350 468 header: {
351 469 'content-type': 'application/json', // 默认值
... ... @@ -391,7 +509,8 @@ Page({
391 509 wx.showToast({
392 510 title: title,
393 511 duration: 2000,
394   - image: '/images/error.png'
  512 + icon:'none'
  513 + // image: '/images/error.png'
395 514 })
396 515 },
397 516
... ... @@ -418,6 +537,9 @@ Page({
418 537 this.setData({
419 538 card_number: idCardNo
420 539 })
  540 + if (!this.data.isIdCard) {
  541 + return;
  542 + }
421 543 if (e.detail.value.length == 18){
422 544 if (!format.isIDCardNum(idCardNo)) {
423 545 wx.showToast({
... ... @@ -434,6 +556,9 @@ Page({
434 556 this.setData({
435 557 card_number: idCardNo
436 558 })
  559 + if (!this.data.isIdCard) {
  560 + return;
  561 + }
437 562 if (!idCardNo.length) {
438 563 wx.showToast({
439 564 image: "../../../../images/warn.png",
... ...
... ... @@ -10,12 +10,12 @@
10 10
11 11 <template is="picker_cell_normal" data="{{...relativeData}}" />
12 12 <view class="divide_line_30"></view>
13   -
14   - <view class='item_body'>
  13 + <template is="picker_cell_normal" data="{{...cardtypeData}}" />
  14 + <!-- <view class='item_body'>
15 15 <text class='red_star_right_10'>*</text>
16 16 <text class='text_777_30 float_left'>证照类型</text>
17 17 <text class='text_black_30 float_right' style='line-height: 90rpx'>居民身份证</text>
18   - </view>
  18 + </view> -->
19 19 <view class="divide_line_30"></view>
20 20
21 21 <view class='item_body'>
... ... @@ -27,7 +27,7 @@
27 27 <input class='input_wrap' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard' ></input>
28 28 </view>
29 29 <view wx:else>
30   - <input class='input_wrap' placeholder='请输入证照号码' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
  30 + <input class='input_wrap' placeholder='请输入证照号码' placeholder-class='text_999_30' name='id_card_no' maxlength='30' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
31 31 </view>
32 32 </view>
33 33 <view class="divide_line_30"></view>
... ... @@ -42,22 +42,22 @@
42 42 <template is="picker_cell_normal" data="{{...genderData}}" />
43 43 <view class="divide_line_30"></view>
44 44 <view class='item_body'>
45   - <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>年龄</text>
46   - <input class='input_wrap' name='age' type='number' placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='true'></input>
  45 + <text class='red_star_right_10'>*</text>
  46 + <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text>
  47 + <input class='input_wrap' name='age' type='number' placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input>
47 48 </view>
48   - <view class="divide_line_30"></view>
49   -
50   -
51   - <view class='item_body'>
  49 + <view class="divide_line_30"></view>
  50 + <template is="picker_cell_normal" data="{{...countryData}}" />
  51 + <!-- <view class='item_body'>
52 52 <text class='red_star_right_10'>*</text>
53 53 <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
54 54 <text class='text_black_30 float_right' style='line-height: 90rpx' >中国</text>
55   - </view>
  55 + </view> -->
56 56 <view class="divide_line_30"></view>
57 57 <view class='item_body'>
58 58 <text class='red_star_right_10'>*</text>
59 59 <text class='text_777_30 float_left' style='line-height: 90rpx'>是否境外人员</text>
60   - <text class='text_black_30 float_right' style='line-height: 90rpx' >否</text>
  60 + <text class='text_black_30 float_right' style='line-height: 90rpx' >{{overseas}}</text>
61 61 </view>
62 62 <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
63 63 <view class="divide_line_30"></view>
... ...
1 1 var format = require('../../../../utils/util.js');
2 2 var app = getApp();
3 3 var baseUrl = app.globalData.baseUrl;
  4 +// var countryInfo = require('../../../../utils/country.js');
  5 +// const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
  6 +const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
  7 +// const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）'}];
  8 +// const cardTypes8 = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
  9 +
4 10 Page({
5 11
6 12 /**
... ... @@ -10,6 +16,7 @@ Page({
10 16 isshow01: false,
11 17 isshow02: false,
12 18 isshow03: false,
  19 + hasOtherCard:false,
13 20 taxInfo: {},
14 21 proffessionlist: {},
15 22 banklist: {},
... ... @@ -44,21 +51,56 @@ Page({
44 51 },
45 52 cardtypeData: {
46 53 isrequre: true,
47   - disabled: true,
48 54 label: '证照类型',
49 55 bindtype: 'cardtype',
50   - placeholder: '居民身份证',
  56 + placeholder: '请选择证照类型',
  57 + selected: '',
  58 + values: cardTypeArray8,
  59 + // range_key:'name',
  60 + // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
  61 + // '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
  62 + // ],
  63 + onChange: 'onPickerSelect'
  64 + },
  65 + otherCardtypeData: {
  66 + isrequre: true,
  67 + label: '其他证照类型',
  68 + bindtype: 'other_cardtype',
  69 + placeholder: '请选择证照类型',
  70 + selected: '',
  71 + values: [],
  72 + // range_key: 'name',
  73 + onChange: 'onPickerSelect'
  74 + },
  75 + countryData: {
  76 + label: '国籍',
  77 + bindtype: 'country',
  78 + isrequre: true,
51 79 selected: '',
52   - values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
53   - '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
54   - ],
  80 + // range_key:'name',
  81 + placeholder: '请选择国籍',
  82 + onChange: 'onPickerSelect',
  83 + },
  84 + birthCountryData: {
  85 + isrequre: true,
  86 + label: '出生国家（地区）',
  87 + bindtype: 'brith_country',
  88 + placeholder: '请选择国籍',
  89 + onChange: 'onPickerSelect',
  90 + },
  91 + taxpayerTypeData: {
  92 + isrequre: true,
  93 + label: '纳税人类型',
  94 + bindtype: 'taxpayerType',
  95 + placeholder: '请选择纳税人类型',
  96 + values: ["居民", "非居民"],
55 97 onChange: 'onPickerSelect'
56   -},
  98 + },
57 99 forignerInfo: {
58 100 isrequre: true,
59 101 label: '是否境外人员',
60 102 bindtype: 'forigner',
61   - placeholder: '否',
  103 + placeholder: '请选择',
62 104 disabled: true,
63 105 values: ["否", "是"],
64 106 onChange: 'onPickerSelect'
... ... @@ -73,8 +115,9 @@ Page({
73 115 },
74 116 genderData: {
75 117 label: '性别',
  118 + isrequre: true,
76 119 bindtype: 'gender',
77   - disabled: true,
  120 + // disabled: true,
78 121 placeholder: '性别',
79 122 values: ["男", "女"],
80 123 selected: '',
... ... @@ -159,14 +202,15 @@ Page({
159 202 },
160 203 // 时间picker
161 204 birthDate: {
162   - label: '出生年月',
163   - disabled:true,
  205 + label: '出生日期',
  206 + isrequre:true,
164 207 bindtype: 'birthday',
165 208 placeholder: '出生日期',
166 209 selected: '',
167 210 mode: "date",
168 211 fields: "day",
169 212 start: '1949-01-01',
  213 + end: format.curDateTime(),
170 214 onChange: 'birthdayChange',
171 215 },
172 216 startDate: {
... ... @@ -189,10 +233,32 @@ Page({
189 233 start: '2010-01-01',
190 234 onChange: 'endChange',
191 235 },
  236 +
  237 + firstEntryDate: {
  238 + label: '首次入境时间',
  239 + isrequre: true,
  240 + bindtype: 'entry_date',
  241 + placeholder: '出生日期',
  242 + selected: '',
  243 + mode: "date",
  244 + fields: "day",
  245 + onChange: 'onPickerSelect',
  246 + },
  247 + predictLeaveDate: {
  248 + label: '预计离境时间',
  249 + isrequre: true,
  250 + bindtype: 'leave_date',
  251 + placeholder: '出生日期',
  252 + selected: '',
  253 + mode: "date",
  254 + fields: "day",
  255 + onChange: 'onPickerSelect',
  256 + },
192 257 // 地址选择器
193 258 contactaddressInfo: {
194 259 label: '联系地址',
195 260 mode: 'region',
  261 + maxWidth: 490,
196 262 address_code: ['', '', ''],
197 263 address_value: ['', '', ''],
198 264 selected: '',
... ... @@ -227,7 +293,7 @@ Page({
227 293 * 生命周期函数--监听页面加载
228 294 */
229 295 onLoad: function(options) {
230   -
  296 +
231 297 console.log('options.id', options.id)
232 298 if (options.id && options.id.length > 0) {
233 299 this.setData({
... ... @@ -237,7 +303,54 @@ Page({
237 303 }
238 304 this.getproffessiondata()
239 305 this.getbanklist()
  306 + this.getCountry()
  307 + },
  308 +//****************获取国籍数据************/
  309 + getCountry: function () {
  310 + var that = this
  311 + wx.showLoading({
  312 + title: '',
  313 + })
  314 + var Authorization = app.globalData.Authorization;
  315 + wx.request({
  316 + url: baseUrl + 'persontax/v1/nation-list',
  317 + method: "GET",
  318 + header: {
  319 + 'content-type': 'application/json', // 默认值
  320 + "Authorization": Authorization
  321 + },
  322 + success: function (res) {
  323 + var countrys = res.data.concat()
  324 + that.data.birthCountryData.values = res.data
  325 + if (countrys.indexOf('中国') > -1) {
  326 + countrys.splice(countrys.indexOf('中国'), 1);
  327 + }
  328 + if (countrys.indexOf('中国台湾') > -1) {
  329 + countrys.splice(countrys.indexOf('中国台湾'), 1);
  330 + }
  331 + if (countrys.indexOf('香港') > -1) {
  332 + countrys.splice(countrys.indexOf('香港'), 1);
  333 + }
  334 + if (countrys.indexOf('澳门') > -1) {
  335 + countrys.splice(countrys.indexOf('澳门'), 1);
  336 + }
  337 + that.data.countryData.values = countrys
  338 + that.countrys = countrys
  339 + that.setData({
  340 + countryData: that.data.countryData,
  341 + birthCountryData: that.data.birthCountryData
  342 + })
  343 + },
  344 + fail(res) {
  345 + wx.hideLoading()
  346 + },
  347 + complete() {
  348 + wx.hideLoading()
  349 + }
  350 + })
240 351 },
  352 +
  353 +
241 354 //****************获取自然人数据************/
242 355 getpersonalTax: function(id) {
243 356 var that = this
... ... @@ -274,10 +387,12 @@ Page({
274 387 //对各参数初始赋值
275 388 handleDatas: function (tax_info) {
276 389 //todo
  390 + console.log('tax_info', tax_info)
277 391 var curdate = format.curDateTime()
278   - console.log('curdate', curdate)
  392 + this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
279 393
280 394 this.data.name = tax_info.name
  395 + this.data.other_name = tax_info.other_name
281 396 if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
282 397 this.data.genderData.disabled = true
283 398 this.data.birthDate.disabled = true
... ... @@ -285,14 +400,23 @@ Page({
285 400 }
286 401
287 402 this.data.personstatusData.selected = tax_info.taxpayer_status
288   -
289   - this.data.cardtypeData.selected = tax_info.id_card_type
290   - console.log('cardtypeData', this.data.cardtypeData)
  403 + this.data.cardtypeData.selected = tax_info.id_card_type //cardTypeDicts[parseInt(tax_info.id_card_type) - 1]['name']
  404 + // this.data.cardtypeData.selected_code = tax_info.id_card_type
291 405 this.data.card_number = tax_info.id_card_no
  406 +
  407 + this.data.otherCardtypeData.selected = tax_info.other_id_card_type //cardTypeDicts[parseInt(tax_info.other_id_card_type) - 1]['name']
  408 + // this.data.otherCardtypeData.selected_code = tax_info.other_id_card_type
  409 +
  410 + this.data.other_card_number = tax_info.other_id_card_no
  411 + this.data.overseas = tax_info.is_overseas_personnel
  412 + this.data.countryData.selected = tax_info.native
  413 + this.data.birthCountryData.selected = tax_info.birth_native
  414 + this.data.taxpayerTypeData.selected = tax_info.taxpayer_type =='resident'?'居民':'非居民'
  415 +
292 416 this.data.mobile = tax_info.mobile
293 417 this.data.investInfo.selected = tax_info.is_investor
294 418 this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
295   - //非必填
  419 +
296 420 this.data.genderData.selected = tax_info.gender
297 421 if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
298 422 this.data.birthDate.selected = ''
... ... @@ -300,7 +424,7 @@ Page({
300 424 // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
301 425 this.data.birthDate.selected = format.formatTime_date(tax_info.birth_date)
302 426 }
303   -
  427 +//非必填
304 428 console.log('this.data.birthDate', new Date(tax_info.birth_date).toLocaleDateString())
305 429 if (tax_info.join_date > 1000) {
306 430 // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
... ... @@ -309,7 +433,12 @@ Page({
309 433 if (tax_info.separate_date > 1000) {
310 434 this.data.endDate.selected = format.formatTime_date(tax_info.separate_date)
311 435 }
312   -
  436 + const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
  437 + const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
  438 + this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate:''
  439 + this.data.firstEntryDate.datelong = tax_info.first_entry_date
  440 + this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("01-01-01") == -1) ? predictLeaveDate : ''
  441 + this.data.predictLeaveDate.datelong = tax_info.predict_leave_date
313 442 // this.data.professionData.selected = tax_info.profession.three_level_name
314 443
315 444 this.data.birthDate.end = curdate
... ... @@ -320,16 +449,18 @@ Page({
320 449 this.data.lieshuInfo.selected = tax_info.is_martyr_family
321 450 this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
322 451 this.data.bankInfo.selected = tax_info.bank
323   - // this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
  452 + this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
324 453 this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
325 454 this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
326 455 this.data.employeeInfo.selected = tax_info.is_employee
327 456 this.data.investpersonalInfo.selected = tax_info.is_business_angel
328 457 this.setData({
329   - huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
  458 + // huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
330 459 name: this.data.name,
  460 + other_name: this.data.other_name,
331 461 personstatusData: this.data.personstatusData,
332 462 cardtypeData: this.data.cardtypeData,
  463 + otherCardtypeData: this.data.otherCardtypeData,
333 464 mobile: this.data.mobile,
334 465 investInfo: this.data.investInfo,
335 466 specificIndustryInfo: this.data.specificIndustryInfo,
... ... @@ -355,9 +486,15 @@ Page({
355 486 startDate: this.data.startDate,
356 487 long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
357 488 endDate: this.data.endDate,
  489 + firstEntryDate: this.data.firstEntryDate,
  490 + predictLeaveDate: this.data.predictLeaveDate,
358 491 isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
359   - card_number: this.data.card_number
360   -
  492 + card_number: this.data.card_number,
  493 + other_card_number: this.data.other_card_number,
  494 + countryData: this.data.countryData,
  495 + birthCountryData: this.data.birthCountryData,
  496 + overseas: this.data.overseas,
  497 + taxpayerTypeData: this.data.taxpayerTypeData
361 498 })
362 499
363 500 },
... ... @@ -512,8 +649,9 @@ Page({
512 649 birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
513 650 }
514 651
515   - var cardtype_Data = that.data.cardtypeData
516   - cardtype_Data.selected = '居民身份证'
  652 + var cardtypeData = that.data.cardtypeData
  653 + cardtypeData.selected = '居民身份证'
  654 + // cardtypeData.selected_code = '1'
517 655 var gender_Data = that.data.genderData
518 656 gender_Data.selected = id_info.gender
519 657
... ... @@ -535,7 +673,7 @@ Page({
535 673 idInfoData: id_info,
536 674 name: id_info.name,
537 675 birthday: birth_day,
538   - cardtypeData: cardtype_Data,
  676 + cardtypeData: cardtypeData,
539 677 genderData: gender_Data,
540 678 long_birth_date: Date.parse(new Date(birth_day)) / 1000,
541 679 birthDate: that.data.birthDate,
... ... @@ -572,6 +710,85 @@ Page({
572 710
573 711 },
574 712
  713 + dealCardType: function (new_type){
  714 + // console.log('cardtype_code', new_type_code)
  715 + console.log('cardtype', new_type)
  716 + var is_idcard = this.data.isIdCard
  717 + // const new_type = cardTypeDicts[parseInt(new_type_code)-1]['name']
  718 + // this.data.cardtypeData.selected_code = new_type_code
  719 + this.data.cardtypeData.selected = new_type
  720 + this.data.nameText = ''
  721 + if ('居民身份证' == new_type) {
  722 + is_idcard = true
  723 + this.data.genderData.disabled = true
  724 + this.data.birthDate.disabled = true
  725 + } else {
  726 + is_idcard = false
  727 + this.data.genderData.disabled = false
  728 + this.data.birthDate.disabled = false
  729 + }
  730 + this.data.hasOtherCard = true
  731 + this.data.overseas = '是'
  732 + this.data.taxpayerTypeData.disabled = false
  733 + this.data.taxpayerTypeData.selected = ''
  734 + if ('居民身份证' == new_type || '中国护照' == new_type) {
  735 + this.data.overseas = '否'
  736 + this.data.countryData.selected = '中国'
  737 + this.data.countryData.disabled = true
  738 + this.data.hasOtherCard = false
  739 + this.data.taxpayerTypeData.selected = '居民'
  740 + this.data.taxpayerTypeData.disabled = true
  741 + } else if (new_type.indexOf("港澳") != -1) {
  742 + this.data.countryData.values = ['中国香港', '中国澳门']
  743 + this.data.countryData.selected = ''
  744 + this.data.countryData.disabled = false
  745 + this.data.nameText = '英文名'
  746 + // if (new_type.indexOf('通行证') != -1){
  747 + // this.data.otherCardtypeData.values = [{ 'code': '4', 'name': '港澳居民居住证'}];
  748 + // }else{
  749 + this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
  750 + this.data.otherCardtypeData.selected = '港澳居民来往内地通行证';
  751 + // }
  752 + } else if (new_type.indexOf("台湾") != -1) {
  753 + this.data.countryData.selected = '中国台湾'
  754 + this.data.countryData.disabled = true
  755 + this.data.nameText = '英文名'
  756 + // if (new_type.indexOf('通行证') != -1) {
  757 + // this.data.otherCardtypeData.values = [{ 'code': '6', 'name': '台湾居民居住证' }];
  758 + // } else {
  759 + this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
  760 + this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证';
  761 + // }
  762 +
  763 + } else {
  764 + this.data.countryData.selected = ''
  765 + this.data.countryData.values = this.countrys ? this.countrys : []
  766 + this.data.countryData.disabled = false
  767 + this.data.nameText = '中文名'
  768 + // if (new_type.indexOf("外国护照") != -1) {
  769 + // this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
  770 + // } else {
  771 + this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
  772 + this.data.otherCardtypeData.selected = '外国护照';
  773 + // }
  774 + }
  775 + this.setData({
  776 + isIdCard: is_idcard,
  777 + hasOtherCard: this.data.hasOtherCard,
  778 + genderData: this.data.genderData,
  779 + birthDate: this.data.birthDate,
  780 + countryData: this.data.countryData,
  781 + cardtypeData: this.data.cardtypeData,
  782 + otherCardtypeData: this.data.otherCardtypeData,
  783 + nameText: this.data.nameText,
  784 + overseas: this.data.overseas,
  785 + taxpayerTypeData: this.data.taxpayerTypeData
  786 + })
  787 +
  788 +
  789 + },
  790 +
  791 +
575 792 onPickerSelect: function(e) {
576 793 console.log('picker发送选择改变，携带值为', e)
577 794 switch (e.currentTarget.id) {
... ... @@ -583,24 +800,64 @@ Page({
583 800 })
584 801 break;
585 802 case 'cardtype':
586   - var cardtype_data = this.data.cardtypeData
587   - var new_type = cardtype_data.values[e.detail.value]
588   - console.log('cardtype', cardtype_data.values[e.detail.value])
589   - if (new_type != this.data.cardtypeData.selected) {
590   - var is_idcard = this.data.isIdCard
591   - cardtype_data.selected = cardtype_data.values[e.detail.value]
592   - if (0 == e.detail.value) {
593   - is_idcard = true
594   - } else {
595   - is_idcard = false
  803 + var cardtypeData = this.data.cardtypeData
  804 + var new_type = cardtypeData.values[e.detail.value] //['name']
  805 + // var new_type_code = cardtypeData.values[e.detail.value]['code']
  806 + var selected = cardtypeData.selected
  807 + if (new_type != selected) {
  808 + this.dealCardType(new_type)
  809 + var setData = { card_number: ''}
  810 + if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
  811 + console.log('外国人', new_type, selected)
  812 + }else {
  813 + // this.data.otherCardtypeData.selected = ''
  814 + // setData.otherCardtypeData = this.data.otherCardtypeData
  815 + setData.other_card_number = ''
596 816 }
  817 + this.setData(setData)
  818 + }
  819 + break;
  820 + case 'other_cardtype':
  821 + var otherCardtypeData = this.data.otherCardtypeData
  822 + var new_type = otherCardtypeData.values[e.detail.value] //['name']
  823 + // var new_type_code = otherCardtypeData.values[e.detail.value]['code']
  824 +
  825 + if (new_type != otherCardtypeData.selected) {
  826 + otherCardtypeData.selected = new_type
  827 + // otherCardtypeData.selected_code = new_type_code
  828 + this.setData({
  829 + other_card_number: "",
  830 + otherCardtypeData: this.data.otherCardtypeData
  831 + })
  832 + }
  833 + break;
  834 + case 'country':
  835 + var countryData = this.data.countryData
  836 + var new_country = countryData.values[e.detail.value]
  837 + if (new_country != countryData.selected) {
  838 + countryData.selected = new_country
597 839 this.setData({
598   - card_number:"",
599   - isIdCard: is_idcard,
600   - cardtypeData: cardtype_data
  840 + countryData: countryData
601 841 })
602 842 }
603 843 break;
  844 + case 'brith_country':
  845 + var birthCountryData = this.data.birthCountryData
  846 + var new_country = birthCountryData.values[e.detail.value]
  847 + if (new_country != birthCountryData.selected) {
  848 + birthCountryData.selected = new_country
  849 + this.setData({
  850 + birthCountryData: birthCountryData
  851 + })
  852 + }
  853 + break;
  854 + case 'taxpayerType':
  855 + var taxpayerTypeData = this.data.taxpayerTypeData
  856 + taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
  857 + this.setData({
  858 + taxpayerTypeData: taxpayerTypeData
  859 + })
  860 + break;
604 861 case 'forigner':
605 862 var forigner_data = this.data.forignerInfo
606 863 forigner_data.selected = forigner_data.values[e.detail.value]
... ... @@ -689,6 +946,25 @@ Page({
689 946 investpersonalInfo: investpersonal_data
690 947 })
691 948 break;
  949 + case 'entry_date':
  950 + this.data.firstEntryDate.selected = e.detail.value
  951 + this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
  952 + this.data.predictLeaveDate.start = e.detail.value
  953 + if (this.data.firstEntryDate.datelong>this.data.predictLeaveDate.datelong){
  954 + this.data.predictLeaveDate.selected = ''
  955 + }
  956 + this.setData({
  957 + firstEntryDate: this.data.firstEntryDate,
  958 + predictLeaveDate: this.data.predictLeaveDate
  959 + })
  960 + break;
  961 + case 'leave_date':
  962 + this.data.predictLeaveDate.selected = e.detail.value
  963 + this.data.predictLeaveDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
  964 + this.setData({
  965 + predictLeaveDate: this.data.predictLeaveDate
  966 + })
  967 + break;
692 968 }
693 969
694 970 },
... ... @@ -786,12 +1062,19 @@ Page({
786 1062 name: e.detail.value
787 1063 })
788 1064 },
789   -
  1065 + bindOtherName: function(e) {
  1066 + this.setData({
  1067 + other_name: e.detail.value
  1068 + })
  1069 + },
790 1070 idcardblur: function (e) {
791 1071 var idCardNo = e.detail.value
792 1072 this.setData({
793 1073 card_number: idCardNo
794 1074 })
  1075 + if (!this.data.isIdCard) {
  1076 + return;
  1077 + }
795 1078 if (!idCardNo.length) {
796 1079 wx.showToast({
797 1080 image: "../../../../images/warn.png",
... ... @@ -812,6 +1095,9 @@ Page({
812 1095 this.setData({
813 1096 card_number: idCardNo
814 1097 })
  1098 + if (!this.data.isIdCard) {
  1099 + return;
  1100 + }
815 1101 if (e.detail.value.length == 18) {
816 1102 if (!format.isIDCardNum(idCardNo)) {
817 1103 wx.showToast({
... ... @@ -858,10 +1144,10 @@ Page({
858 1144 },
859 1145
860 1146 formSubmit: function(e) {
861   - console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
862 1147 var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
863 1148 var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
864   - var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
  1149 + var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;
  1150 + // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
865 1151 // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
866 1152 var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
867 1153 var formdata = e.detail.value;
... ... @@ -880,6 +1166,43 @@ Page({
880 1166 this.showtoast('请输入正确姓名');
881 1167 return
882 1168 }
  1169 + if (this.data.genderData.selected.length < 1) {
  1170 + this.showtoast('请选择性别');
  1171 + return
  1172 + }
  1173 + if (this.data.birthDate.selected.length < 1) {
  1174 + this.showtoast('请选择出生日期');
  1175 + return
  1176 + }
  1177 + if (this.data.countryData.selected.length < 1) {
  1178 + this.showtoast('请选择国籍');
  1179 + return
  1180 + }
  1181 + if (this.data.taxpayerTypeData.selected.length < 1) {
  1182 + this.showtoast('请选择纳税人类型');
  1183 + return
  1184 + }
  1185 + if (this.data.hasOtherCard && !this.data.firstEntryDate.selected) {
  1186 + this.showtoast('请选择首次入境时间');
  1187 + return
  1188 + }
  1189 + if (this.data.hasOtherCard && !this.data.predictLeaveDate.selected) {
  1190 + this.showtoast('请选择预计离境时间');
  1191 + return
  1192 + }
  1193 + if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected) {
  1194 + this.showtoast('请选择其他证照类型');
  1195 + return
  1196 + }
  1197 + if (this.data.hasOtherCard && !formdata.other_card_number.length) {
  1198 + this.showtoast('请输入其他证照号码');
  1199 + return
  1200 + }
  1201 + if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
  1202 + this.showtoast('请选择出生国家');
  1203 + return
  1204 + }
  1205 +
883 1206 if (this.data.mobile.length < 1) {
884 1207 this.showtoast('请输入手机号码');
885 1208 return
... ... @@ -887,23 +1210,28 @@ Page({
887 1210 this.showtoast('手机号码有误');
888 1211 return
889 1212 }
890   - if (this.data.curAddress_haschanged || this.data.taxInfo.current_address.province_code) {//选择了地址
  1213 + if (this.data.curAddress_haschanged) {//选择了地址 || this.data.taxInfo.current_address.province_code
891 1214 if (formdata.current_address_detail.length < 1) {
892 1215 this.showtoast('请填写详细居住地址');
893 1216 return
894 1217 }
895 1218 }
896   - if (this.data.birthAddress_haschanged || this.data.taxInfo.huji_address.province_code) {//选择了地址
  1219 + if (this.data.birthAddress_haschanged) {//选择了地址 || this.data.taxInfo.huji_address.province_code
897 1220 if (formdata.huji_address_detail.length < 1) {
898 1221 this.showtoast('请填写详细户籍地址');
899 1222 return
900 1223 }
901 1224 }
902   -
903   - // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
904   - // this.showtoast('邮箱格式有误');
905   - // return
906   - // }
  1225 + if (this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
  1226 + if (formdata.contact_address_detail.length < 1) {
  1227 + this.showtoast('请填写详细联系地址');
  1228 + return
  1229 + }
  1230 + }
  1231 + if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
  1232 + this.showtoast('邮箱格式有误');
  1233 + return
  1234 + }
907 1235 // if (formdata.email && formdata.email.length > 0 && !format.checkEmail(formdata.email)) {
908 1236 // this.showtoast('邮箱格式有误');
909 1237 // return
... ... @@ -988,15 +1316,20 @@ Page({
988 1316 data: {
989 1317 'certification_status': that.getCertifyStatus(formdata),
990 1318 "name": that.data.name,
  1319 + "other_name": that.data.other_name,
991 1320 "family_ties": '本人',//that.data.relativeData.selected,
992   - "native": "中国",
993   - "taxpayer_type":"居民",
994   - "is_overseas_personnel": "否",
995   - "id_card_type": that.data.cardtypeData.selected,
  1321 + "native": that.data.countryData.selected,
  1322 + "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
  1323 + "is_overseas_personnel": that.data.overseas,
  1324 + 'birth_native': that.data.birthCountryData.selected,
  1325 + "id_card_type": that.data.cardtypeData.selected, //selected_code,
996 1326 "id_card_no": that.data.card_number,
  1327 + "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
  1328 + "other_id_card_no": formdata.other_card_number,
997 1329 "gender": that.data.genderData.selected,
998 1330 "birth_date": that.data.long_birth_date,
999   -
  1331 + "first_entry_date": that.data.firstEntryDate.datelong,
  1332 + "predict_leave_date": that.data.predictLeaveDate.datelong,
1000 1333 "mobile": that.data.mobile,
1001 1334 "current_address": request_current_address,
1002 1335 "current_address_detail": formdata.current_address_detail,
... ... @@ -1017,8 +1350,8 @@ Page({
1017 1350 "is_lonely_man": that.data.lonelyolderInfo.selected,
1018 1351 "comment": formdata.comment,
1019 1352
1020   - // "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
1021   - // "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
  1353 + "contact_address": request_contact_address,
  1354 + "contact_address_detail": formdata.contact_address_detail,
1022 1355
1023 1356 // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
1024 1357 // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
... ... @@ -1126,7 +1459,8 @@ Page({
1126 1459 wx.showToast({
1127 1460 title: str,
1128 1461 duration: 2000,
1129   - image: '/images/error.png'
  1462 + icon:'none'
  1463 + // image: '/images/error.png'
1130 1464 })
1131 1465 },
1132 1466
... ...
1 1 {
2   - "navigationBarTitleText": "自然人基础信息",
  2 + "navigationBarTitleText": "个人基础信息",
3 3 "navigationBarTextStyle": "black",
4 4 "navigationBarBackgroundColor": "#FFFFFF"
5 5 }
\ No newline at end of file
... ...
... ... @@ -29,9 +29,10 @@
29 29 <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
30 30 <view>
31 31 <image wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}"></image>
32   - <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></input>
  32 + <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='30' bindblur='idcardblur' bindinput = 'bindinputcardnum' type="{{isIdCard.length?'idcard':''}}"></input>
33 33 <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
34 34 <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
  35 + <view class="divide_line_30"></view>
35 36 </view>
36 37 </view>
37 38 <view class='item_body' hidden="{{!isself}}">
... ... @@ -42,31 +43,57 @@
42 43 <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
43 44 </view>
44 45 <view class="divide_line_30"></view>
  46 + <template is="picker_cell_normal" data="{{...genderData}}" />
  47 + <view class="divide_line_30"></view>
  48 + <template is="picker_cell_normal" data="{{...birthDate}}" />
  49 + <view class="divide_line_30"></view>
  50 + <template is="picker_cell_normal" data="{{...countryData}}" />
45 51
46   - <view class='item_body'>
  52 + <!-- <view class='item_body'>
47 53 <text class='red_star_right_10'>*</text>
48 54 <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
49 55 <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
50   - </view>
  56 + </view> -->
51 57 <view class="divide_line_30"></view>
52   - <view class='item_body'>
  58 + <template is="picker_cell_normal" data="{{...taxpayerTypeData}}" />
  59 + <!-- <view class='item_body'>
53 60 <text class='red_star_right_10'>*</text>
54 61 <text class='text_777_30 float_left' style='line-height: 90rpx'>纳税人类型</text>
55 62 <text class='text_black_30 float_right' style='line-height: 90rpx'>居民</text>
56   - </view>
  63 + </view> -->
57 64 <view class="divide_line_30"></view>
58 65 <view class='item_body'>
59 66 <text class='red_star_right_10'>*</text>
60 67 <text class='text_777_30 float_left' style='line-height: 90rpx'>是否境外人员</text>
61   - <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
62   - </view>
63   - <view class="divide_line_30"></view>
64   -
65   - <view hidden='{{!isshow01}}'>
  68 + <text class='text_black_30 float_right' style='line-height: 90rpx'>{{overseas}}</text>
  69 + </view>
  70 + <view wx:if='{{hasOtherCard}}'>
  71 + <view class="divide_line_30"></view>
  72 + <template is="picker_cell_normal" data="{{...firstEntryDate}}" />
66 73 <view class="divide_line_30"></view>
67   - <template is="picker_cell_normal" data="{{...genderData}}" />
  74 + <template is="picker_cell_normal" data="{{...predictLeaveDate}}" />
68 75 <view class="divide_line_30"></view>
69   - <template is="picker_cell_normal" data="{{...birthDate}}" />
  76 + <template is="picker_cell_normal" data="{{...otherCardtypeData}}" />
  77 + <view class="divide_line_30"></view>
  78 + <view class='item_body'>
  79 + <text class='red_star_right_10'>*</text>
  80 + <text class='text_777_30 float_left' style='line-height: 90rpx'>其他证照号码</text>
  81 + <view>
  82 + <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_card_number' maxlength='30'></input>
  83 + </view>
  84 + </view>
  85 + <view class="divide_line_30"></view>
  86 + <template is="picker_cell_normal" data="{{...birthCountryData}}" />
  87 + </view>
  88 + <view hidden='{{!isshow01}}'>
  89 + <view wx:if='{{hasOtherCard}}'>
  90 + <view class="divide_line_30"></view>
  91 + <view class='item_body'>
  92 + <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>{{nameText}}</text>
  93 + <input class='input_wrap' placeholder="请输入{{nameText}}" value='{{other_name}}' bindblur='bindOtherName' style='line-height: 90rpx'></input>
  94 + </view>
  95 +
  96 + </view>
70 97 </view>
71 98 </view>
72 99 </view>
... ... @@ -108,10 +135,19 @@
108 135 <view class="divide_line_30"></view>
109 136 <view class='item_body '>
110 137 <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
111   - <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input>
  138 + <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{taxInfo.huji_address_detail}}'></input>
112 139 </view>
113 140 <view class="divide_line_30"></view>
114   -
  141 + <view wx:if='{{hasOtherCard}}' >
  142 + <template is="picker_cell_normal" data="{{...contactaddressInfo}}" />
  143 + <view class="divide_line_30"></view>
  144 + <view class='item_body '>
  145 + <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
  146 + <input class='input_wrap ' name='contact_address_detail' placeholder-class='text_999_30' placeholder='请输入详细联系地址' value='{{taxInfo.contact_address_detail}}'></input>
  147 + </view>
  148 + <view class="divide_line_30"></view>
  149 + </view>
  150 +
115 151 <view class='item_body'>
116 152 <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>电子邮箱</text>
117 153 <input class='input_wrap' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='32'></input>
... ... @@ -224,9 +260,10 @@
224 260
225 261 </view>
226 262 </view>
227   -
228   - <view hidden='{{isshow02}}' style='background:#f8f8f8;height:500rpx'></view>
229   - <view hidden='{{!isshow02}}' style='background:#f8f8f8;height:200rpx'></view>
  263 + <view class="divide_line_30"></view>
  264 + <view style='background:#FFF;height:84rpx'></view>
  265 + <!-- <view hidden='{{isshow02}}' style='background:#f8f8f8;height:500rpx'></view>
  266 + <view hidden='{{!isshow02}}' style='background:#f8f8f8;height:200rpx'></view> -->
230 267
231 268 <view class="btn_bottom">
232 269 <button class="btn_bottom" formType="submit"> 保存</button>
... ...
... ... @@ -11,9 +11,16 @@
11 11 "newFeature": true
12 12 },
13 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",
  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 + "libVersion": "2.4.2",
  18 + "appid": "wx04262fa98a7de5b6",
  19 + "projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
  20 + "debugOptions": {
  21 + "hidedInDevtools": []
  22 + },
  23 +
17 24 "isGameTourist": false,
18 25 "condition": {
19 26 "search": {
... ...
请 注册 或 登录 后发表评论