From 703629e427a70d089003dc4f7107b1e7d7166fde Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Wed, 13 Apr 2022 15:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/approval/approval.js               |  1 +
 pages/apply/approval/approval.wxml             |  8 ++++----
 pages/apply/paymentTemplate/add/add.js         | 11 ++++++++---
 pages/apply/paymentTemplate/add/add.wxml       |  4 ++--
 pages/apply/paymentTemplate/paymentTemplate.js |  2 +-
 pages/payee/index.js                           |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
index ef426ec..7553c2f 100644
--- a/pages/apply/approval/approval.js
+++ b/pages/apply/approval/approval.js
@@ -63,6 +63,7 @@ Page({
    */
   onLoad(options) {
     this.setData({itemId:options.id});
+    console.log(options)
     //this.getApprovalItemList();
     this.groupList();
     this.townList();
diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml
index 47174b4..fe77104 100644
--- a/pages/apply/approval/approval.wxml
+++ b/pages/apply/approval/approval.wxml
@@ -41,17 +41,17 @@
     <van-checkbox-group value="{{ result }}" bind:change="onChange">
       <van-row>
         <van-col span="24" >
-              <van-checkbox wx:for="{{groups}}" wx:for-item="item"  name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
+              <van-checkbox wx:for="{{groups}}" wx:for-item="item" wx:key="index"  name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="24" >
-              <van-checkbox wx:for="{{villages}}" wx:for-item="item" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
+              <van-checkbox wx:for="{{villages}}" wx:for-item="item" wx:key="index" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="24">
-              <van-checkbox wx:for="{{towns}}" wx:for-item="item" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
+              <van-checkbox wx:for="{{towns}}" wx:for-item="item"  wx:key="index" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
       </van-row>
     </van-checkbox-group>
@@ -80,7 +80,7 @@
       <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
     </view>
   </van-swipe-cell> -->
-  <van-swipe-cell right-width="{{ 65 }}" wx:for="{{templateList}}" wx:for-item="item" >
+  <van-swipe-cell right-width="{{ 65 }}" wx:for="{{templateList}}"  wx:key="index" wx:for-item="item" >
       <van-cell title="{{item.name}}" bindtap='chooseTemplate' data-id="{{item.id}}">
         <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
       </van-cell>
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index f7a7e52..1dc1967 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -602,6 +602,10 @@ Page({
   },
   goPayeeList(event){
     console.log(event);
+    if(event.currentTarget.dataset.payer == null || event.currentTarget.dataset.payer == ''){
+      UTIL.showToastNoneIcon('请先选择付款方！');
+      return;
+    }
     if(event.currentTarget.dataset.accounttype == null ){
       event.currentTarget.dataset.accounttype = ''
     }
@@ -685,9 +689,9 @@ Page({
                 formData:element,
                 success (response){
                   console.log(res);
-                  if((j+1) == that.data.form.transfers[j].length && (i+1) == that.data.form.transfers[j].fileForm[i].length && e.currentTarget.dataset.type == 0){
+                  if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
                     wx.navigateTo({
-                      url: '/pages/apply/approval/approval?id='+res.data.id,
+                      url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
                     })
                   }
                 },
@@ -709,6 +713,7 @@ Page({
   SJtakephoto(e){
     var that = this;
     let fileForm = that.data.form.transfers[e.currentTarget.dataset.index].fileForm?that.data.form.transfers[e.currentTarget.dataset.index].fileForm:[];
+    
     wx.chooseMedia({
       count: 9,
       mediaType: ['image','video'],
@@ -729,7 +734,7 @@ Page({
         console.log(fileForm);
         that.setData({
           ["form.transfers["+e.currentTarget.dataset.index+"].SJimage"]:res.tempFiles,
-          ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm
+          ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm,
         })
       }
     })
diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml
index 9967556..feafafe 100644
--- a/pages/apply/paymentTemplate/add/add.wxml
+++ b/pages/apply/paymentTemplate/add/add.wxml
@@ -186,7 +186,7 @@
       </view>
 
       <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
-        <van-field readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="goPayeeList" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
+        <van-field readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
           <view slot="label">
             姓名<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">收款方</van-tag>
           </view>
@@ -208,7 +208,7 @@
           <view class="van-cell-text">附件<van-tag type="danger" style="margin-left: 10px;">可拍照</van-tag></view>
         </view>
         <view>
-          <view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;"> {{form.transfers[index].imgcount}}张 </van-tag></view>
+          <view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;"> {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
         </view>
       </van-cell>
       <view class="fj-box">
diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js
index 3321c16..fe3dad9 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.js
+++ b/pages/apply/paymentTemplate/paymentTemplate.js
@@ -72,7 +72,7 @@ Page({
                   console.log(res);
                   if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
                     wx.navigateTo({
-                      url: '/pages/apply/approval/approval?id='+res.data.id,
+                      url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
                     })
                   }
                   if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type != 0){
diff --git a/pages/payee/index.js b/pages/payee/index.js
index 6c3a4c4..d032c0e 100644
--- a/pages/payee/index.js
+++ b/pages/payee/index.js
@@ -109,6 +109,7 @@ Page({
           let array = res.rows ; 
           for (let i = 0; i < array.length; i++) {
             array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+            console.log(that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }));
             array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
           }
           that.setData({