优化

pages/apply/approval/approval.js

@@ -52,10 +52,13 @@ Page({
             }
           })
 
-          array.splice(indexList,1)
+          
 
           console.log(array);
           array.map((rrr,index)=>{
+            if(rrr.nickName == res2.user.nickName){
+              array.splice(indexList,1)
+            }
             rrr.name = index+1
           })
           this.setData({
@@ -251,18 +254,22 @@ Page({
               if (res.code == API.SUCCESS_CODE) {
                 let list = [];
                 console.log(res);
-                let index ;
+                let indexList ;
                 for (let i = 0; i < res.data.length; i++) {
                   const element = res.data[i];
                   if(element.nickName == res2.user.nickName){
                     // res.data.splice(i,1);
-                    index = i ;
+                    indexList = i ;
                   }else{
                     list.push(element.userId+"")
                   }
                 }
-                res.data.splice(index,1)
                 res.data.map((rrr,index)=>{
+                  
+                  if(rrr.nickName == res2.user.nickName){
+                    
+                    res.data.splice(indexList,1)
+                  }
                   rrr.name = index+1
                 })
                 console.log(list);

pages/apply/paymentTemplate/add/add.wxml

@@ -223,14 +223,14 @@
         </view>
 
         <text class="title">收款方信息</text>
-        <view bindtap="uploadFile">
+        <!-- <view bindtap="uploadFile">
           <image src="/image/apply/icon_exel.png" style="width: 25px;height: 25px;"></image>
           <text>批量上传</text>
         </view>
         <view bindtap="downLoad">
           <image src="/image/apply/icon_exel.png" style="width: 25px;height: 25px;"></image>
           <text>模板下载</text>
-        </view>
+        </view> -->
         <view class="center-box">
           <block wx:if="{{form.transfers[index].transferType == 12}}">
             <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">

pages/apply/paymentTemplate/add/add.wxss

@@ -67,7 +67,6 @@ text{display: block;}
 }
 .topBox .van-cell .van-cell__title, .topBox .van-cell .van-cell__value , .topBox .van-cell .van-field__label{
   font-size: 15px;
-  color: #000000!important;
 }
 .topBox .van-cell .van-cell__title{
   margin-right: 0!important;

pages/drawee/drawee.js

@@ -15,6 +15,7 @@ Page({
     accountListXJ:[],
     showDialog:false,
     projectId:'',
+    bankName:'',
     beforeClose(action) {
       return new Promise((resolve) => {
         setTimeout(() => {
@@ -233,7 +234,12 @@ swichPaymentApply:function(e){
   },
   showDialog(e){
     var that = this ;
-    that.setData({showDialog:true,projectId:e.currentTarget.dataset.id})
+    that.setData({
+      showDialog:true,
+      projectId:e.currentTarget.dataset.id,
+      bankName:e.currentTarget.dataset.name,
+      id: '' ,
+      password: '',})
   },
   //支付口令修改
   edit(e){
@@ -262,8 +268,6 @@ swichPaymentApply:function(e){
           })
           that.setData({
             showDialog : false,
-            id: '' ,
-            accountPassword: '',
           })
         }else if(res.code == "403"){
           wx.showToast({
@@ -271,6 +275,9 @@ swichPaymentApply:function(e){
             icon: 'error',
             duration: 2000
           })
+          that.setData({
+            showDialog : false,
+          })
         }else{
           wx.showToast({
             title: "系统错误",

pages/drawee/drawee.wxml

@@ -28,7 +28,7 @@
           <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">
             {{item.balance}}
             
-            <image src="/image/icon/icon_zfkl.png" data-id="{{item.id}}" data-index="{{index}}" bindtap="showDialog" style="width: 20px;height: 20px;vertical-align: middle;position: absolute;right: calc(2vh + 30px);z-index: 10;"></image>
+            <image src="/image/icon/icon_zfkl.png" data-id="{{item.id}}" data-index="{{index}}" data-name="{{item.accountName}}" bindtap="showDialog" style="width: 20px;height: 20px;vertical-align: middle;position: absolute;right: calc(2vh + 30px);z-index: 10;"></image>
 
             <image src="/image/apply/update.png" data-id="{{item.id}}" data-index="{{index}}" bindtap="updateMoney" style="width: 20px;height: 20px;vertical-align: middle;position: absolute;right: 2vh;z-index: 10;"></image>
           </view> 
@@ -105,7 +105,8 @@
   before-close="{{beforeClose }}"
   closeOnClickOverlay="{{ true }}"
 >
-  <input class="input_tit" placeholder="请输入新的口令" style="width: 90%;margin: 0 auto;margin-top: 25px;margin-bottom: 10px;text-align: center;border: 1px solid #ddd;height: 35px;line-height: 35px;" value="{{form.approvalItemTemplate.templateName}}" password bindinput="bindNameInput"/> 
+  <text style="display: block;text-align: center;color: #2C8E68;margin-top: 10px;">{{bankName}}</text>
+  <input class="input_tit" placeholder="请输入新的口令" style="width: 90%;margin: 0 auto;margin-top: 25px;margin-bottom: 10px;text-align: center;border: 1px solid #ddd;height: 35px;line-height: 35px;" value="{{password}}" password bindinput="bindNameInput"/> 
   <text style="width: 90%;margin: 0 auto;margin-top: 15px;margin-bottom: 10px;font-size: 12px;display: block;color: red;text-align: center;">提示：\n此口令为银农直联平台支付人员权限的验证！\n至少6个字符，必须包括字母、数字和符号</text>
 </van-dialog>
 <view class="ipXbtn"></view>

pages/payee/add/add.js

@@ -162,14 +162,9 @@ Page({
       title: '正在保存',
       mask:true
     })
-    if(that.data.form.bankType == ''){
-      wx.hideLoading();
-      UTIL.showToastNoneIcon('请选择所属银行！');
-      return;
-    }
     if(that.data.form.payee == ''){
       wx.hideLoading();
-      UTIL.showToastNoneIcon('请填写户名！');
+      UTIL.showToastNoneIcon('请填写收款方！');
       return;
     }
     if(that.data.form.payeeAccount == ''){
@@ -187,6 +182,11 @@ Page({
       UTIL.showToastNoneIcon('请选择账户类型！');
       return;
     }
+    if(that.data.form.bankType == ''){
+      wx.hideLoading();
+      UTIL.showToastNoneIcon('请选择所属银行！');
+      return;
+    }
     if(that.data.form.bankDeposit == ''){
       wx.hideLoading();
       UTIL.showToastNoneIcon('请选择开户行！');