自然人信息调整

pangy
pages/main/advancepayment/adPayHome.js
pages/main/taxperson/addinfo/addinfo.js
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/addinfo/addinfo.wxss
pages/main/taxperson/home.js
--- a/pages/main/advancepayment/adPayHome.js
查看文件 @dabe494
+++ b/pages/main/advancepayment/adPayHome.js
查看文件 @dabe494
@@ -183,7 +183,7 @@ Page({
        var value = detail[titleData['key']]
       details.push({
-        title: titleData['original_column'],
+        title: titleData['title'],
         value: value
       })
     }
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @dabe494
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @dabe494
@@ -3,11 +3,12 @@ var app = getApp();
 var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
 Page({
-
+  cur_id:null,
   /**
    * 页面的初始数据
    */
   data: {
+    isEnable: true,
     isshow01: false,
     isshow02: false,
     isshow03: false,
@@ -32,15 +33,6 @@ Page({
       values: ["子","女" ,"配偶", "父母", "祖父母", "外祖父母"],
       onChange: 'onPickerSelect'
     },
-    personstatusData: {
-      isrequre: true,
-      label: '纳税人状态',
-      bindtype: 'personstatus',
-      selected: '',
-      placeholder: '请选择纳税人状态',
-      values: ["正常", "非正常"],
-      onChange: 'onPickerSelect'
-    },
     cardtypeData: {
       isrequre: true,
       label: '证照类型',
@@ -61,13 +53,6 @@ Page({
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
-    bankInfo: {
-      label: '开户银行',
-      bindtype: 'bank',
-      selected: '',
-      placeholder: '请选择开户银行',
-      onChange: 'onPickerSelect'
-    },
     genderData: {
       isblack:true,
       label: '性别',
@@ -77,278 +62,73 @@ Page({
       values: ["男", "女"],
       onChange: 'onPickerSelect'
     },
-    professionData: {
-      mode: 'multiSelector',
-      label: '职业',
-      bindtype: 'profession',
-      selected: '',
-      range_key: 'label',
-      placeholder: '请选择职业',
-      onChange: 'onPickerSelect'
-    },
-    degreeData: {
-      label: '学历',
-      bindtype: 'degree',
-      selected: '',
-      placeholder: '请选择学历',
-      values: ["研究生", "大学本科", '大学本科以下'],
-      onChange: 'onPickerSelect'
-    },
-    disabilityInfo: {
-      label: '是否残疾',
-      bindtype: 'disable',
-      selected: '',
-      placeholder: '请选择是否残疾',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    lieshuInfo: {
-      label: '是否烈属',
-      bindtype: 'lieshu',
-      selected: '',
-      placeholder: '请选择是否烈属',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    lonelyolderInfo: {
-      label: '是否孤老',
-      bindtype: 'lonelyolder',
-      selected: '',
-      placeholder: '请选择是否孤老',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    investInfo: {
-      isrequre: true,
-      label: '是否股东、投资者',
-      bindtype: 'invest',
-      selected: '',
-      placeholder: '请选择是否股东、投资者',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    specificIndustryInfo: {
-      isrequre: true,
-      label: '是否特定行业',
-      bindtype: 'specificIndustry',
-      selected: '',
-      placeholder: '请选择是否特定行业',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    employeeInfo: {
-      isrequre: true,
-      label: '是否雇员',
-      bindtype: 'employee',
-      selected: '',
-      placeholder: '请选择是否雇员',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    investpersonalInfo: {
-      label: '是否天使投资个人',
-      bindtype: 'investpersonal',
-      selected: '',
-      placeholder: '请选择是否天使投资个人',
-      values: ["否", "是"],
-      onChange: 'onPickerSelect'
-    },
-    // 时间picker
-    birthDate: {
-      label: '出生年月',
-      bindtype: 'birthday',
-      selected: '',
-      placeholder: '请选择出生日期',
-      mode: "date",
-      fields: "day",
-      start: '1949-01-01',
-      onChange: 'birthdayChange',
-    },
-    startDate: {
-      label: '任职受雇日期',
-      bindtype: 'startday',
-      selected: '',
-      placeholder: '请选择受雇日期',
-      mode: "date",
-      fields: "day",
-      start: '1990-01-01',
-      onChange: 'startChange',
-    },
-    endDate: {
-      label: '离职日期',
-      bindtype: 'endday',
-      selected: '',
-      placeholder: '请选择离职日期',
-      mode: "date",
-      fields: "day",
-      start: '2010-01-01',
-      onChange: 'endChange',
-    },
-    // 地址选择器
-    contactaddressInfo: {
-      label: '联系地址',
-      mode: 'region',
-      address_code: ['', '', ''],
-      address_value: ['', '', ''],
-      selected: '',
-      placeholder: '请选择联系地址',
-      onChange: 'contactAddressSelect'
-    },
-    currentaddressInfo: {
-      label: '居住地',
-      mode: 'region',
-      address_code: ['', '', ''],
-      address_value: ['', '', ''],
-      selected: '',
-      placeholder: '请选择居住地',
-      onChange: 'currentAddressSelect'
-    },
-    birthaddressInfo: {
-      label: '户籍所在地',
-      mode: 'region',
-      address_code: ['', '', ''],
-      address_value: ['', '', ''],
-      selected: '',
-      placeholder: '请选择户籍所在地',
-      onChange: 'birthAddressSelect'
-    },
-    title: '',
-    condition: false
+
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    this.handleData()
-    this.getproffessiondata()
-    this.getbanklist()
-  },
-
-  handleData: function() {
-    var curdate = format.curDateTime()
-    console.log('curdate', curdate)
-    this.data.birthDate.end = curdate
-    this.data.startDate.end = curdate
-    this.data.endDate.end = curdate
+    console.log('options.id', options.id)
+    if (options.id && options.id.length > 0) {
+      this.cur_id = options.id
+      this.getpersonalTax(options.id)
+    }
   },
-  getproffessiondata: function() {
+  //****************获取自然人数据************/
+  getpersonalTax: function (id) {
     var that = this
+    wx.showLoading({
+      title: '',
+    })
     var Authorization = app.globalData.Authorization;
-    var proffession_info = that.data.professionData
     wx.request({
-      url: baseUrl + 'common/v1/professions',
+      url: baseUrl + 'persontax/v1/personal-taxes/' + id,
       method: "GET",
       header: {
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function(res) {
-        proffession_info.values = that.handleProfession(res.data.items)
-        console.log('proffession_info------', proffession_info)
+      success: function (res) {
+        console.log('taxInfo', res)
         that.setData({
-          proffessionlist: res.data.items,
-          professionData: proffession_info
+          taxInfo: res.data,
+          isself: res.data.family_ties ? false : true
         })
+        that.handleDatas(res.data)
       },
       fail(res) {
         console.log(res)
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
       }
     })
   },
+  //对各参数初始赋值
+  handleDatas: function (tax_info) {
-  handleProfession: function(items) {
-    var new_profession_data = []
-    var list = [],
-      tempTwo = {},
-      tempOne = {},
-      tempThree = {};
-    items.map((d) => {
-      if (!tempOne[d.one_level_code]) {
-        tempOne[d.one_level_code] = {
-          "value": d.one_level_code,
-          "label": d.one_level_name,
-          "children": []
-        };
-      }
-      if (!tempTwo[d.two_level_code]) {
-        var districtArray = [];
-        districtArray.push({
-          "value": d.three_level_code,
-          "label": d.three_level_name,
-          "children": []
-        });
-
-        tempTwo[d.two_level_code] = {
-          "value": d.two_level_code,
-          "label": d.two_level_name,
-          "children": districtArray
-        };
-
-      } else {
-        if (!tempThree[d.three_level_code]) {
-          tempTwo[d.two_level_code].children.push({
-            "value": d.three_level_code,
-            "label": d.three_level_name,
-            "children": []
-          });
-          tempThree[d.three_level_code] = "y"
-        }
-      }
-    });
-    items.map((d) => {
-      if (tempTwo[d.two_level_code]) {
-        tempOne[d.one_level_code].children.push(tempTwo[d.two_level_code]);
-        tempTwo[d.two_level_code] = null;
-      }
-    });
-    for (var key in tempOne) {
-      list.push(tempOne[key]);
-    }
-    new_profession_data = [list, list[0].children, list[0].children[0].children]
-    console.log('new_profession_data', new_profession_data)
-    return new_profession_data;
+    var isDisable = tax_info.certification_status != 'active'//已通过拍摄身份证认证过，不能修改
-  },
-
-  getbanklist: function() {
-    var that = this
-    var Authorization = app.globalData.Authorization;
-    var bank_info = that.data.bankInfo
-    wx.request({
-      url: baseUrl + 'walletmgm/v1/bankinfos',
-      method: "GET",
-      header: {
-        'content-type': 'application/json', // 默认值
-        "Authorization": Authorization
-      },
-      success: function(res) {
-        console.log(res)
-        if (res.data && res.data.items && res.data.items.length > 0) {
-          bank_info.values = that.handleBankinfo(res.data.items)
-
-          that.setData({
-            banklist: res.data.items,
-            bankInfo: bank_info
-          })
-        }
-        console.log("bankInfo", that.data.bankInfo)
-      },
-      fail(res) {
-        console.log(res)
-      }
+    this.data.relativeData.selected = tax_info.family_ties
+    // this.data.cardtypeData.selected = tax_info.id_card_type
+    this.data.genderData.selected = tax_info.gender
+    this.data.genderData.disabled = isDisable
+    
+    this.setData({
+      isDisable: isDisable,
+      relativeData: this.data.relativeData,
+      name: tax_info.name,
+      // cardtypeData: this.data.cardtypeData,
+      genderData: this.data.genderData,
+      isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
+      card_number: tax_info.id_card_no
     })
+    this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
   },
-
-  handleBankinfo: function(data) {
-    var bank_name = []
-    for (var i = 0; i < data.length; i++) {
-      bank_name.push(data[i].bank_name)
-    }
-    return bank_name
-  },
-
+ 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -378,8 +158,8 @@ Page({
           } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
-          var cardtype_Data = that.data.cardtypeData
-          cardtype_Data.selected = '居民身份证'
+          // var cardtype_Data = that.data.cardtypeData
+          // cardtype_Data.selected = '居民身份证'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
@@ -397,7 +177,7 @@ Page({
             idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
-            cardtypeData: cardtype_Data,
+            // cardtypeData: cardtype_Data,
             genderData: gender_Data,
             long_birth_date: Date.parse(new Date(birth_day)) / 1000,
             birthDate: that.data.birthDate,
@@ -415,23 +195,6 @@ Page({
     })
   },
-  span: function(e) {
-    console.log(e)
-    if ("1" == e.target.id) {
-      this.setData({
-        isshow01: !this.data.isshow01
-      })
-    } else if ("2" == e.target.id) {
-      this.setData({
-        isshow02: !this.data.isshow02
-      })
-    } else if ("3" == e.target.id) {
-      this.setData({
-        isshow03: !this.data.isshow03
-      })
-    }
-
-  },
   // =============普通单列picker选中处理==============
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
@@ -443,13 +206,6 @@ Page({
           relativeData: relative_data
         })
         break;
-      case 'personstatus':
-        var personstatus_data = this.data.personstatusData
-        personstatus_data.selected = personstatus_data.values[e.detail.value]
-        this.setData({
-          personstatusData: personstatus_data
-        })
-        break;
       case 'cardtype':
         var is_idcard = this.data.isIdCard
         var cardtype_data = this.data.cardtypeData
@@ -464,20 +220,6 @@ Page({
           cardtypeData: cardtype_data
         })
         break;
-      case 'forigner':
-        var forigner_data = this.data.forignerInfo
-        forigner_data.selected = forigner_data.values[e.detail.value]
-        this.setData({
-          forignerInfo: forigner_data
-        })
-        break;
-      case 'bank':
-        var bank_data = this.data.bankInfo
-        bank_data.selected = bank_data.values[e.detail.value]
-        this.setData({
-          bankInfo: bank_data
-        })
-        break;
       case 'gender':
         var gender_data = this.data.genderData
         gender_data.selected = gender_data.values[e.detail.value]
@@ -485,134 +227,11 @@ Page({
           genderData: gender_data
         })
         break;
-      case 'profession':
-        var profession_data = this.data.professionData
-        console.log(profession_data.values[e.detail.value[e.detail.value[0]]][0])
-        var profession_name = profession_data.values[e.detail.value[e.detail.value[0]]][0].children[e.detail.value[1]].children[e.detail.value[2]].label
-        profession_data.selected = profession_name
-        this.setData({
-          profession_index: e.detail.value,
-          professionData: profession_data
-        })
-        break;
-      case 'degree':
-        var degree_data = this.data.degreeData
-        degree_data.selected = degree_data.values[e.detail.value]
-        this.setData({
-          degreeData: degree_data
-        })
-        break;
-      case 'disable':
-        var disable_data = this.data.disabilityInfo
-        disable_data.selected = disable_data.values[e.detail.value]
-        this.setData({
-          disabilityInfo: disable_data
-        })
-        break;
-      case 'lieshu':
-        var lieshu_data = this.data.lieshuInfo
-        lieshu_data.selected = lieshu_data.values[e.detail.value]
-        this.setData({
-          lieshuInfo: lieshu_data
-        })
-        break;
-      case 'lonelyolder':
-        var lonelyolder_data = this.data.lonelyolderInfo
-        lonelyolder_data.selected = lonelyolder_data.values[e.detail.value]
-        this.setData({
-          lonelyolderInfo: lonelyolder_data
-        })
-        break;
-      case 'invest':
-        var invest_data = this.data.investInfo
-        invest_data.selected = invest_data.values[e.detail.value]
-        this.setData({
-          investInfo: invest_data
-        })
-        break;
-      case 'specificIndustry':
-        var specificIndustry_data = this.data.specificIndustryInfo
-        specificIndustry_data.selected = specificIndustry_data.values[e.detail.value]
-        this.setData({
-          specificIndustryInfo: specificIndustry_data
-        })
-        break;
-      case 'employee':
-        var employee_data = this.data.employeeInfo
-        employee_data.selected = employee_data.values[e.detail.value]
-        this.setData({
-          employeeInfo: employee_data
-        })
-        break;
-      case 'investpersonal':
-        var investpersonal_data = this.data.investpersonalInfo
-        investpersonal_data.selected = investpersonal_data.values[e.detail.value]
-        this.setData({
-          investpersonalInfo: investpersonal_data
-        })
-        break;
+     
     }
   },
-  // =============日期picker选中处理==============
-  birthdayChange: function(e) {
-    var birth_date = this.data.birthDate;
-    birth_date.selected = e.detail.value
-    console.log('long_birth_date', Date.parse(new Date(e.detail.value)) / 1000)
-    this.setData({
-      long_birth_date: (Date.parse(new Date(e.detail.value)) / 1000),
-      birthDate: birth_date
-    })
-  },
-
-  startChange: function(e) {
-    var start_date = this.data.startDate;
-    start_date.selected = e.detail.value
-    this.setData({
-      startDate: start_date
-    })
-  },
-
-  endChange: function(e) {
-    var end_date = this.data.endDate;
-    end_date.selected = e.detail.value
-    this.setData({
-      endDate: end_date
-    })
-  },
-
-  // =============地区picker选中处理==============
-
-  contactAddressSelect: function(e) {
-    console.log('contactAddressSelect', e)
-    var contact_address = this.data.contactaddressInfo;
-    contact_address.address_value = e.detail.value
-    contact_address.address_code = e.detail.code
-    this.setData({
-      contactaddressInfo: contact_address
-    })
-  },
-
-  currentAddressSelect: function(e) {
-    console.log('currentAddressSelect', e)
-    var current_address = this.data.currentaddressInfo;
-    current_address.address_value = e.detail.value
-    current_address.address_code = e.detail.code
-    this.setData({
-      currentaddressInfo: current_address
-    })
-  },
-
-  birthAddressSelect: function(e) {
-    console.log('birthAddressSelect', e)
-    var birth_address = this.data.birthaddressInfo;
-    birth_address.address_value = e.detail.value
-    birth_address.address_code = e.detail.code
-    this.setData({
-      birthaddressInfo: birth_address
-    })
-  },
   // =============其他数据选中处理==============
@@ -644,14 +263,6 @@ Page({
       this.showtoast('有必填项未填写');
       return
     }
-    //  else if (this.data.personstatusData.selected.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } 
-    // else if (this.data.cardtypeData.selected.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } 
     else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
@@ -662,35 +273,10 @@ Page({
       this.showtoast('有必填项未填写');
       return
     } 
-    // else if (formdata.mobile.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } 
-    // else if (!regMobile.test(formdata.mobile)) {
-    //   this.showtoast('请输入正确手机号');
-    //   return
-    // }
-    // else if (this.data.investInfo.selected.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } else if (this.data.specificIndustryInfo.selected.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } else if (this.data.employeeInfo.selected.length < 1) {
-    //   this.showtoast('有必填项未填写');
-    //   return
-    // } 
     else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
       this.showtoast('请输入正确邮箱');
       return
     }
-    //  else if (formdata.company_equity_total && formdata.company_equity_total.length > 0 && !regMoney.test(formdata.company_equity_total)) {
-    //   this.showtoast('请输入正确金额');
-    //   return
-    // } else if (formdata.personal_equity_total && formdata.personal_equity_total.length > 0 && !regMoney.test(formdata.personal_equity_total)) {
-    //   this.showtoast('请输入正确金额');
-    //   return
-    // }
     var new_card_num = ''
     if (this.data.isIdCard) {
       if (this.data.card_number.length > 0) {
@@ -715,72 +301,28 @@ Page({
     var formdata = data
     console.log("form_data", formdata);
     var Authorization = app.globalData.Authorization;
-    var request_profession = that.getProfessionRequest()
+    var url = baseUrl + 'persontax/v1/personal-taxes', method = "POST"
+    if (this.cur_id.length){
+      url = baseUrl + 'persontax/v1/personal-taxes/' + this.cur_id
+      method = "PUT"
+    }
+    console.log('this.cur_id', this.cur_id)
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
-      url: baseUrl + 'persontax/v1/personal-taxes',
-      method: "POST",
+      url: url,
+      method: method,
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "family_ties": that.data.relativeData.selected,
         "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
         "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
-        "name": that.data.name.length > 0 ? that.data.name : formdata.name,
+        "name": formdata.name,
         "gender": that.data.genderData.selected,
         //"age": formdata.age ? formdata.age : '',//不传
         "native": "中国",
         "is_overseas_personnel": "否",
-
-        // "birth_date": that.data.long_birth_date,
-        // "profession": request_profession,
-        // "education": that.data.degreeData.selected,
-        // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
-        // "taxpayer_status": that.data.personstatusData.selected,
-        // "is_martyr_family": that.data.lieshuInfo.selected,
-        // "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
-        // "is_disability": that.data.disabilityInfo.selected,
-        // "disability_no": that.data.disabilityInfo.selected == '否' ? '' : formdata.disability_no,
-        // "is_lonely_man": that.data.lonelyolderInfo.selected,
-        // "comment": formdata.comment,
-        // "current_address": {
-        //   "province_code": that.data.currentaddressInfo.address_code[0],
-        //   "province": that.data.currentaddressInfo.address_value[0],
-        //   "city_code": that.data.currentaddressInfo.address_code[1],
-        //   "city": that.data.currentaddressInfo.address_value[1],
-        //   "district_code": that.data.currentaddressInfo.address_code[2],
-        //   "district": that.data.currentaddressInfo.address_value[2]
-        // },
-        // "current_address_detail": formdata.current_address_detail,
-        // "huji_address": {
-        //   "province_code": that.data.birthaddressInfo.address_code[0],
-        //   "province": that.data.birthaddressInfo.address_value[0],
-        //   "city_code": that.data.birthaddressInfo.address_code[1],
-        //   "city": that.data.birthaddressInfo.address_value[1],
-        //   "district_code": that.data.birthaddressInfo.address_code[2],
-        //   "district": that.data.birthaddressInfo.address_value[2]
-        // },
-        // "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
-        // "mobile": formdata.mobile + "",
-        // "contact_address": {
-        //   "province_code": that.data.contactaddressInfo.address_code[0],
-        //   "province": that.data.contactaddressInfo.address_value[0],
-        //   "city_code": that.data.contactaddressInfo.address_code[1],
-        //   "city": that.data.contactaddressInfo.address_value[1],
-        //   "district_code": that.data.contactaddressInfo.address_code[2],
-        //   "district": that.data.contactaddressInfo.address_value[2]
-        // },
-        // "contact_address_detail": formdata.contact_address_detail,
-        // "email": formdata.email,
-        // "bank": that.data.bankInfo.selected,
-        // "bank_account": formdata.bank_account,
-        // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : null,
-        // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : null,
-        // "is_employee": that.data.employeeInfo.selected,
-        // "is_specific_profession": that.data.specificIndustryInfo.selected,
-        // "is_investor": that.data.investInfo.selected,
-        // "is_business_angel": that.data.investpersonalInfo.selected,
-        // "company_equity_total": parseFloat(formdata.company_equity_total),
-        // "personal_equity_total": parseFloat(formdata.personal_equity_total),
-        // "employee_no": formdata.employee_no
       },
       header: {
         'content-type': 'application/json', // 默认值
@@ -798,40 +340,15 @@ Page({
             content: '',
           })
         }
-
+        wx.hideLoading()
       },
       fail(res) {
         console.log(res)
+        wx.hideLoading()
       }
     })
   },
-  getProfessionRequest: function() {
-    var that = this
-    var pro_index = that.data.profession_index
-
-    if (pro_index.length == 3) {
-      var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
-      console.log('profession_datas', profession_data_info)
-      return {
-        "one_level_code": profession_data_info.value,
-        "one_level_name": profession_data_info.label,
-        "two_level_code": profession_data_info.children[pro_index[1]].value,
-        "two_level_name": profession_data_info.children[pro_index[1]].label,
-        "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
-        "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
-      }
-    } else {
-      return {
-        "one_level_code": '',
-        "one_level_name": '',
-        "two_level_code": '',
-        "two_level_name": '',
-        "three_level_code": '',
-        "three_level_name": ''
-      }
-    }
-  },
   getCertifyStatus: function(formdata) {
     var iddata = this.data.idInfoData;
@@ -870,7 +387,6 @@ Page({
         genderData: gender_data
       })
     }
-
   },
   idChange: function (e) {
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @dabe494
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @dabe494
@@ -23,10 +23,10 @@
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange"></input>
+             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange"></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -34,14 +34,7 @@
         <view class='item_body'>
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
           <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15'></input>
-        </view>
-
-
-        <view class='item_body' hidden="{{!isself}}">
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_777_30' maxlength='15'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}'></input>
         </view>
         <view class="divide_line"></view>
@@ -49,7 +42,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_black_30 float_left'style='line-height: 90rpx'>年龄</text>
-            <input class='input_wrap float_right' name='age' type='number'  placeholder-class='text_777_30' placeholder='请输入年龄' maxlength='2' value='{{age}}'></input>
+            <input class='input_wrap float_right' name='age' type='number'  placeholder-class='text_777_30' placeholder='请输入年龄' maxlength='2' value='{{age}}' disabled='{{isDisable}}'></input>
           </view>
           <view class="divide_line"></view>
--- a/pages/main/taxperson/addinfo/addinfo.wxss
查看文件 @dabe494
+++ b/pages/main/taxperson/addinfo/addinfo.wxss
查看文件 @dabe494
@@ -114,4 +114,7 @@ page{
   color: #999;
   text-align: right;
   line-height: 80rpx;
+}
+input[disabled]{
+  color: #777;
 }
--- a/pages/main/taxperson/home.js
查看文件 @dabe494
+++ b/pages/main/taxperson/home.js
查看文件 @dabe494
@@ -2,7 +2,7 @@
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
-
+  self_id:null,
   /**
    * 页面的初始数据
    */
@@ -102,6 +102,7 @@ Page({
         data.items[i].newidnum = this.formatIdNum(data.items[i].id_card_no)
         if (i==0){
           data.items[i].relative = "本人"
+          this.self_id = data.items[i].id
         }else{
           data.items[i].relative = data.items[i].family_ties
         }
@@ -154,7 +155,11 @@ Page({
   },
   goedit: function(e) {
-    console.log(e)
+    if (this.self_id != e.currentTarget.id){
+      wx.navigateTo({
+        url: 'addinfo/addinfo?id=' + e.currentTarget.id,
+      })
+    }
     wx.navigateTo({
       url: 'editinfo/editinfo?id=' + e.currentTarget.id,
     })