调整工资条， 解决bug

@@ -37,9 +37,13 @@ Page({
       },
       },
       data: { 'declare_month': timestamp },
       data: { 'declare_month': timestamp },
       success: function (result) {
       success: function (result) {
-        that.setData({
-          taxDatas: that.handleTaxData(result.data.items)
-        })
+        let taxDatas = that.handleTaxData(result.data.items)
+        if (taxDatas) {
+          that.setData({
+            taxDatas: taxDatas
+          })
+        }
+        
 
 
       },
       },
       fail: function (res) {
       fail: function (res) {
@@ -83,6 +87,7 @@ Page({
 
 
   },
   },
   handleTaxData: function (items) {
   handleTaxData: function (items) {
+    if (!items) return
     for (var i = 0; i < items.length; ++i) {
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]
       var item = items[i]
       var method
       var method
@@ -189,8 +194,9 @@ Page({
 
 
    handleDetailsData: function (data) {
    handleDetailsData: function (data) {
 
 
-    var titles = JSON.parse(data['slip_titles'])  
-    var detail = JSON.parse(data['detail'])
+    let titles = JSON.parse(data['slip_titles'])  
+    let detail = JSON.parse(data['detail'])
+    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[]
     var details = []
     var details = []
     for (var i = 0; i < titles.length; ++i) {
     for (var i = 0; i < titles.length; ++i) {
       var titleData = titles[i]
       var titleData = titles[i]
@@ -200,9 +206,13 @@ Page({
         title = titleData['original_column']
         title = titleData['original_column']
       }
       }
       if (!value) {
       if (!value) {
-        value = data[titleData['key']] + ('tax_rate' == titleData['key'] ? '%' : '')
+        value = data[titleData['key']] 
+        if(value != undefined){
+          value +=  'tax_rate' == titleData['key'] ? '%' : ''
+        }
       } 
       } 
-      if (!title || value == '0') continue;
+      if (!title || !value) continue;
+      if (mapping_keys.indexOf(title) == -1 && value == '0') continue;
       details.push({
       details.push({
         title: title,
         title: title,
         value: value
         value: value

@@ -1258,22 +1258,23 @@ Page({
     //   this.showtoast('请选择涉税事由');
     //   this.showtoast('请选择涉税事由');
     //   return
     //   return
     // }
     // }
-    if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected && this.data.otherCardtypeData.isrequre) {
+    let otherTypeSel = this.data.otherCardtypeData.selected
+    let otherHasInput = formdata.other_card_number && formdata.other_card_number.length
+
+    if (this.data.hasOtherCard && !otherTypeSel && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请选择其他证照类型');
       this.showtoast('请选择其他证照类型');
       return
       return
     } 
     } 
-    if (this.data.hasOtherCard && !(formdata.other_card_number && formdata.other_card_number.length) && this.data.otherCardtypeData.isrequre) {
+    if (this.data.hasOtherCard && !otherHasInput && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请输入其他证照号码');
       this.showtoast('请输入其他证照号码');
       return
       return
-    } else if (this.data.otherCardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.other_card_number)) {
+    }
+    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput &&  !reg_18_Number.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       this.showtoast('其他证照号码有误');
       return
       return
-    } else if (this.data.otherCardtypeData.selected.indexOf('护照') > -1 && !reg_9_n_a.test(formdata.other_card_number)) {
+    }else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       this.showtoast('其他证照号码有误');
       return
       return
-    } else if (this.data.otherCardtypeData.selected.indexOf('永久居留') > -1 && !reg_15_n_a.test(formdata.other_card_number)) {
-      this.showtoast('证照号码有误');
-      return
     } 
     } 
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
       this.showtoast('请选择出生国家');
       this.showtoast('请选择出生国家');
@@ -1421,7 +1422,7 @@ Page({
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
         "id_card_no": that.data.card_number,
         "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
         "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
-        "other_id_card_no": that.data.hasOtherCard ? formdata.other_card_number : '',
+        "other_id_card_no": that.data.hasOtherCard ? (formdata.other_card_number ? formdata.other_card_number : '') : '',
         "gender": that.data.genderData.selected,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "birth_date": that.data.long_birth_date,
         "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,
         "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,