专项扣除 银行改输入

@@ -506,26 +506,26 @@ Page({
       placeholder: '中国',
       onChange: 'onPickerSelect',
     },
-    bankInfo: {
-      label: '公积金贷款银行',
-      bindtype: 'bank',
-      maxWidth: 400,
-      isrequre: true,
-      placeholder: '请选择贷款银行',
-      selected: '',
-      values: [],
-      onChange: 'onPickerSelect'
-    },
-    bankInfo_2: {
-      label: '商业贷款银行',
-      bindtype: 'bank_2',
-      maxWidth: 430,
-      isrequre: true,
-      placeholder: '请选择贷款银行',
-      selected: '',
-      values: [],
-      onChange: 'onPickerSelect'
-    },
+    // bankInfo: {
+    //   label: '公积金贷款银行',
+    //   bindtype: 'bank',
+    //   maxWidth: 400,
+    //   isrequre: true,
+    //   placeholder: '请选择贷款银行',
+    //   selected: '',
+    //   values: [],
+    //   onChange: 'onPickerSelect'
+    // },
+    // bankInfo_2: {
+    //   label: '商业贷款银行',
+    //   bindtype: 'bank_2',
+    //   maxWidth: 430,
+    //   isrequre: true,
+    //   placeholder: '请选择贷款银行',
+    //   selected: '',
+    //   values: [],
+    //   onChange: 'onPickerSelect'
+    // },
     edu_lable: "school",
     oldersupport_lable: "",
     img_path: "/images/upload_img.png"
@@ -1005,9 +1005,9 @@ Page({
             setData.loan_contract_no = data.loan_contract_no
           }
           if (data.loan_bank && data.loan_bank.length) {
-            var bank_data = this.data.bankInfo
-            bank_data.selected = data.loan_bank
-            setData.bankInfo = bank_data
+            // var bank_data = this.data.bankInfo
+            // bank_data.selected = data.loan_bank
+            setData.loan_bank = data.loan_bank
           }
           var firstpayback_Date = this.data.firstpaybackDate
           firstpayback_Date.selected = format.formatTime_date(data.loan_start)
@@ -1020,9 +1020,10 @@ Page({
             setData.sec_loan_contract_no = data.sec_loan_contract_no
           }
           if (data.sec_loan_bank && data.sec_loan_bank.length) {
-            var bank_data = this.data.bankInfo_2
-            bank_data.selected = data.sec_loan_bank
-            setData.bankInfo_2 = bank_data
+            // var bank_data = this.data.bankInfo_2
+            // bank_data.selected = data.sec_loan_bank
+            // setData.bankInfo_2 = bank_data
+            setData.sec_loan_bank = data.sec_loan_bank
           }
           var firstpaybackDate_2 = this.data.firstpaybackDate_2
           firstpaybackDate_2.selected = format.formatTime_date(data.sec_loan_start)
@@ -1217,36 +1218,36 @@ Page({
     })
   },
 
-  getbanklist: function() {
-    var that = this
-    var Authorization = app.globalData.Authorization;
-    var bank_info = that.data.bankInfo
-    var bank_info_2 = that.data.bankInfo_2
-    wx.request({
-      url: baseUrl + 'persontax/v1/bank-list',
-      method: "GET",
-      header: {
-        'content-type': 'application/json', // 默认值
-        "Authorization": Authorization
-      },
-      success: function(res) {
-        console.log(res)
-        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
-        bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
-        that.setData({
-          bankInfo: bank_info,
-          bankInfo_2: bank_info_2
-        })
-        console.log("bankInfo", that.data.bankInfo)
-      },
-      fail(res) {
-        console.log(res)
-      },
-      complete() {
-        wx.hideLoading()
-      }
-    })
-  },
+  // getbanklist: function() {
+  //   var that = this
+  //   var Authorization = app.globalData.Authorization;
+  //   var bank_info = that.data.bankInfo
+  //   var bank_info_2 = that.data.bankInfo_2
+  //   wx.request({
+  //     url: baseUrl + 'persontax/v1/bank-list',
+  //     method: "GET",
+  //     header: {
+  //       'content-type': 'application/json', // 默认值
+  //       "Authorization": Authorization
+  //     },
+  //     success: function(res) {
+  //       console.log(res)
+  //       bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
+  //       bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
+  //       that.setData({
+  //         bankInfo: bank_info,
+  //         bankInfo_2: bank_info_2
+  //       })
+  //       console.log("bankInfo", that.data.bankInfo)
+  //     },
+  //     fail(res) {
+  //       console.log(res)
+  //     },
+  //     complete() {
+  //       wx.hideLoading()
+  //     }
+  //   })
+  // },
   getCertificates: function () {
     var that = this
     var Authorization = app.globalData.Authorization;
@@ -1281,13 +1282,13 @@ Page({
       }
     })
   },
-  handleBankinfo: function(data) {
-    var bank_name = []
-    for (var i = 0; i < data.length; i++) {
-      bank_name.push(data[i].bank_name)
-    }
-    return bank_name
-  },
+  // handleBankinfo: function(data) {
+  //   var bank_name = []
+  //   for (var i = 0; i < data.length; i++) {
+  //     bank_name.push(data[i].bank_name)
+  //   }
+  //   return bank_name
+  // },
 
   formSubmit: function(e) {
     console.log("formSubmit", e);
@@ -1593,7 +1594,7 @@ Page({
             if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
               this.showToast('请填写公积金贷款合同编号')
               return
-            } else if (this.data.bankInfo.selected.length < 1) {
+            } else if (!formdata.loan_bank || formdata.loan_bank.length < 1) {
               this.showToast('请选择公积金贷款银行')
               return
             } else if (this.data.firstpaybackDate.selected.length < 1) {
@@ -1603,7 +1604,7 @@ Page({
               this.showToast('请填写公积金贷款期限')
               return
             }
-            newdata.loan_bank = this.data.bankInfo.selected
+            newdata.loan_bank = formdata.loan_bank
             newdata.loan_start = this.data.firstpaybackDate.datelong
             newdata.loan_months = parseInt(formdata.loan_months)
           } 
@@ -1611,7 +1612,7 @@ Page({
             if (!formdata.sec_loan_contract_no || formdata.sec_loan_contract_no.length < 1) {
               this.showToast('请填写商业贷款合同编号')
               return
-            } else if (this.data.bankInfo_2.selected.length < 1) {
+            } else if (!formdata.sec_loan_bank || formdata.sec_loan_bank.length < 1) {
               this.showToast('请选择商业贷款银行')
               return
             } else if (this.data.firstpaybackDate_2.selected.length < 1) {
@@ -1621,7 +1622,7 @@ Page({
               this.showToast('请填写商业贷款期限')
               return
             }
-            newdata.sec_loan_bank = this.data.bankInfo_2.selected
+            newdata.sec_loan_bank = formdata.sec_loan_bank
             newdata.sec_loan_start = this.data.firstpaybackDate_2.datelong
             newdata.sec_loan_months = parseInt(formdata.sec_loan_months)
           }
@@ -2294,20 +2295,20 @@ Page({
           this.showToast('终止日期不符合要求，无法申报')
         }
         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 'bank_2':
-        var bank_data_2 = this.data.bankInfo_2
-        bank_data_2.selected = bank_data_2.values[e.detail.value]
-        this.setData({
-          bankInfo_2: bank_data_2
-        })
-        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 'bank_2':
+      //   var bank_data_2 = this.data.bankInfo_2
+      //   bank_data_2.selected = bank_data_2.values[e.detail.value]
+      //   this.setData({
+      //     bankInfo_2: bank_data_2
+      //   })
+      //   break;
       case 'house_locate':
         console.log('house_locate', e)
         var house_address = this.data.houseLocateInfo;

@@ -235,8 +235,14 @@
         <text class='text_777_30 float_left'>公积金贷款合同编号</text>
         <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>
       </view>
+      <!-- <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...bankInfo}}" /> -->
       <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...bankInfo}}" />
+      <view style='height:90rpx'>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>公积金贷款银行</text>
+        <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>
+      </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
       <view class='divide_line_30'></view>
@@ -254,8 +260,14 @@
         <text class='text_777_30 float_left'>商业贷款合同编号</text>
         <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>
       </view>
+      <!-- <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...bankInfo_2}}" /> -->
       <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...bankInfo_2}}" />
+      <view style='height:90rpx'>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>商业贷款银行</text>
+        <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>
+      </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate_2}}" />
       <view class='divide_line_30'></view>