优化

pages/bank/add/add.wxml

@@ -19,6 +19,7 @@
     <!-- <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" readonly placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/> -->
     <van-field label="开户行" value="{{ form.bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" required  data-formname="form.bankDeposit" />
     <van-field label="联行号" value="{{ form.payeePaymentLines }}" type="number" placeholder="请输入联行号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
+    <van-field label="机构号" value="{{ form.institutionNumber }}" type="number" placeholder="请输入机构号" border="{{ false }}" bind:change="onChange" input-align="right" data-formname="form.institutionNumber"/>
   </view>
   <view class="bottom">
     <view class="btn2" bindtap="goSubmit">保存</view>

pages/bank/bank.js

@@ -66,7 +66,7 @@ Page({
             if (response.code == API.SUCCESS_CODE) {
               for (let i = 0; i < response.rows.length; i++) {
                 response.rows[i].bankTypeText = UTIL.getTransform(response.rows[i].bankType,res.data);
-                response.rows[i].payeePaymentLines = response.rows[i].payeePaymentLines.substr(0,4)+'****'
+                // response.rows[i].payeePaymentLines = response.rows[i].payeePaymentLines.substr(0,4)+'****'
               }
               that.setData({
                 depositList:response.rows

pages/bank/bank.wxml

@@ -28,7 +28,7 @@
           <image src="/image/icon/dress.png" style="width: 9px;height: 12px;margin-right: 5px;"></image>
           <text>{{item.sheng+item.shi}}</text>
         </view>
-        <view><text>联行号：{{item.payeePaymentLines}}</text></view>
+        <view><text>{{item.payeePaymentLines}}</text></view>
       </view>
   </view>
   <view slot="right" class="deleteBox">

pages/payee/add/add.js

@@ -92,52 +92,33 @@ Page({
   onReady() {
 
   },
-
+  bindKeyInput(e){
+    console.log(e.detail);
+    var that = this;
+    var str = e.detail.value;
+    var numArr = str.match(/\d+/g)
+    var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
+    if (numArr) {
+      numArr.map(rr=>{
+        if (rr.length>16) {
+          console.log(rr);
+          console.log(UTIL.isBankCard(rr));
+          const carId = UTIL.isBankCard(rr);
+          if (carId) {
+            that.setData({
+              ["form.payee"]:nameArr,
+              ["form.payeeAccount"]:rr
+            })
+          }
+        }
+      })
+    }
+  },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
     //6217002190007972186庞东旭,,,,, 山东省威海市文登区XXXXXX
-    var that = this;
-    wx.getClipboardData({
-      success (res){
-        console.log(res.data)
-        var str = res.data;
-        var numArr = str.match(/\d+/g)
-        var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
-        //直接输出
-        console.log("直接输出："+numArr)
-        console.log("直接输出："+nameArr)
-        if (numArr) {
-          numArr.map(rr=>{
-            if (rr.length>16) {
-              console.log(rr);
-              console.log(UTIL.isBankCard(rr));
-              const carId = UTIL.isBankCard(rr);
-              if (carId) {
-                wx.showModal({
-                  title: '提示',
-                  content: '检测到粘贴板中可能包含收款方及收款账号，是否自动填充？',
-                  success (res2) {
-                    if (res2.confirm) {
-                      that.setData({
-                        ["form.payee"]:nameArr,
-                        ["form.payeeAccount"]:rr
-                      })
-                      console.log('用户点击确定')
-                    } else if (res2.cancel) {
-                      console.log('用户点击取消')
-                    }
-                  }
-                })
-              }
-            }
-          })
-        }
-        
-      }
-    })
-    
   },
   back:function(){
     wx.navigateBack({

pages/payee/add/add.wxml

@@ -4,79 +4,82 @@
   <text style="top:{{isIPX?'54px':'30px'}};">{{projectId?"修改":"新增"}}收款方</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
-    <van-popup show="{{showBankType}}" round position="bottom"  bind:close="closeBox" data-name="showBankType">
-      <van-picker
-        columns="{{bankTypeOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirm"
-        data-name="showBankType"
-        data-value="form.bankType"
-      />
-    </van-popup>
-    
-    <van-field label="收款方" value="{{ form.payee }}" placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payee"/>
-    <van-field label="收款账号" value="{{ form.payeeAccount }}" placeholder="请输入收款账号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeeAccount"/>
+  <van-popup show="{{showBankType}}" round position="bottom"  bind:close="closeBox" data-name="showBankType">
+    <van-picker
+      columns="{{bankTypeOptions}}"
+      show-toolbar
+      value-key="dictLabel"
+      bind:cancel="closeBox"
+      bind:confirm="onConfirm"
+      data-name="showBankType"
+      data-value="form.bankType"
+    />
+  </van-popup>
+  
+  <van-field label="收款方" value="{{ form.payee }}" placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payee"/>
+  <van-field label="收款账号" value="{{ form.payeeAccount }}" placeholder="请输入收款账号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeeAccount"/>
 
-    <van-popup show="{{showPayeeType}}" round position="bottom"  bind:close="closeBox" data-name="showPayeeType">
-      <van-picker
-        columns="{{payeeTypeOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirm"
-        data-name="showPayeeType"
-        data-value="form.payeeType"
-      />
-    </van-popup>
-    <van-field readonly label="收款方类型" value="{{ form.payeeTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showPayeeType" />
+  <van-popup show="{{showPayeeType}}" round position="bottom"  bind:close="closeBox" data-name="showPayeeType">
+    <van-picker
+      columns="{{payeeTypeOptions}}"
+      show-toolbar
+      value-key="dictLabel"
+      bind:cancel="closeBox"
+      bind:confirm="onConfirm"
+      data-name="showPayeeType"
+      data-value="form.payeeType"
+    />
+  </van-popup>
+  <van-field readonly label="收款方类型" value="{{ form.payeeTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showPayeeType" />
 
-    <van-popup show="{{showAccountType}}" round position="bottom"  bind:close="closeBox" data-name="showAccountType">
-      <van-picker
-        columns="{{accountTypeOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirm"
-        data-name="showAccountType"
-        data-value="form.accountType"
-      />
-    </van-popup>
+  <van-popup show="{{showAccountType}}" round position="bottom"  bind:close="closeBox" data-name="showAccountType">
+    <van-picker
+      columns="{{accountTypeOptions}}"
+      show-toolbar
+      value-key="dictLabel"
+      bind:cancel="closeBox"
+      bind:confirm="onConfirm"
+      data-name="showAccountType"
+      data-value="form.accountType"
+    />
+  </van-popup>
 
-    <van-field readonly label="账户类型" value="{{ form.accountType }}" border="{{ false }}" input-align="right" required>
-      <view slot="input">
-        <van-radio-group
-          value="{{ form.accountType }}"
-          bind:change="onChange"
-          direction="horizontal"
-          data-value="form.accountType"
-        >
-          <van-radio name="1" checked-color="#2C8E68">公户</van-radio>
-          <van-radio name="2" checked-color="#2C8E68">私户</van-radio>
-        </van-radio-group>
-      </view>
-    </van-field>
+  <van-field readonly label="账户类型" value="{{ form.accountType }}" border="{{ false }}" input-align="right" required>
+    <view slot="input">
+      <van-radio-group
+        value="{{ form.accountType }}"
+        bind:change="onChange"
+        direction="horizontal"
+        data-value="form.accountType"
+      >
+        <van-radio name="1" checked-color="#2C8E68">公户</van-radio>
+        <van-radio name="2" checked-color="#2C8E68">私户</van-radio>
+      </van-radio-group>
+    </view>
+  </van-field>
 
 
-    <!-- <van-field readonly label="账户类型" value="{{ form.accountTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showAccountType"/> -->
+  <!-- <van-field readonly label="账户类型" value="{{ form.accountTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showAccountType"/> -->
 
-    <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/>
-    <van-popup show="{{showDeposit}}" round position="bottom"  bind:close="closeBox" data-name="showDeposit">
-      <van-picker
-        columns="{{depositOptions}}"
-        show-toolbar
-        value-key="bankDeposit"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirmDeposit"
-        data-name="showDeposit"
-        data-value="form.bankDeposit"
-      />
-    </van-popup>
-    <!-- openBox  -->
-    <van-field readonly label="开户行" value="{{ form.bankDeposit }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="goBank" data-name="showDeposit" />
-    <van-field label="联行号" value="{{ form.payeePaymentLines }}" placeholder="请输入" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
-  </view>
+  <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/>
+  <van-popup show="{{showDeposit}}" round position="bottom"  bind:close="closeBox" data-name="showDeposit">
+    <van-picker
+      columns="{{depositOptions}}"
+      show-toolbar
+      value-key="bankDeposit"
+      bind:cancel="closeBox"
+      bind:confirm="onConfirmDeposit"
+      data-name="showDeposit"
+      data-value="form.bankDeposit"
+    />
+  </van-popup>
+  <!-- openBox  -->
+  <van-field readonly label="开户行" value="{{ form.bankDeposit }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="goBank" data-name="showDeposit" />
+  <van-field label="联行号" value="{{ form.payeePaymentLines }}" placeholder="请输入" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
+</view>
+<view class="main-box table-box" style="margin-top:15px;">
+  <input class="weui-input" bindinput="bindKeyInput" placeholder="粘贴信息，自动拆分收款方、收款账号"/>
+</view>
   <view class="bottom">
     <view class="btn2" bindtap="goSubmit">保存</view>
   </view>

pages/payee/index.js

@@ -55,7 +55,8 @@ Page({
           var payeeType = that.data.payeeType;
           var list = [];
           array.map(res=>{
-            res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+            // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+            res.payeeAccountText = res.payeeAccount;
             res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
             if(payeeType == 2 && array.length>0){
               if(res.payeeType == 4 || res.payeeType == 3 ){
@@ -109,7 +110,8 @@ Page({
         var payeeType = that.data.payeeType;
         var list = [];
         array.map(res=>{
-          res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+          // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+          res.payeeAccountText = res.payeeAccount;
           res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
           if(payeeType == 2 && array.length>0){
             if(res.payeeType == 4 || res.payeeType == 3 ){

pages/payee/list/list.js

@@ -49,7 +49,8 @@ Page({
               let array = res.rows ; 
               var list = [];
               res.rows.map(res3=>{
-                res3.payeeAccountText = res3.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+                // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+                res3.payeeAccountText = res3.payeeAccount;
                 res3.bankTypeText = UTIL.getTransform(res3.bankType,that.data.bankTypeOptions);
                 
                 list.push(res3)
@@ -102,7 +103,8 @@ Page({
         var payeeType = that.data.payeeType;
         var list = [];
         array.map(res=>{
-          res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+          // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+          res.payeeAccountText = res.payeeAccount;
           res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
           list.push(res)
         })
@@ -138,8 +140,8 @@ Page({
           return;
         }
         array.map(res=>{
-
-          res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+          // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+          res.payeeAccountText = res.payeeAccount;
           console.log(that.data.bankTypeOptions);
           res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;