优化切图

app.json

@@ -16,7 +16,11 @@
     "pages/apply/paymentTemplate/add/add",
     "pages/payee/index",
     "pages/payee/add/add",
-    "component/pop-up/index"
+    "component/pop-up/index",
+    "pages/Bookkeeping/Bookkeeping",
+    "pages/payee/list/list",
+    "pages/drawee/drawee",
+    "pages/drawee/add/add"
   ],
   "window": {
     "backgroundTextStyle": "light",

app.wxss

@@ -58,7 +58,7 @@ contact-button {
 .ns image{
   position: absolute;
   left: 3%;
-  width: 10px;
+  width: 20px;
   z-index: 9;
 }
 .ns text{

pages/Bookkeeping/Bookkeeping.js

@@ -0,0 +1,85 @@
+// pages/Bookkeeping/Bookkeeping.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+    result:['1'],
+    result2:['1'],
+    showGroup:true
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+  onChange(event) {
+    this.setData({result:event.detail})
+  },
+  onChange2(event) {
+    this.setData({result2:event.detail})
+  },
+  switchTab(e){
+    this.setData({showGroup:e.currentTarget.dataset.gid})
+  },
+  back:function(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/Bookkeeping/Bookkeeping.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+  }
+}

pages/Bookkeeping/Bookkeeping.wxml

@@ -0,0 +1,218 @@
+<!--pages/Bookkeeping/Bookkeeping.wxml-->
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <text style="top:{{isIPX?'54px':'30px'}};">记账申请</text>
+</view>
+<view class="work_plan" style="margin-top:{{isIPX?'88px':'65px'}};">
+    <view class="menu_item {{showGroup?'active':''}} " bindtap="switchTab" data-gid='{{true}}'>收入事项<text class="remind">4</text></view>
+    <view class="menu_item {{!showGroup?'active':''}} " bindtap="switchTab" data-gid='{{false}}'>支出事项<text class="remind">5</text></view>
+</view>
+<van-checkbox-group wx:if="{{showGroup}}" value="{{ result }}" bind:change="onChange">
+  <view class="li">
+    <van-checkbox name="1"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">2021年联合社鱼塘承包款</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          经营收入
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件3</text>
+        <text class="time">2021-5-26</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥6533.60</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="2"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">张旺财农机租赁款</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          经营收入
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件8</text>
+        <text class="time">2022-6-6</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥7823.00</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="3"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">库存小麦销售收入款</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          经营收入
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件6</text>
+        <text class="time">2022-2-16</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥1245.86</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="4"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">仓库3月份租金</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          经营收入
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件2</text>
+        <text class="time">2022-4-24</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥4968.38</text>
+      </view>
+    </van-checkbox>
+  </view>
+</van-checkbox-group>
+
+
+<van-checkbox-group wx:if="{{!showGroup}}" value="{{ result2 }}" bind:change="onChange2">
+  <view class="li">
+    <van-checkbox name="1"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">联合社购买电脑费用</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          现金支出
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件9</text>
+        <text class="time">2021-1-26</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥1358.70</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="2"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">2季度办公用品报销款</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          电子支出
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件1</text>
+        <text class="time">2021-5-30</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥2368.89</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="3"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">3月份办公会工作餐费用</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          现金支出
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件10</text>
+        <text class="time">2021-2-15</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥5698.00</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="4"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">购入化肥款</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          现金支出
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件12</text>
+        <text class="time">2021-7-26</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥4238.96</text>
+      </view>
+    </van-checkbox>
+  </view>
+  <view class="li">
+    <van-checkbox name="5"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+      <view style="width: 40%;">
+        <text class="tit">村东水田槙保费用</text>
+        <view class="fksr">
+          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+          公务卡支出
+        </view>
+      </view>
+      <view>
+        <text class="fj_name">附件15</text>
+        <text class="time">2021-12-19</text>
+      </view>
+      <view>
+        <view class="wtj">
+          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+          未提交
+        </view>
+        <text class="money">￥9883.00</text>
+      </view>
+    </van-checkbox>
+  </view>
+</van-checkbox-group>
+<view class="ipXbtn"></view>
+<view class="ipXbtn"></view>
+<view class="bottom">
+  <view class="btn2" bindtap="goSubmit">提交记账</view>
+</view>

pages/Bookkeeping/Bookkeeping.wxss

@@ -0,0 +1,168 @@
+/* pages/Bookkeeping/Bookkeeping.wxss */
+text{display: block;}
+.work_plan{
+  padding: 40rpx 32.5rpx 30rpx;
+  display: flex;
+}
+
+.work_plan  .menu_item{
+  background-color: #fff;
+  box-shadow: 2px 5px 5px #ddd;
+  border-radius: 60rpx;
+  text-align: center;
+  font-size: 16px;
+  position: relative;
+  margin-right: 20px;
+  padding: 8px 20px;
+}
+.work_plan  .menu_item.active{
+  background-color: #2C8E68;
+  color: #fff;
+}
+.work_plan .menu_item .remind{
+  height: 30rpx;
+  background: #e90101;
+  color: #fff;
+  font-size: 26rpx;
+  position: absolute;
+  line-height: 30rpx;
+  padding:0 10rpx;
+  border-radius: 25px;
+  top: -10rpx;
+  right: -10rpx;
+}
+
+.work_plan .more{
+  flex: 1;
+  text-align: center;
+  line-height: 60rpx;
+  font-size: 36rpx;
+  color: #31936c;
+}
+.workflow{
+  padding: 10rpx 32.5rpx;
+}
+.workflow .workflow_list{
+  height: 150rpx;
+  background-color: #fff;
+  border-radius: 24rpx;
+  box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1);
+  margin-bottom: 20rpx;
+  padding:15rpx 25rpx 10rpx 35rpx;
+}
+.workflow .workflow_list .process_intro{
+  display: flex;
+  height: 62rpx;
+  align-items: center; 
+}
+
+.workflow .process_intro .name{
+  width: 390rpx;
+  font-size: 34rpx;
+  margin-right: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+  width: 290rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.li{
+  display: flex;
+  justify-content: space-between;
+  width: 94%;
+  margin: 0 auto;
+  background: #fff;
+  padding: 14px;
+  border-radius: 10px;
+  box-shadow: 2px 5px 5px #ddd;
+  margin-bottom: 15px;
+}
+.li view text{
+  margin-top: 15px;
+}
+.li view text:nth-child(1){
+  margin-top: 0px;
+}
+.li .fksr{
+  display: flex;
+  align-items: center;
+  margin-top: 15px;
+  color: #2C8E68;
+  font-size: 16px;
+}
+.li .wtj{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 3px 8px;
+  background-color: rgba(233, 0, 0,0.1);
+  border-radius: 5px;
+  color: #444444;
+  font-size: 14px;
+}
+.li .tit{
+  font-size: 18px;
+  color: #444444;
+  line-height: 25px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+  overflow: hidden;
+}
+.li .fj_name{
+  font-size: 14px;
+  color: #B3DB62;
+  line-height: 25px;
+}
+.li .time{
+  font-size: 14px;
+  color: #9B9CAA;
+}
+.li .money{
+  font-size: 18px;
+  color: #5CAE77;
+}
+.van-checkbox__label {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.van-checkbox__icon-wrap {
+  border-radius: 5px;
+}
+.van-checkbox__icon {
+  border-radius: 5px;
+  border: 2px solid #2C8E68!important;
+  background-color: rgba(44, 142, 104, 0.2);
+}
+.bottom{
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  padding: 15px 0;
+  display: flex;
+  position: fixed;
+  bottom: 0%;
+  background: #fff;
+  box-shadow: 0 0 5px #ddd;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 10px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  color: #fff;
+}

pages/apply/index.js

@@ -50,7 +50,33 @@ swichPaymentApply:function(e){
   },
   goTemplate:function(e){
     wx.navigateTo({
-      url: 'paymentTemplate/paymentTemplate?id='+e.currentTarget.dataset.id
+      url: 'paymentTemplate/add/add?id='+e.currentTarget.dataset.id+'&type=template'
+    })
+  },
+
+  updateMoney:function(e){
+    UTIL.showLoadingHaveMask('正在查询');
+    UTIL.httpRequest(API.URL_GET_GETBALANCEENQUIRY+e.currentTarget.dataset.id, {method:'GET'}, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          this.setData({
+            ["accountList["+e.currentTarget.dataset.index+"].balance"]:res.msg
+          })
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询成功',
+            icon: 'success',
+            duration: 2000,
+          })
+        }else{
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询失败',
+            icon: 'error',
+            duration: 2000,
+          })
+        }
+      }
     })
   },
 
@@ -116,10 +142,37 @@ swichPaymentApply:function(e){
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
           that.data.approvalItemsOptions.splice(e.currentTarget.dataset.index, 1); 
+          wx.showToast({
+            title: '删除成功！',
+            icon: 'success',
+            duration: 2000
+          })
           that.setData({
             approvalItemsOptions : that.data.approvalItemsOptions
           })
-          UTIL.showToastNoneIcon('删除成功！');
+        }
+      }
+    })
+  },
+  getMr(e){
+    var that = this;
+    UTIL.httpRequest(API.URL_GET_GETSETDEFAULTVALUES + e.currentTarget.dataset.id, {method:'GET'},{
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          UTIL.httpRequest(API.URL_GET_APPROVALITEMSLIST, {method:'GET',dataType:'1'}, {
+            success: (res) => {
+              if (res.code == API.SUCCESS_CODE) {
+                wx.showToast({
+                  title: '设置成功！',
+                  icon: 'success',
+                  duration: 2000
+                })
+                that.setData({
+                  approvalItemsOptions : res.rows
+                })
+              }
+            }
+          })
         }
       }
     })

pages/apply/index.wxml

@@ -14,19 +14,19 @@
   <van-tabs sticky color="#000">
     <van-tab title="银行账户">
       <view class="bank_box" wx:for="{{accountList}}" wx:key="index">
-        <text class="zt">一般户</text>
+        <text class="zt">{{item.bankUseType == 1 ?'基本户':'一般户'}}</text>
         <image src="../../image/apply/bgt.png" style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
-        <view class="bank_content {{item.bankType == 1 ? 'ICBC':item.bankType == 2 ? 'RCB':item.bankType == 3 ? 'ABC':item.bankType == 4 ? 'CCB':''}}">
+        <view class="bank_content {{item.bankType == 1 ? 'ICBC':item.bankType == 2||item.bankType == 5 ? 'RCB':item.bankType == 3 ? 'ABC':item.bankType == 4 ? 'CCB':''}}">
           <view class="bankName">
-            <image src="../../image/apply/{{item.bankType == 1 ? 'ICBC':item.bankType == 2 ? 'RCB':item.bankType == 3 ? 'ABC':item.bankType == 4 ? 'CCB':''}}.png" style="width: 25px"  mode="widthFix"></image>
-            <text>{{item.bankType == 1 ? '中国银行':item.bankType == 2 ? '农商行（山东省）':item.bankType == 3 ? '农业银行':item.bankType == 4 ? '建设银行':''}}</text>
+            <image src="../../image/apply/{{item.bankType == 1 ? 'ICBC':item.bankType == 2||item.bankType == 5 ? 'RCB':item.bankType == 3 ? 'ABC':item.bankType == 4 ? 'CCB':''}}.png" style="width: 25px"  mode="widthFix"></image>
+            <text>{{item.bankType == 1 ? '中国银行':item.bankType == 2||item.bankType == 5 ? '农商行（山东省）':item.bankType == 3 ? '农业银行':item.bankType == 4 ? '建设银行':''}}</text>
           </view>
           
           <view style="margin-top: 2vh;">{{item.bankAccountNumber}}<text>卡号</text></view> 
           <view>可用余额</view> 
           <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">
             {{item.balance}}
-            <image src="/image/apply/update.png" style="width: 20px;height: 20px;vertical-align: middle;float: right;"></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> 
         </view>
       </view>
@@ -56,19 +56,27 @@
 </view>
 <view class="ipXbtn"></view>
 <van-action-sheet show="{{show}}" title="支付模板" bind:close="closeBox">
-  <van-swipe-cell right-width="{{ 65 }}" wx:for="{{approvalItemsOptions}}" wx:key="index">
+  <van-swipe-cell right-width="{{ 130 }}" wx:for="{{approvalItemsOptions}}" wx:key="index">
     <van-cell-group>
       <van-cell label="{{item.approvalItems}}" bindtap="goTemplate" data-id="{{item.id}}"  >
         <view slot="title">
-          <view class="van-cell-text">{{item.templateName}}<van-tag plain type="danger" color="#FC9A55" style="margin-left:10px;" wx:if="{{index == 0}}">默认</van-tag></view>
+          <view class="van-cell-text">{{item.templateName}}<van-tag plain type="danger" color="#FC9A55" style="margin-left:10px;" wx:if="{{index == 0}}"><image src="/image/apply/icon_mr.png" style="width: 12px;height: 12px;margin-right: 2px;"></image>默认</van-tag></view>
         </view>
         <van-icon wx:if="{{index == 0}}" slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mrmb.png?sign=5e5df640777f6a7993c45e1a559dd998&t=1648619865" class="custom-icon" size="40" style="margin-right: 10px;" />
         <van-icon wx:else 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>
     </van-cell-group>
-    <view slot="right" class="deleteBox" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
-      <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+    <view slot="right" class="deleteBox">
+
+      <view style="flex: 1;height: 100%;display: flex;align-items: center;border-right: 1px solid #eee;">
+        <image src="../../image/apply/button_mr.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="getMr"></image>
+      </view>
+
+      <view style="flex: 1;height: 100%;display: flex;align-items: center;">
+        <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
+      </view>
+
     </view>
   </van-swipe-cell>
   <van-empty wx:if="{{approvalItemsOptions.length == 0}}" description="暂无支付模板" />
-</van-action-sheet>
+</van-action-sheet>

pages/apply/index.wxss

@@ -144,7 +144,7 @@
 }
 
 .deleteBox{
-  width: 65px;
+  width: 130px;
   text-align: center;
   height: 100%;
   background: #F6F6F6;

pages/apply/paymentTemplate/add/add.js

@@ -58,6 +58,7 @@ Page({
         capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
         succeedAmount:'',//成功支付金额
         payer:'',//付款方
+        paymentPattern:'1',
         payerAccount:'',//付款方账户
         bankType:'',//所属银行
         bankTypeText:'',//所属银行（展示用）
@@ -74,13 +75,13 @@ Page({
         bankPriority:'',//银行处理优先级
         clientPriority:'',//客户处理优先级
         transferType:'1',//付款方式
-        transferTypeText:'村账户转账',//付款方式（展示用）
+        transferTypeText:'垫付报销：电子支付',//付款方式（展示用）
         requiredTransferTime:'',//要求转账时间
         remark:'',//付款事由
         startTime:'',//开票日期
         endTime:'',//到期日期
         orderType:'',//汇票类型
-        bankAccountType:'',//账户类别1 公户2私户
+        bankAccountType:'2',//账户类别1 公户2私户
         villageAccountType:'',//账户分类
         payeeList:[{//收款方账户集合
           payeeId:'0',//收款方id
@@ -134,6 +135,9 @@ Page({
             if (res.code == API.SUCCESS_CODE) {
               console.log(that.data.capitalExpenditureTypeOptions);
               if(res.data.approvalItemTemplate == null){return;}
+
+              if(options.type == "template"){res.data.approvalItemTemplate.id=""}
+
               res.data.transfers.forEach( (item,index) => {
 
                 that.setData({
@@ -142,7 +146,7 @@ Page({
 
                 res.data.transfers[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
 
-                res.data.transfers[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
+                res.data.transfers[index].transferTypeText = UTIL.getTransform(item.paymentPattern,that.data.transferTypeOptions);
 
                 res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
 
@@ -199,31 +203,23 @@ Page({
                     
                     res.data.forEach((item2,index2)=>{
                       
-                      wx.downloadFile({
-                        url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                        success (response) {
-                          if (response.statusCode === 200) {
-                            let fileForm = item.fileForm?item.fileForm:[];
-                            fileForm.push({
-                              file: response.tempFilePath,
-                              fileType:'1',
-                              bizPath:'transfer',
-                              tableName:'t_yinnong_transfer',
-                              tableId:''
-                            })
-                            console.log("--------------fileForm2 start----------------");
-                            console.log(fileForm);
-                            console.log("--------------fileForm2 end----------------");
-                            list.push({
-                              tempFilePath:response.tempFilePath
-                            })
-                            that.setData({
-                              ["form.transfers["+index+"].SJimage"]:list,
-                              ["form.transfers["+index+"].fileForm"]:fileForm
-                            });
-                          }
-                        }
+                      let fileForm = item.fileForm?item.fileForm:[];
+                      fileForm.push({
+                        file: URL_PREFIX+item2.fileUrl,
+                        fileType:'1',
+                        bizPath:'transfer',
+                        tableName:'t_yinnong_transfer',
+                        tableId:''
+                      })
+                      list.push({
+                        tempFilePath:URL_PREFIX+item2.fileUrl,
+                        id:item2.id
                       })
+                      that.setData({
+                        ["form.transfers["+index+"].SJimage"]:list,
+                        ["form.transfers["+index+"].fileForm"]:fileForm
+                      });
+
                     })
                     
                   }
@@ -241,28 +237,22 @@ Page({
                   success: (res) => {
                     let list = [];
                     res.data.forEach((item2,index2)=>{
-                      wx.downloadFile({
-                        url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                        success (response) {
-                          if (response.statusCode === 200) {
-                            let fileForm = item.fileForm?item.fileForm:[];
-                            fileForm.push({
-                              file: response.tempFilePath,
-                              fileType:'2',
-                              bizPath:'transfer',
-                              tableName:'t_yinnong_transfer',
-                              tableId:item.id
-                            })
-                            list.push({
-                              tempFilePath:response.tempFilePath
-                            })
-                            that.setData({
-                              ["form.transfers["+index+"].FPimage"]:list,
-                              ["form.transfers["+index+"].fileForm"]:fileForm
-                            });
-                          }
-                        }
+                      let fileForm = item.fileForm?item.fileForm:[];
+                      fileForm.push({
+                        file: URL_PREFIX+item2.fileUrl,
+                        fileType:'2',
+                        bizPath:'transfer',
+                        tableName:'t_yinnong_transfer',
+                        tableId:item.id
+                      })
+                      list.push({
+                        tempFilePath:URL_PREFIX+item2.fileUrl,
+                        id:item2.id
                       })
+                      that.setData({
+                        ["form.transfers["+index+"].FPimage"]:list,
+                        ["form.transfers["+index+"].fileForm"]:fileForm
+                      });
                     })
                   }
                 })
@@ -278,203 +268,36 @@ Page({
                   {
                   success: (res) => {
                     let list = [];
-                    let fileForm = item.fileForm?item.fileForm:[];
                     res.data.forEach((item2,index2)=>{
-                      wx.downloadFile({
-                        url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                        success (response) {
-                          if (response.statusCode === 200) {
-                            let fileForm = item.fileForm?item.fileForm:[];
-                            fileForm.push({
-                              file: response.tempFilePath,
-                              fileType:'3',
-                              bizPath:'transfer',
-                              tableName:'t_yinnong_transfer',
-                              tableId:item.id
-                            })
-                            list.push({
-                              tempFilePath:response.tempFilePath
-                            })
-                            that.setData({
-                              ["form.transfers["+index+"].QTimage"]:list,
-                              ["form.transfers["+index+"].fileForm"]:fileForm
-                            });
-                          }
-                        }
-                      })
-                    })
-                  }
-                })
-              })
-              that.setData({
-                form:res.data,
-                activeNames:null
-              })
-              UTIL.hideLoadingHaveMask();
-            }
-          }
-        })
-      },1000)
-    }else if(options.type  == 'update'&!options.id){
-      console.log(options);
-      setTimeout(function(){
-        let array = JSON.parse(options.array);
-        array.transfers.forEach( (item,index) => {
-          item.capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
-          item.transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
-  
-          item.bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
-  
-          item.payeeList.forEach( (response,i) => {
-            item.payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
-          })
-          if(item.capitalExpenditureType == 2){
-            let prames = {
-              outId:item.id,
-              ynType: item.transferType=='1'||item.transferType=='2'||item.transferType=='4'?'1':'2'
-            }
-            // 工程项目查询
-            UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
-              success: (res) => {
-                res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
-                array.transfers[index].projectForm = res.data;
-              }
-            })
-          }
-          
-
-          //收据附件
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:item.id,
-              fileType:1
-            }, 
-            {
-            success: (res) => {
-              
-              let list = [];
-              
-              res.data.forEach((item2,index2)=>{
-                
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
-                      let fileForm = item.fileForm?item.fileForm:[];
-                      fileForm.push({
-                        file: response.tempFilePath,
-                        fileType:'1',
-                        bizPath:'transfer',
-                        tableName:'t_yinnong_transfer',
-                        tableId:''
-                      })
-                      console.log("--------------fileForm2 start----------------");
-                      console.log(fileForm);
-                      console.log("--------------fileForm2 end----------------");
-                      list.push({
-                        tempFilePath:response.tempFilePath
-                      })
-                      that.setData({
-                        ["form.transfers["+index+"].SJimage"]:list,
-                        ["form.transfers["+index+"].fileForm"]:fileForm
-                      });
-                    }
-                  }
-                })
-              })
-              
-            }
-          })
-          //发票
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:item.id,
-              fileType:2
-            }, 
-            {
-            success: (res) => {
-              let list = [];
-              res.data.forEach((item2,index2)=>{
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
-                      let fileForm = item.fileForm?item.fileForm:[];
-                      fileForm.push({
-                        file: response.tempFilePath,
-                        fileType:'2',
-                        bizPath:'transfer',
-                        tableName:'t_yinnong_transfer',
-                        tableId:item.id
-                      })
-                      list.push({
-                        tempFilePath:response.tempFilePath
-                      })
-                      that.setData({
-                        ["form.transfers["+index+"].FPimage"]:list,
-                        ["form.transfers["+index+"].fileForm"]:fileForm
-                      });
-                    }
-                  }
-                })
-              })
-            }
-          })
-          //其他
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:item.id,
-              fileType:3
-            }, 
-            {
-            success: (res) => {
-              let list = [];
-              let fileForm = item.fileForm?item.fileForm:[];
-              res.data.forEach((item2,index2)=>{
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
                       let fileForm = item.fileForm?item.fileForm:[];
                       fileForm.push({
-                        file: response.tempFilePath,
+                        file: URL_PREFIX+item2.fileUrl,
                         fileType:'3',
                         bizPath:'transfer',
                         tableName:'t_yinnong_transfer',
                         tableId:item.id
                       })
                       list.push({
-                        tempFilePath:response.tempFilePath
+                        tempFilePath:URL_PREFIX+item2.fileUrl,
+                        id:item2.id
                       })
                       that.setData({
                         ["form.transfers["+index+"].QTimage"]:list,
                         ["form.transfers["+index+"].fileForm"]:fileForm
                       });
-                    }
+                    })
                   }
                 })
               })
+              that.setData({
+                form:res.data,
+                activeNames:null
+              })
+              UTIL.hideLoadingHaveMask();
             }
-          })
-        })
-        that.setData({
-          form : array,
-          isUpdate : true 
+          }
         })
-        if(options.add == "add"){
-          that.addList();
-        }
       },1000)
-      
     }else{
       //村账户查询参数
       var perames = {
@@ -497,6 +320,168 @@ Page({
           }
         })
     }
+
+    // else if(options.type  == 'update'&!options.id){
+    //   console.log(options);
+    //   setTimeout(function(){
+    //     let array = JSON.parse(options.array);
+    //     array.transfers.forEach( (item,index) => {
+    //       item.capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
+    //       item.transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
+  
+    //       item.bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
+  
+    //       item.payeeList.forEach( (response,i) => {
+    //         item.payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
+    //       })
+    //       if(item.capitalExpenditureType == 2){
+    //         let prames = {
+    //           outId:item.id,
+    //           ynType: item.transferType=='1'||item.transferType=='2'||item.transferType=='4'?'1':'2'
+    //         }
+    //         // 工程项目查询
+    //         UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+    //           success: (res) => {
+    //             res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+    //             array.transfers[index].projectForm = res.data;
+    //           }
+    //         })
+    //       }
+          
+
+    //       //收据附件
+    //       UTIL.httpRequest(
+    //         API.URL_GET_FINDLIST, 
+    //         {
+    //           method:'GET',
+    //           tableName:'t_yinnong_transfer',
+    //           tableId:item.id,
+    //           fileType:1
+    //         }, 
+    //         {
+    //         success: (res) => {
+              
+    //           let list = [];
+              
+    //           res.data.forEach((item2,index2)=>{
+                
+    //             wx.downloadFile({
+    //               url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+    //               success (response) {
+    //                 if (response.statusCode === 200) {
+    //                   let fileForm = item.fileForm?item.fileForm:[];
+    //                   fileForm.push({
+    //                     file: response.tempFilePath,
+    //                     fileType:'1',
+    //                     bizPath:'transfer',
+    //                     tableName:'t_yinnong_transfer',
+    //                     tableId:''
+    //                   })
+    //                   console.log("--------------fileForm2 start----------------");
+    //                   console.log(fileForm);
+    //                   console.log("--------------fileForm2 end----------------");
+    //                   list.push({
+    //                     tempFilePath:response.tempFilePath
+    //                   })
+    //                   that.setData({
+    //                     ["form.transfers["+index+"].SJimage"]:list,
+    //                     ["form.transfers["+index+"].fileForm"]:fileForm
+    //                   });
+    //                 }
+    //               }
+    //             })
+    //           })
+              
+    //         }
+    //       })
+    //       //发票
+    //       UTIL.httpRequest(
+    //         API.URL_GET_FINDLIST, 
+    //         {
+    //           method:'GET',
+    //           tableName:'t_yinnong_transfer',
+    //           tableId:item.id,
+    //           fileType:2
+    //         }, 
+    //         {
+    //         success: (res) => {
+    //           let list = [];
+    //           res.data.forEach((item2,index2)=>{
+    //             wx.downloadFile({
+    //               url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+    //               success (response) {
+    //                 if (response.statusCode === 200) {
+    //                   let fileForm = item.fileForm?item.fileForm:[];
+    //                   fileForm.push({
+    //                     file: response.tempFilePath,
+    //                     fileType:'2',
+    //                     bizPath:'transfer',
+    //                     tableName:'t_yinnong_transfer',
+    //                     tableId:item.id
+    //                   })
+    //                   list.push({
+    //                     tempFilePath:response.tempFilePath
+    //                   })
+    //                   that.setData({
+    //                     ["form.transfers["+index+"].FPimage"]:list,
+    //                     ["form.transfers["+index+"].fileForm"]:fileForm
+    //                   });
+    //                 }
+    //               }
+    //             })
+    //           })
+    //         }
+    //       })
+    //       //其他
+    //       UTIL.httpRequest(
+    //         API.URL_GET_FINDLIST, 
+    //         {
+    //           method:'GET',
+    //           tableName:'t_yinnong_transfer',
+    //           tableId:item.id,
+    //           fileType:3
+    //         }, 
+    //         {
+    //         success: (res) => {
+    //           let list = [];
+    //           let fileForm = item.fileForm?item.fileForm:[];
+    //           res.data.forEach((item2,index2)=>{
+    //             wx.downloadFile({
+    //               url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+    //               success (response) {
+    //                 if (response.statusCode === 200) {
+    //                   let fileForm = item.fileForm?item.fileForm:[];
+    //                   fileForm.push({
+    //                     file: response.tempFilePath,
+    //                     fileType:'3',
+    //                     bizPath:'transfer',
+    //                     tableName:'t_yinnong_transfer',
+    //                     tableId:item.id
+    //                   })
+    //                   list.push({
+    //                     tempFilePath:response.tempFilePath
+    //                   })
+    //                   that.setData({
+    //                     ["form.transfers["+index+"].QTimage"]:list,
+    //                     ["form.transfers["+index+"].fileForm"]:fileForm
+    //                   });
+    //                 }
+    //               }
+    //             })
+    //           })
+    //         }
+    //       })
+    //     })
+    //     that.setData({
+    //       form : array,
+    //       isUpdate : true 
+    //     })
+    //     if(options.add == "add"){
+    //       that.addList();
+    //     }
+    //   },1000)
+      
+    // }
   },
   onChangeBox(event) {
     console.log(event);
@@ -515,7 +500,6 @@ Page({
    */
   onShow() {
     var that = this;
-
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
@@ -546,7 +530,15 @@ Page({
       }
     })
     // 付款方式类型字典查询 
-    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, {
+    // UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, {
+    //   success: (res) => {
+    //     that.setData({
+    //       transferTypeOptions:res.data,
+    //     })
+    //   }
+    // })
+    // 付款方式类型字典查询 （2.0）
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_pay_type', {method:'GET'}, {
       success: (res) => {
         that.setData({
           transferTypeOptions:res.data,
@@ -633,10 +625,18 @@ Page({
       [event.currentTarget.dataset.value+'.payerAccount']: '',
       [event.currentTarget.dataset.value+'.bankTypeText']: '',
       [event.currentTarget.dataset.value+'.bankType']: '',
-      [event.currentTarget.dataset.value+'.bankAccountType']: '',  
+      [event.currentTarget.dataset.value+'.bankAccountType']: '2',  
       [event.currentTarget.dataset.value+'.isPeers']: '',  
+      [event.currentTarget.dataset.value+'.paymentPattern']: event.detail.value.dictValue,  
       balance:0,
     });
+    console.log(event.detail.value.dictValue);
+
+    if(event.detail.value.dictValue == 1 || event.detail.value.dictValue == 2 || event.detail.value.dictValue == 4 || event.detail.value.dictValue == 6 || event.detail.value.dictValue == 7 ){event.detail.value.dictValue = 1 ;}
+    else if(event.detail.value.dictValue == 3){event.detail.value.dictValue = 2 ;}
+    else if(event.detail.value.dictValue == 5){event.detail.value.dictValue = 12 ;}
+    else if(event.detail.value.dictValue == 8){event.detail.value.dictValue = 11 ;}
+
     if(event.detail.value.dictValue == 1){//村账户查询参数
       perames = {
         pageNum:1,
@@ -757,7 +757,7 @@ Page({
     });
   },
   goPayeeList(event){
-    console.log(event);
+    console.log(event.currentTarget.dataset.transfertype)
     if(event.currentTarget.dataset.payer == null || event.currentTarget.dataset.payer == ''){
       UTIL.showToastNoneIcon('请先选择付款方！');
       return;
@@ -765,8 +765,9 @@ Page({
     if(event.currentTarget.dataset.accounttype == null ){
       event.currentTarget.dataset.accounttype = ''
     }
+    // '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index+'&money='+this.data.form.transfers
     wx.navigateTo({
-      url: '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index+'&money='+this.data.form.transfers[event.currentTarget.dataset.index].expenditureAmount,
+      url: '/pages/payee/index?transferType='+event.currentTarget.dataset.transfertype+'&money='+this.data.form.transfers[event.currentTarget.dataset.index].expenditureAmount + '&index='+event.currentTarget.dataset.index,
     })
   },
   onChange(event){
@@ -861,7 +862,6 @@ Page({
       })
       return;
     }
-
     for (let i = 0; i < list.transfers.length; i++) {
       const element = list.transfers[i];
       if(element.applyDate == ''){
@@ -896,9 +896,6 @@ Page({
         return;
       }
     }
-
-
-
     if(e.currentTarget.dataset.type == 1){
       if(that.data.form.approvalItemTemplate.templateName == ''){
         UTIL.showToastNoneIcon('请输入模板名称！');
@@ -913,7 +910,6 @@ Page({
     }
     that.data.form.method = 'POST';
     that.data.form.approvalItemTemplate.dataType = e.currentTarget.dataset.type;
-    
     UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
@@ -941,7 +937,6 @@ Page({
                 }
               })
             }
-
             if(that.data.form.transfers[j].fileForm == undefined){continue;}
             for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
               that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id
@@ -966,9 +961,6 @@ Page({
               })
             }
           }
-
-          
-
           if(e.currentTarget.dataset.type == 0){
             wx.navigateTo({
               url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
@@ -979,14 +971,10 @@ Page({
               title: '保存成功',
               icon: 'success',
               duration: 2000,
-              complete(){
-                setTimeout(function(){
-                  that.back();
-                },2000)
-              }
             })
           }
           if(e.currentTarget.dataset.type == 1){
+            console.log("aaa");
             wx.showToast({
               title: '保存成功',
               icon: 'success',
@@ -1028,8 +1016,9 @@ Page({
     })
   },
   bindKeyInput(even){
+    console.log(even);
     this.setData({
-      ["form.approvalItemTemplate.approvalItems"]: even.detail.value,
+      ["form.approvalItemTemplate.approvalItems"]: even.detail,
     })
   },
   errorPd(e){
@@ -1078,9 +1067,9 @@ Page({
           ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm,
         })
         
-        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
-        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
-        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
         let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
         that.setData({
           ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
@@ -1108,14 +1097,23 @@ Page({
             tableId:''
           })
         })
-        console.log(fileForm);
+
+        let tem = that.data.form.transfers[e.currentTarget.dataset.index].FPimage;
+
+        res.tempFiles.forEach(r=>{
+          tem.push({
+            tempFilePath:r.tempFilePath
+          })
+        })
+        
+        console.log(tem);
         that.setData({
-          ["form.transfers["+e.currentTarget.dataset.index+"].FPimage"]:res.tempFiles,
+          ["form.transfers["+e.currentTarget.dataset.index+"].FPimage"]:tem,
           ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm
         })
-        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
-        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
-        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
         let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
         that.setData({
           ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
@@ -1148,9 +1146,9 @@ Page({
           ["form.transfers["+e.currentTarget.dataset.index+"].QTimage"]:res.tempFiles,
           ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm
         })
-        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
-        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
-        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+        let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+        let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+        let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage == undefined ? 0:that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
         let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
         that.setData({
           ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
@@ -1185,18 +1183,18 @@ Page({
       FPimage:[],
       QTimage:[],
       showTitle:true,
-      capitalExpenditureType:'',//资金支出类别
-      capitalExpenditureTypeText:'',//资金支出类别（展示用）
+      capitalExpenditureType:'1',//资金支出类别
+      capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
       succeedAmount:'',//成功支付金额
       payer:'',//付款方
       payerAccount:'',//付款方账户
       bankType:'',//所属银行
       bankTypeText:'',//所属银行（展示用）
-      isPeers:'',//是否同行
+      isPeers:'N',//是否同行
       operatorCode:'',//操作员代码
       enterpriseCode:'',//企业编码
       expenditureAmount:'',//支出总金额
-      applyDate:UTIL.formatDate(that.data.applyDate),//申请时间
+      applyDate:that.data.applyDate,//申请时间
       transferStatus:'',//转账状态
       auditStatus:'0',//审批状态
       paymentState:'',//支付状态
@@ -1204,14 +1202,15 @@ Page({
       paymentTime:'',//支付时间
       bankPriority:'',//银行处理优先级
       clientPriority:'',//客户处理优先级
-      transferType:'',//付款方式
-      transferTypeText:'',//付款方式（展示用）
+      paymentPattern:'1',
+      transferType:'1',//付款方式
+      transferTypeText:'垫付报销：电子支付',//付款方式（展示用）
       requiredTransferTime:'',//要求转账时间
       remark:'',//付款事由
       startTime:'',//开票日期
       endTime:'',//到期日期
       orderType:'',//汇票类型
-      bankAccountType:'',//账户类别1 公户2私户
+      bankAccountType:'2',//账户类别1 公户2私户
       villageAccountType:'',//账户分类
       payeeList:[{//收款方账户集合
         payeeId:'0',//收款方id
@@ -1238,6 +1237,26 @@ Page({
         totalAmount:'',
       },
     });
+    //村账户查询参数
+    var perames = {
+      pageNum:1,
+      pageSize:999,
+      accountType:'102',
+      method:'post',
+      params: {
+          "townAccountType":"0"
+      }
+    }
+    // 付款方列表
+    UTIL.httpRequest(API.URL_GET_SELECTACCOUNTLIST , perames, {
+      success: (res) => {
+        that.setData({
+          accountOptions:res.rows,
+          ["form.transfers[0].applyDate"]: UTIL.formatDate(new Date()),
+          applyDate: UTIL.formatDate(new Date()),
+        })
+      }
+    })
     this.setData({
       ["form.transfers"] : transList,
       activeNames:transList.length-1
@@ -1317,6 +1336,24 @@ Page({
       ["form.transfers["+e.detail+"].showTitle"]:false
     })
   },
+  deleteimg(e){
+    console.log(e);
+    let options = e.currentTarget.dataset.options;
+
+    options.splice(e.currentTarget.dataset.index,1);
+    this.setData({
+      [e.currentTarget.dataset.name]:options
+    })
+    UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+e.currentTarget.dataset.id , {method:'GET'}, {
+      success: (res) => {
+        wx.showToast({
+          title: '删除成功！',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/apply/paymentTemplate/add/add.wxml

@@ -70,11 +70,29 @@
           <!-- <van-field label="申请流水号" value="{{ form.approvalItemTemplate.telephone }}" placeholder="请输入申请流水号" border="{{ false }}" bind:change="onChange" input-align="right"/> -->
           
 
-          <van-field required label="支出金额" focus="{{form.transfers[index].expenditureAmountTirme}}" error="{{form.transfers[index].expenditureAmountTirme}}" type="digit" value="{{ form.transfers[index].expenditureAmount }}" placeholder="请输入支出金额" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bind:change="onChangeMoney" bind:blur="errorJE"/>
+          <van-field required label="支出金额" type="digit" focus="{{form.transfers[index].expenditureAmountTirme}}" error="{{form.transfers[index].expenditureAmountTirme}}" type="digit" value="{{ form.transfers[index].expenditureAmount }}" placeholder="请输入支出金额" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bind:change="onChangeMoney" bind:blur="errorJE"/>
+
+          
 
           <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
 
           <van-field required label="支出原因" focus="{{form.transfers[index].remarkTirme}}" error="{{form.transfers[index].remarkTirme}}" value="{{  form.transfers[index].remark }}" placeholder="请输入支出原因" border="{{ false }}" bind:change="onChange" input-align="right" data-formname="form.transfers[{{index}}].remark" data-value="form.transfers[{{index}}].remark" bind:blur="errorYY"/>
+          
+
+          <van-popup show="{{form.transfers[index].showTransferType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showTransferType">
+            <van-picker
+              columns="{{transferTypeOptions}}"
+              show-toolbar
+              value-key="dictLabel"
+              bind:cancel="closeBox"
+              bind:confirm="onConfirmaTransfer"
+              data-name="form.transfers[{{index}}].showTransferType"
+              data-value="form.transfers[{{index}}]"
+            />
+          </van-popup>
+
+          <van-field required label="支付方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请选择支付方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showTransferType"/>
+
           <van-popup show="{{form.transfers[index].showCapitalExpenditureType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showCapitalExpenditureType">
             <van-picker
               columns="{{capitalExpenditureTypeOptions}}"
@@ -86,7 +104,7 @@
               data-value="form.transfers[{{index}}].capitalExpenditureType"
             />
           </van-popup>
-          <van-field required label="资金支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择资金支出类别" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showCapitalExpenditureType"/>
+          <van-field required label="支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择支出类别" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showCapitalExpenditureType"/>
         </view>
         <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
           <text class="title">关联项目</text>
@@ -147,7 +165,7 @@
 
         <text class="title">付款方信息</text>
         <view class="main-box table-box">
-          <van-popup show="{{form.transfers[index].showTransferType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showTransferType">
+          <!-- <van-popup show="{{form.transfers[index].showTransferType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showTransferType">
             <van-picker
               columns="{{transferTypeOptions}}"
               show-toolbar
@@ -158,7 +176,7 @@
               data-value="form.transfers[{{index}}]"
             />
           </van-popup>
-          <van-field required label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showTransferType"/>
+          <van-field required label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showTransferType"/> -->
 
           <van-popup show="{{form.transfers[index].showAccount}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showAccount">
             <van-picker
@@ -173,7 +191,7 @@
           </van-popup>
           <van-field required wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showAccount">
             <view slot="label">
-              付款方<van-tag plain type="danger" color="red" round style="margin-left:10px;">必填</van-tag>
+              付款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
             </view>
           </van-field>
 
@@ -199,7 +217,7 @@
             <van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
           </block>
           <block wx:else>
-            <van-field required readonly label="付款方账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field required readonly label="付款账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
             <van-field required readonly label="所属银行" value="{{ form.transfers[index].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right"/>
           </block>
 
@@ -238,12 +256,12 @@
           </view> -->
 
           <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
-            <van-field required 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 }}">
+            <van-field required 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>
+                收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
               </view>
             </van-field>
-            <van-field required readonly label="收款账户" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field required readonly label="收款账号" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
             <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
             <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
 
@@ -269,8 +287,13 @@
                 <text>收\n据</text>
               </view>
               <view class="img_box">
-                <image wx:for="{{form.transfers[index].SJimage}}" src="{{item.tempFilePath}}" wx:key="index" data-option="{{form.transfers[index].SJimage}}" data-index="{{index}}" bindtap="openPreview"></image>
-                <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="SJtakephoto"></image>
+                <view class="img_list" wx:for="{{form.transfers[index].SJimage}}" wx:for-index="childrenIndex" wx:key="id">
+                  <image class="img_li" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].SJimage}}" data-index="{{childrenIndex}}" bindtap="openPreview"></image>
+                  <van-icon name="/image/apply/img_delete.png" size="20px" data-index="{{childrenIndex}}" data-name="form.transfers[{{index}}].SJimage" data-options="{{form.transfers[index].SJimage}}" data-id="{{item.id}}" bindtap="deleteimg" />
+                </view>
+                <view class="img_list">
+                  <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="SJtakephoto"></image>
+                </view>
               </view>
             </view>
             <view class="fj-li">
@@ -278,8 +301,14 @@
                 <text>发\n票</text>
               </view>
               <view class="img_box">
-                <image wx:for="{{form.transfers[index].FPimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].FPimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
-                <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="FPtakephoto"></image>
+
+                <view class="img_list" wx:for="{{form.transfers[index].FPimage}}" wx:for-index="childrenIndex" wx:key="id">
+                  <image class="img_li" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].FPimage}}" data-index="{{childrenIndex}}" bindtap="openPreview"></image>
+                  <van-icon name="/image/apply/img_delete.png" size="20px" data-index="{{childrenIndex}}" data-name="form.transfers[{{index}}].FPimage" data-options="{{form.transfers[index].FPimage}}" data-id="{{item.id}}" bindtap="deleteimg" />
+                </view>
+                <view class="img_list">
+                  <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="FPtakephoto"></image>
+                </view>
               </view>
             </view>
             <view class="fj-li">
@@ -287,8 +316,13 @@
                 <text>其\n他</text>
               </view>
               <view class="img_box">
-                <image wx:for="{{form.transfers[index].QTimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].QTimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
-                <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="QTtakephoto"></image>
+                <view class="img_list" wx:for="{{form.transfers[index].QTimage}}" wx:for-index="childrenIndex" wx:key="id">
+                  <image class="img_li" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].QTimage}}" data-index="{{childrenIndex}}" bindtap="openPreview" ></image>
+                  <van-icon name="/image/apply/img_delete.png" size="20px" data-index="{{childrenIndex}}" data-name="form.transfers[{{index}}].QTimage" data-options="{{form.transfers[index].QTimage}}" data-id="{{item.id}}" bindtap="deleteimg" />
+                </view>
+                <view class="img_list">
+                  <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="QTtakephoto"></image>
+                </view>
               </view>
             </view>
           </view>

pages/apply/paymentTemplate/add/add.wxss

@@ -138,14 +138,15 @@ text{display: block;}
   display: flex;
   /* flex-wrap: wrap; */
 }
-.fj-li image{
-  width: 25%;
+.fj-li .img_li{
+  width: 100%;
   height: 18.5vw;
-  margin-left: 5%;
 }
-.fj-li image:nth-child(n+5){
-  margin-top: 15px;
+
+.fj-li .img_add{
+  overflow: hidden;
 }
+
 .bottomBtn{
   display: flex;
   width: 94%;
@@ -357,6 +358,23 @@ text{display: block;}
   .img_box{
     position: relative;
     width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .img_box .img_list{
+    width: 25%;
+    margin-left: 5%;
+    position: relative;
+  }
+  .img_box .img_list .van-icon{
+    font-size: 20px;
+    position: absolute;
+    top: 0;
+    right: 0;
+    transform: translate(50%,-50%);
+  }
+  .img_box .img_list:nth-child(n+4){
+    margin-top: 15px;
   }
   .van-cell--required:before {
     left: -8px!important;

pages/drawee/add/add.js

@@ -0,0 +1,227 @@
+// pages/payee/add/add.js
+import * as UTIL from '../../../utils/util.js';
+import * as API from '../../../utils/API.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+    form:{
+      payee:'',
+      payeeAccount:'',
+      bankType:'',
+      bankDeposit:'',
+      accountType:'2',
+      payeeType:'1',
+      payeeTypeText:'收款方',
+      payeePaymentLines:'',
+      status:'0',
+    },
+    showBankType:false,
+    showAccountType:false,
+    bankTypeOptions:[],
+    bankTypeText:'',
+    accountTypeOptions:[],
+    payeeTypeOptions:[],
+    accountTypeText:'',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    var that = this;
+    // 所属银行字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+      success: (res) => {
+        // let array = res.data.filter(function (e) { return e.dictValue == event.detail.value.bankType; });
+        this.setData({
+          bankTypeOptions:res.data
+        });
+      }
+    })
+    // 付款方式类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'account_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          accountTypeOptions:res.data,
+        })
+      }
+    })
+    // 付款方式类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'payee_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          payeeTypeOptions:res.data,
+        })
+      }
+    })
+    
+  },
+  back:function(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  openBox(even){
+    console.log(even);
+    var that = this ;
+    if(even.currentTarget.dataset.name == "showDeposit"){
+      if(that.data.form.bankType == ''){
+        UTIL.showToastNoneIcon('请先选择所属银行！');
+        that.setData({
+          [even.currentTarget.dataset.name]:false,
+        })
+        return;
+      }
+    }
+    this.setData({
+      [even.currentTarget.dataset.name]:true
+    })
+  },
+  onConfirm(even){
+    console.log(even);
+    var that = this ;
+    if(even.currentTarget.dataset.name == "showBankType"){
+      // 付款方式类型字典查询 
+      UTIL.httpRequest(API.URL_GET_DEPOSITLIST, {method:'GET',bankType:even.detail.value.dictValue,status:'0'}, {
+        success: (res) => {
+          that.setData({
+            depositOptions:res.rows,
+          })
+        }
+      })
+    }
+    this.setData({
+      [even.currentTarget.dataset.value]:even.detail.value.dictValue,
+      [even.currentTarget.dataset.value+"Text"]:even.detail.value.dictLabel,
+      [even.currentTarget.dataset.name]:false,
+    })
+  },
+  onConfirmDeposit(even){
+    console.log(even);
+    this.setData({
+      [even.currentTarget.dataset.value]:even.detail.value.id,
+      [even.currentTarget.dataset.value+"Text"]:even.detail.value.bankDeposit,
+      [even.currentTarget.dataset.name]:false,
+      ["form.payeePaymentLines"]:even.detail.value.payeePaymentLines
+    })
+  },
+  closeBox(even){
+    console.log(even.currentTarget.dataset.name);
+    this.setData({
+      [even.currentTarget.dataset.name]:false
+    })
+  },
+  goSubmit(){
+    console.log(this.data.form);
+    var that = this;
+
+    if(that.data.form.bankType == ''){
+      UTIL.showToastNoneIcon('请选择所属银行！');
+      return;
+    }
+    if(that.data.form.payee == ''){
+      UTIL.showToastNoneIcon('请填写户名！');
+      return;
+    }
+    if(that.data.form.payeeAccount == ''){
+      UTIL.showToastNoneIcon('请填写收款账号！');
+      return;
+    }
+    if(that.data.form.payeeType == ''){
+      UTIL.showToastNoneIcon('请选择收款人类型！');
+      return;
+    }
+    if(that.data.form.accountType == ''){
+      UTIL.showToastNoneIcon('请选择账户类型！');
+      return;
+    }
+    if(that.data.form.bankDeposit == ''){
+      UTIL.showToastNoneIcon('请选择开户行！');
+      return;
+    }
+    if(that.data.form.payeePaymentLines == ''){
+      UTIL.showToastNoneIcon('请输入联行号！');
+      return;
+    }
+
+
+    that.setData({
+      ['form.method']:'POST'
+    })
+    UTIL.httpRequest(API.URL_GET_PAYEEADD, that.data.form, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+
+          let pages = getCurrentPages();
+          let currentPage = null;   //当前页面
+          let prevPage = null;  //上一个页面
+          currentPage = pages[pages.length - 1]; //获取当前页面，将其赋值
+          prevPage = pages[pages.length - 2]; //获取上一个页面，将其赋值
+          prevPage.onLoad(prevPage.options)
+          wx.navigateBack({
+            delta:1
+          })
+        }
+      }
+    })
+  },
+  onChange(even){
+    console.log(even);
+    this.setData({
+      [even.currentTarget.dataset.formname]:even.detail
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/drawee/add/add.json

@@ -0,0 +1,19 @@
+{
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-steps": "@vant/weapp/steps/index",
+    "van-button": "@vant/weapp/button/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-calendar": "@vant/weapp/calendar/index"
+  }
+}

pages/drawee/add/add.wxml

@@ -0,0 +1,80 @@
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <text style="top:{{isIPX?'54px':'30px'}};">新增付款方</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="{{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-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.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>
+    <van-field readonly label="开户行" value="{{ form.bankDepositText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" 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="bottom">
+    <view class="btn2" bindtap="goSubmit">确认</view>
+  </view>

pages/drawee/add/add.wxss

@@ -0,0 +1,59 @@
+/* pages/payee/add/add.wxss */
+.main-box{
+  background: #ffffff;
+  padding: 20px;
+  width: 94%;
+  margin: 0 auto;
+  border-radius: 10px;
+  box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+}
+.table-box van-field van-cell .van-cell{
+  margin-bottom: 15px;
+}
+.table-box van-field:last-child van-cell .van-cell{
+  margin-bottom: 0px;
+}
+.van-cell{
+  padding: 0!important;
+  margin-bottom: 15px;
+}
+.van-cell__value {
+  display: flex;
+  justify-content: flex-end;
+}
+.van-radio--horizontal {
+  margin-right: 0!important;
+  margin-left: var(--padding-sm,12px)
+}
+.van-cell--required:before {
+  left: 0!important;
+}
+
+.van-field__label {
+  padding-left: 10px;
+}
+
+.bottom{
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  margin-top: 30px;
+  margin-bottom: 30px;
+  display: flex;
+  position: absolute;
+  bottom: 10%;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 8px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  color: #fff;
+}

pages/drawee/drawee.js

@@ -0,0 +1,240 @@
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+    show:false,
+    accountList:[],
+    approvalItemsOptions:[],
+    bookName:'',
+    accountListXJ:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+   //跳转支出申请
+swichPaymentApply:function(e){
+  console.log(e.currentTarget.dataset.current);
+  // let cur = e.currentTarget.dataset.current;
+  // if (this.data.currentTaB == cur) {
+  // return false;
+  // }else{
+  //   wx.navigateTo({
+  //     url: '../inCome/index?id=' + id,
+  //     })
+  // }
+  wx.navigateTo({
+    url: '/pages/apply/paymentTemplate/add/add',
+    })
+  },
+  openBox:function(){
+    var that = this ;
+    that.setData({
+      show: true,
+    })
+  },
+  closeBox:function(){
+    var that = this ;
+    that.setData({
+      show: false,
+    })
+  },
+  goTemplate:function(e){
+    wx.navigateTo({
+      url: 'paymentTemplate/add/add?id='+e.currentTarget.dataset.id+'&type=template'
+    })
+  },
+
+  updateMoney:function(e){
+    UTIL.showLoadingHaveMask('正在查询');
+    UTIL.httpRequest(API.URL_GET_GETBALANCEENQUIRY+e.currentTarget.dataset.id, {method:'GET'}, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          this.setData({
+            ["accountList["+e.currentTarget.dataset.index+"].balance"]:res.msg
+          })
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询成功',
+            icon: 'success',
+            duration: 2000,
+          })
+        }else{
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询失败',
+            icon: 'error',
+            duration: 2000,
+          })
+        }
+      }
+    })
+  },
+
+  back:function(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var that = this;
+    var sendData = {
+      pageNum:'1',
+      pageSize:'100',
+      accountName:'',
+      bankAccountNumber:'',
+      status:'N',
+      method:'GET',
+      accountType:102
+    }
+    var sendData2 = {
+      pageNum:'1',
+      pageSize:'100',
+      accountName:'',
+      bankAccountNumber:'',
+      status:'N',
+      method:'GET',
+      accountType:101
+    }
+    UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          this.setData({bookName:res.user.bookName})
+        }
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_APPROVALITEMSLIST, {method:'GET',dataType:'1'}, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          that.setData({
+            approvalItemsOptions : res.rows
+          })
+        }
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{
+      success: (res) => {
+        for (let i = 0; i < res.rows.length; i++) {
+          if(res.rows[i].bankAccountNumber==null){continue;}
+          res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
+        }
+        console.log(res.rows)
+        that.setData({
+          accountList:res.rows
+        })
+      }
+    })
+
+    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{
+      success: (res) => {
+        for (let i = 0; i < res.rows.length; i++) {
+          if(res.rows[i].bankAccountNumber==null){continue;}
+          res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
+        }
+        console.log(res.rows)
+        that.setData({
+          accountListXJ:res.rows
+        })
+      }
+    })
+  },
+  delete(e){
+    console.log(e);
+    var that = this;
+    UTIL.httpRequest(API.URL_GET_REMOVEAPPROVAL + e.currentTarget.dataset.id, {method:'GET'},{
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          that.data.approvalItemsOptions.splice(e.currentTarget.dataset.index, 1); 
+          wx.showToast({
+            title: '删除成功！',
+            icon: 'success',
+            duration: 2000
+          })
+          that.setData({
+            approvalItemsOptions : that.data.approvalItemsOptions
+          })
+        }
+      }
+    })
+  },
+  getMr(e){
+    var that = this;
+    UTIL.httpRequest(API.URL_GET_GETSETDEFAULTVALUES + e.currentTarget.dataset.id, {method:'GET'},{
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          UTIL.httpRequest(API.URL_GET_APPROVALITEMSLIST, {method:'GET',dataType:'1'}, {
+            success: (res) => {
+              if (res.code == API.SUCCESS_CODE) {
+                wx.showToast({
+                  title: '设置成功！',
+                  icon: 'success',
+                  duration: 2000
+                })
+                that.setData({
+                  approvalItemsOptions : res.rows
+                })
+              }
+            }
+          })
+        }
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+  navigate(even){
+    wx.navigateTo({
+      url: even.currentTarget.dataset.url,
+    })
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/drawee/drawee.json

@@ -0,0 +1,13 @@
+{
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "van-empty": "@vant/weapp/empty/index"
+  }
+}

pages/drawee/drawee.wxml

@@ -0,0 +1,101 @@
+<!--pages/drawee/drawee.wxml-->
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
+</view>
+<!-- 付款单位开始 -->
+<view class="top" style="margin-top:{{isIPX?'100px':'75px'}};">
+  <image src="../../image/apply/dress_icon.png" mode="widthFix"></image>
+  <view class="top-tit">付款单位</view>
+  <view class="top-title">{{bookName}}</view>
+</view>
+
+<view class="main">
+  <van-tabs sticky color="#000" animated>
+    <van-tab title="银行账户">
+      <view class="bank_box" wx:for="{{accountList}}" wx:key="index">
+        <text class="zt">{{item.bankUseType == 1 ?'基本户':'一般户'}}</text>
+        <image src="../../image/apply/bgt.png" style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
+        <view class="bank_content {{item.bankType == 1||iOf.indexOf(item.subjectNameAll,'中国银行') ? 'ICBC':item.bankType == 2||iOf.indexOf(item.subjectNameAll,'农商行') ? 'RCB':item.bankType == 3||iOf.indexOf(item.subjectNameAll,'农业银行') ? 'ABC':item.bankType == 4||iOf.indexOf(item.subjectNameAll,'建设银行') ? 'CCB':''}}">
+          <view class="bankName">
+            <image src="../../image/apply/{{item.bankType == 1||iOf.indexOf(item.subjectNameAll,'中国银行') ? 'ICBC':item.bankType == 2||iOf.indexOf(item.subjectNameAll,'农商行') ? 'RCB':item.bankType == 3||iOf.indexOf(item.subjectNameAll,'农业银行') ? 'ABC':item.bankType == 4||iOf.indexOf(item.subjectNameAll,'建设银行') ? 'CCB':''}}.png" style="width: 25px"  mode="widthFix"></image>
+            <text>{{item.accountName}}</text>
+          </view>
+          
+          <view style="margin-top: 2vh;">{{item.bankAccountNumber}}<text>卡号</text></view> 
+          <view>可用余额</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">
+            {{item.balance}}
+            <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> 
+        </view>
+      </view>
+      <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" />
+      <view class="addBtn" data-url="/pages/drawee/add/add" bindtap="navigate">
+        <image src="/image/icon/icon_add.png"></image>
+        <text>添加银行账户</text>
+      </view>
+    </van-tab>
+
+    <van-tab title="现金账户">
+    
+      <view class="bank_box" wx:for="{{accountListXJ}}" wx:key="index">
+        <view class="bank_content XJ">
+          <view class="bankName">
+            <image src="../../image/apply/XJ.png" style="width: 25px"  mode="widthFix"></image>
+            <text>{{item.accountName}}</text>
+          </view>
+          
+          <view style="margin-top: 2vh;">{{item.bankAccountNumber}}<text>科目</text></view> 
+          <view>可用余额</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">
+            {{item.balance}}
+            <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> 
+        </view>
+      </view>
+
+      <view class="addBtn">
+        <image src="/image/icon/icon_add.png"></image>
+        <text>添加现金账户</text>
+      </view>
+
+      <van-empty wx:if="{{accountList.length == 0}}" description="暂无现金账户" />
+      
+      <!-- <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" /> -->
+    </van-tab>
+
+    <van-tab title="公务卡">
+    
+      <view class="bank_box">
+        <view class="bank_content gwk">
+          <view class="bankName">
+            <image src="../../image/apply/icon_GWK.png" style="width: 25px"  mode="widthFix"></image>
+            <text>公务卡</text>
+          </view>
+          <view style="margin-bottom: 2vh;">6217 0021 9000 7972 186<text>卡号</text></view> 
+          <view>可用余额</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">10,288.83</view> 
+        </view>
+        <view class="holder">持有人：王强</view>
+      </view>
+      
+      <!-- <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" /> -->
+
+      <view class="addBtn">
+        <image src="/image/icon/icon_add.png"></image>
+        <text>添加公务卡</text>
+      </view>
+
+    </van-tab>
+  </van-tabs>
+</view>
+
+<view class="ipXbtn"></view>
+
+<wxs module="iOf">
+  var indexOf = function(name,value){
+    return name.indexOf(value)>0;
+  }
+  module.exports.indexOf = indexOf;
+</wxs>

pages/drawee/drawee.wxss

@@ -0,0 +1,186 @@
+/* pages/drawee/drawee.wxss */
+.top{
+  display: flex;
+  width: 94%;
+  margin: 0 auto;
+  background-color: #ffffff;
+  border-radius: 10px;
+  margin-top: 3vw;
+  overflow: hidden;
+}
+.top view{
+  padding: 18px 15px;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.top image{
+  position: absolute;
+  width: 94%;
+}
+.top-title{
+  flex: 1;
+  text-align: center;
+}
+.top-tit{
+  color: #fff;
+}
+.main{
+  width: 100%;
+  margin: 0 auto;
+  margin-top: 3vw;
+}
+
+.van-tabs__nav {
+  background-color: #F4F4F4;
+}
+
+.bank_content{
+  color: #fff;
+  width: 100%;
+  padding: 2vh;
+}
+
+.XJ{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_XJ.png') no-repeat center;
+  background-size: 100% 100%;
+}
+
+.ICBC{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.ABC{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.CCB{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.RCB{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.gwk{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center;
+  background-size: 100% 100%;
+}
+
+.bankName{
+  margin-top: 0!important;
+  display: flex;
+  align-items: center;
+}
+.bankName image{
+  vertical-align: middle;
+  margin-right: 5px;
+}
+.bankName text{
+  margin: 0!important;
+  display: inline-block;
+}
+.bank_content view{
+  margin-top: 1vh;
+}
+
+.bank_content view text{
+ font-size: 14px;
+ margin-left: 10vw;
+}
+
+.bank_box{
+  position: relative;
+  box-shadow: 0px 5px 9px #ccc;
+  overflow: hidden;
+  border-radius: 15px;
+  width: 94%;
+  margin: 0 auto;
+  margin-bottom: 20px;
+}
+.bank_box:first-child{
+  margin-top: 20px;
+}
+.zt {
+  font-size: 14px;
+  position: absolute;
+  top: 10px;
+  transform: rotate(45deg);
+  right: 0px;
+  color: #FFF;
+  z-index: 10;
+}
+
+.holder{
+  padding: 10px 25px ;
+  background-color: rgba(255,255,255,0.6);
+  color: #333333;
+  font-size: 16px;
+  border-top-left-radius: 30px;
+  border-bottom-left-radius: 30px;
+  position:absolute;
+  bottom:20%;
+  right:0;
+}
+
+.bottom{
+  width: 84%;
+  margin: 0 auto;
+  text-align: center;
+  margin-top: 30px;
+  margin-bottom: 30px;
+  display: flex;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn1{
+  border: 1px solid #2C8E68;
+  padding: 8px 0px;
+  color: #2C8E68;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 8px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  margin-left: 6%;
+  color: #fff;
+}
+
+.deleteBox{
+  width: 130px;
+  text-align: center;
+  height: 100%;
+  background: #F6F6F6;
+  align-items: center;
+  display: flex;
+}
+.van-action-sheet__header {
+  background: #f2f2f2;
+  color: #2C8E68;
+}
+.addBtn{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px dashed #5CAE77;
+  background: rgba(92, 174, 119, 0.1);
+  width: 94%;
+  padding: 10px 0;
+  border-radius: 10px;
+  margin: 0 auto;
+}
+.addBtn text{
+  color: #2C8E68;
+  margin-left: 10px;
+}
+.addBtn image{
+  width: 22.09px;
+  height: 22.09px;
+}

pages/handle/expenditureAudit/expenditureAudit.js

@@ -16,8 +16,10 @@ Page({
     isIPX: app.globalData.isIPX,
     active:0,
     spsxOptions:[],
+    paymentPatternOptions:[],
     nickName:app.globalData.user,
-    comment:''
+    comment:'',
+    activeNames: 0,
   },
 
   /**
@@ -84,6 +86,14 @@ Page({
         })
       }
     })
+    // 支付方式
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_pay_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          paymentPatternOptions:res.data,
+        })
+      }
+    })
     // 获取合同信息列表
     UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, {
       success: (res) => {
@@ -103,6 +113,11 @@ Page({
 
             res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
 
+            res.data.transfers[index].paymentPatternText = UTIL.getTransform(item.paymentPattern,that.data.paymentPatternOptions);
+
+            res.data.transfers[index].num = UTIL.convertToChinaNum(index+1),
+            
+            res.data.transfers[index].showTitle = false;
             res.data.transfers[index].payeeList.forEach( (response,i) => {
               res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
             })
@@ -192,7 +207,8 @@ Page({
             })
           })
           that.setData({
-            form:res.data
+            form:res.data,
+            activeNames:null
           })
         }
       }
@@ -305,6 +321,46 @@ Page({
       comment:e.detail.value
     })
   },
+  onChangeBox(event) {
+    console.log(event);
+    this.setData({
+      activeNames: event.detail,
+    });
+  },
+  onCloseSecond(e){
+    var that = this ;
+    console.log(e);
+    that.setData({
+      ["form.transfers["+e.detail+"].showTitle"]:false
+    })
+  },
+  onOpen(e){
+    var that = this ;
+    console.log(that.data.activeNames);
+    console.log(e);
+    for (let i = 0; i < this.data.form.transfers.length; i++) {
+      const element = this.data.form.transfers[i];
+      this.setData({
+        ["form.transfers["+i+"].showTitle"] : false,
+      })
+    }
+    that.setData({
+      ["form.transfers["+e.detail+"].showTitle"]:true
+    })
+  },
+  openPreview(e){
+    let array = [];
+    console.log(e);
+    e.currentTarget.dataset.option.forEach(item=>{
+      array.push(item.tempFilePath)
+    })
+    console.log(array);
+    wx.previewImage({
+      urls: array,
+      showmenu:true,
+      current:array[e.currentTarget.dataset.index]
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/handle/expenditureAudit/expenditureAudit.json

@@ -15,6 +15,8 @@
     "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
     "van-calendar": "@vant/weapp/calendar/index",
-    "van-dialog": "@vant/weapp/dialog/index"
+    "van-dialog": "@vant/weapp/dialog/index",
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index"
   }
 }

pages/handle/expenditureAudit/expenditureAudit.wxml

@@ -4,166 +4,264 @@
   <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
 </view>
 <view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
-<view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};">
+<view class="main-box top-box topBox" style="margin-top:{{isIPX?'100px':'75px'}};">
   <text class="box-title">审批事项</text>
-  <input class="input_tit" disabled placeholder="请输入审批事项" value="{{form.approvalItemTemplate.approvalItems}}" bindinput="bindKeyInput"/>
+
+  <van-field required readonly focus="{{topInputTirme}}" error="{{topInputTirme}}" class="input_tittop {{topInputTirme?'error':''}}" data-formname="topInput" value="{{ form.approvalItemTemplate.approvalItems }}" placeholder="请输入审批事项" border="{{ false }}" bind:input="bindKeyInput" bind:blur="errorPd"/>
+  <text>支出总金额</text>
+  <view class="money_box">￥<input class="input_money" type="digit" disabled placeholder="总金额" placeholder-style="color:#E90000;" value="{{form.approvalItemTemplate.totalAmount}}"/></view>
   <text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
-  <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
-  <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
+  <!-- <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text> class="input_tit" -->
+  <text>提<text style="margin-right:0.5rem;display: inline-block;"></text>交<text style="margin-right:0.5rem;display: inline-block;"></text>人：{{form.approvalItemTemplate.submitter}}</text>
+
+
   <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
-  <text>总  金  额：{{form.approvalItemTemplate.totalAmount}}</text>
+  <van-field required label="申请时间：" readonly is-link value="{{ form.transfers[0].applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChangeTime" bindtap="openBox" data-name="showApplyDate" />
+  <van-calendar show="{{ showApplyDate }}" bind:close="closeBox"  data-name="showApplyDate" bind:confirm="onConfirmTime" data-value="form.transfers[{{index}}].applyDate" show-confirm="{{ false }}" />
 </view>
-<block wx:for="{{form.transfers}}" wx:key="index">
-  <view class="main-title">事项{{form.transfers[index].num}}</view>
-  <view class="center">
-    <text class="title">基础信息</text>
-    <view class="main-box table-box">
-      <van-field label="申请时间" readonly is-link value="{{ form.transfers[index].applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChange" input-align="right" bindtap="openBox" data-name="showApplyDate" />
-
-      <van-field readonly label="合计支出" value="{{ form.transfers[index].expenditureAmount }}" placeholder="(自动计算)" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" input-align="right"/>
-
-      <van-field label="支出原因" readonly value="{{  form.transfers[index].remark }}" placeholder="请输入支出原因" border="{{ false }}" bind:change="onChange" input-align="right" data-formname="form.transfers[{{index}}].remark" data-value="form.transfers[{{index}}].remark"/>
-
-      <van-field label="资金支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择资金支出类别" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showCapitalExpenditureType"/>
-    </view>
-    <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
-      <text class="title">关联项目</text>
-      <view class="main-box table-box">
-        <van-field label="项目名称" readonly value="{{ form.transfers[index].projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showProject"/>
-        <van-field label="承建单位" readonly value="{{ form.transfers[index].projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="合同价款(元)" readonly value="{{form.transfers[index]. projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="工程款类型" readonly value="{{ form.transfers[index].projectForm.projectFundTypeText }}" placeholder="请选择工程款类型" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showProjectFundType"/>
-        <van-field label="工程发票号" readonly value="{{ form.transfers[index].projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+
+  <van-collapse accordion value="{{ activeNames }}" bind:change="onChangeBox" bind:open="onOpen" bind:close="onCloseSecond">
+    <van-collapse-item name="{{index}}" disabled="{{item.collapseDis}}" is-link="{{false}}" wx:for="{{form.transfers}}" wx:key="index">
+      <view slot="title" wx:if="{{item.showTitle}}" class="main-title">事项{{form.transfers[index].num}}
+        <image src="/image/apply/icon_close.png" style="width: 24px;height: 24px;position: absolute;right: 4% ;top: 10px;transform: rotateX(180deg);" data-index="{{index}}" ></image>
       </view>
-    </block>
-
-    <block wx:if="{{form.transfers[index].capitalExpenditureType == 4}}">
-      <text class="title">关联合同</text>
-      <view class="main-box table-box">
-        <van-field label="合同名称" readonly value="{{ contractionForm.name }}" placeholder="请选择合同名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showContraction"/>
-        <van-field label="合同编码" readonly value="{{ contractionForm.code }}" placeholder="请输入合同编码" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="合同价款(元)" readonly value="{{ contractionForm.totalAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
+      <view slot="title" class="tit_box" wx:if="{{!item.showTitle}}">
+        <text class="title" style="text-align: center;">事项{{item.num}}</text>
+        <view class="top-box">
+          <text>支出金额</text>
+          <view class="money_box">￥<input class="input_money" disabled placeholder="金额" placeholder-style="color:#E90000;" value="{{item.expenditureAmount}}"/></view>
+          <van-cell-group border="{{ false }}">
+            <van-cell title="{{item.remark}}" border="{{ false }}" >
+              <view slot="icon" style="width: 15%;">事由：</view>
+            </van-cell>
+            <van-cell title="{{item.payer}}" border="{{ false }}" center >
+              <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_fu.png" style="width: 20px;height: 20px;"></image></view>
+            </van-cell>
+            
+            <van-cell title="{{item.payeeList[0].payee}}" center border="{{ false }}"  >
+              <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_shou.png" style="width: 20px;height: 20px;"></image></view>
+            </van-cell>
+            <view class="btnBox">
+              <image src="/image/apply/down.png" data-index="{{index}}" class="down"></image>
+              <!-- <image src="/image/apply/icon_update.png" class="update" bindtap="goUpdate"></image> -->
+            </view>
+          </van-cell-group>
+        </view>
       </view>
-    </block>
+      <view class="center">
+        <text class="title">基础信息</text>
+        <view class="main-box table-box">
+          <!-- <van-field label="申请流水号" value="{{ form.approvalItemTemplate.telephone }}" placeholder="请输入申请流水号" border="{{ false }}" bind:change="onChange" input-align="right"/> -->
+          
 
+          <van-field required readonly label="支出金额" focus="{{form.transfers[index].expenditureAmountTirme}}" error="{{form.transfers[index].expenditureAmountTirme}}" type="digit" value="{{ form.transfers[index].expenditureAmount }}" placeholder="请输入支出金额" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bind:change="onChangeMoney" bind:blur="errorJE"/>
 
-    <text class="title">付款方信息</text>
-    <view class="main-box table-box">
-      <van-field label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showTransferType"/>
+          <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
 
-      <van-field wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showAccount">
-        <view slot="label">
-          付款方<van-tag plain type="danger" color="red" round style="margin-left:10px;">必填</van-tag>
-        </view>
-      </van-field>
+          <van-field required readonly label="支出原因" value="{{  form.transfers[index].remark }}" placeholder="请输入支出原因" border="{{ false }}" input-align="right" />
+          
+          <van-field required label="支付方式" readonly value="{{ form.transfers[index].paymentPatternText }}" placeholder="请选择支付方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showTransferType"/>
 
-      <van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
-      <block wx:elif="{{form.transfers[index].transferType == 12}}">
-        <van-field readonly label="出票方" value="{{ form.transfers[index].payerAccount }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showMoneyorder"/>
+          <van-field required label="支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择支出类别" border="{{ false }}" input-align="right" is-link arrow-direction	="down"/>
+        </view>
+        <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
+          <text class="title">关联项目</text>
+          <view class="main-box table-box">
+            <van-field label="项目名称" readonly value="{{ form.transfers[index].projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link/>
+            <van-field label="承建单位" readonly value="{{ form.transfers[index].projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field label="合同价款(元)" readonly value="{{ form.transfers[index].projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
 
-        <van-field readonly label="汇票号码" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="出票金额(元)" value="{{ form.transfers[index].bankTypeText }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="汇票类型" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="开票日" value="{{ form.transfers[index].bankTypeText }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
-      </block>
-      <block wx:else>
-        <van-field readonly label="付款方账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="所属银行" value="{{ form.transfers[index].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right"/>
-      </block>
+            <van-field label="工程款类型" readonly value="{{ form.transfers[index].projectForm.projectFundTypeText }}" placeholder="请选择工程款类型" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
 
-    </view>
-    <text class="title">收款方信息</text>
-    <view class="center-box">
-      <view class="main-box table-box" wx:if="{{form.transfers[index].bankType == 1 && form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12}}">
-        <van-cell title="收款账户类型" center border="{{false}}">
-          <view style="float: right;">
-            <van-radio-group
-              value="{{ form.transfers[index].bankAccountType }}"
-              bind:change="onChange"
-              direction="horizontal"
-              data-value="form.transfers[{{index}}].bankAccountType"
-            >
-              <van-radio name="1" checked-color="#2C8E68">公户</van-radio>
-              <van-radio name="2" checked-color="#2C8E68">私户</van-radio>
-            </van-radio-group>
-          </view>
-        </van-cell>
-      </view>
-      <view class="main-box table-box" wx:if="{{(form.transfers[index].bankType == 2 || form.transfers[index].bankType == 3 || form.transfers[index].bankType == 4) && (form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12)}}">
-        <van-cell title="是否同行" center border="{{false}}">
-          <view style="float: right;">
-            <van-radio-group
-              value="{{ form.transfers[index].isPeers }}"
-              bind:change="onChange"
-              direction="horizontal"
-              data-value="form.transfers[{{index}}].isPeers"
-            >
-              <van-radio name="Y" checked-color="#2C8E68">是</van-radio>
-              <van-radio name="N" checked-color="#2C8E68">否</van-radio>
-            </van-radio-group>
+            <van-field label="工程发票号" value="{{ form.transfers[index].projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" data-value="form.transfers[{{index}}].projectForm.projectBillNum" bind:change="onChange" input-align="right"/>
           </view>
-        </van-cell>
-      </view>
+        </block>
 
-      <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-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>
+        <block wx:if="{{form.transfers[index].capitalExpenditureType == 4}}">
+          <text class="title">关联合同</text>
+          <view class="main-box table-box">
+            <van-popup show="{{form.transfers[index].showContraction}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showContraction">
+              <van-picker
+                columns="{{contractionOptions}}"
+                show-toolbar
+                value-key="name"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmContraction"
+                data-name="form.transfers[{{index}}].showContraction"
+                data-value="form.transfers[{{index}}].contractionForm.name"
+              />
+            </van-popup>
+            <van-field label="合同名称" readonly value="{{ form.transfers[index].contractionForm.name }}" placeholder="请选择合同名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="form.transfers[{{index}}].showContraction"/>
+            <van-field label="合同编码" value="{{ form.transfers[index].contractionForm.code }}" placeholder="请输入合同编码" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field label="合同价款(元)" readonly value="{{ form.transfers[index].contractionForm.totalAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            
           </view>
-        </van-field>
-        <van-field readonly label="收款账户" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
-        <van-field readonly label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/>
+        </block>
 
-        <van-field readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
-      </view>
-    </view>
 
-    <view class="main-box">
-      <van-cell>
-        <!-- <view slot="icon">
-          <van-icon class-prefix="my-icon" name="extra" />
-        </view> -->
-        <view slot="title">
-          <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].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
-        </view>
-      </van-cell>
-      <view class="fj-box">
-        <view class="fj-li">
-          <view>
-            <text>收\n据</text>
-          </view>
-          <view class="img_box">
-            <image wx:for="{{form.transfers[index].SJimage}}" src="{{item.tempFilePath}}" wx:key="index" data-option="{{form.transfers[index].SJimage}}" data-index="{{index}}" bindtap="openPreview"></image>
-            <!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="SJtakephoto"></image> -->
-          </view>
+        <text class="title">付款方信息</text>
+        <view class="main-box table-box">
+          <van-field required label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}"  input-align="right" is-link arrow-direction	="down"/>
+
+          <van-field required wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" input-align="right" is-link arrow-direction	="down">
+            <view slot="label">
+              付款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
+            </view>
+          </van-field>
+
+          <van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          <block wx:elif="{{form.transfers[index].transferType == 12}}">
+            <van-popup show="{{showAccount}}" round position="bottom"  bind:close="closeBox" data-name="showMoneyorder">
+              <van-picker
+                columns="{{moneyorderOptions}}"
+                show-toolbar
+                value-key="accountName"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmMoneyorder"
+                data-name="showMoneyorder"
+                data-value="form.transfers[{{index}}]"
+              />
+            </van-popup>
+            <van-field readonly label="出票方" value="{{ form.transfers[index].payerAccount }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showMoneyorder"/>
+
+            <van-field readonly label="汇票号码" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="出票金额(元)" value="{{ form.transfers[index].bankTypeText }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="汇票类型" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="开票日" value="{{ form.transfers[index].bankTypeText }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          </block>
+          <block wx:else>
+            <van-field required readonly label="付款账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field required readonly label="所属银行" value="{{ form.transfers[index].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          </block>
+
         </view>
-        <view class="fj-li">
-          <view>
-            <text>发\n票</text>
+        <text class="title">收款方信息</text>
+        <view class="center-box">
+          <view class="main-box table-box" wx:if="{{form.transfers[index].bankType == 1 && form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12}}">
+            <van-cell title="收款账户类型" center border="{{false}}">
+              <view style="float: right;">
+                <van-radio-group
+                  value="{{ form.transfers[index].bankAccountType }}"
+                  bind:change="onChange"
+                  direction="horizontal"
+                  data-value="form.transfers[{{index}}].bankAccountType"
+                >
+                  <van-radio name="1" disabled checked-color="#2C8E68">公户</van-radio>
+                  <van-radio name="2" disabled checked-color="#2C8E68">私户</van-radio>
+                </van-radio-group>
+              </view>
+            </van-cell>
           </view>
-          <view class="img_box">
-            <image wx:for="{{form.transfers[index].FPimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].FPimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
-            <!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="FPtakephoto"></image> -->
+          <!-- <view class="main-box table-box" wx:if="{{(form.transfers[index].bankType == 2 || form.transfers[index].bankType == 3 || form.transfers[index].bankType == 4) && (form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12)}}">
+            <van-cell title="是否同行" center border="{{false}}">
+              <view style="float: right;">
+                <van-radio-group
+                  value="{{ form.transfers[index].isPeers }}"
+                  bind:change="onChange"
+                  direction="horizontal"
+                  data-value="form.transfers[{{index}}].isPeers"
+                >
+                  <van-radio name="Y" checked-color="#2C8E68">是</van-radio>
+                  <van-radio name="N" checked-color="#2C8E68">否</van-radio>
+                </van-radio-group>
+              </view>
+            </van-cell>
+          </view> -->
+
+          <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
+            <van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}"  input-align="right" is-link arrow-direction	="down">
+              <view slot="label">
+                收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
+              </view>
+            </van-field>
+            <van-field required readonly label="收款账号" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" input-align="right"/>
+            <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" input-align="right" is-link arrow-direction	="down"/>
+            <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
+
+            <van-field required readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" input-align="right" is-link arrow-direction	="down"/>
           </view>
         </view>
-        <view class="fj-li">
-          <view>
-            <text>其\n他</text>
-          </view>
-          <view class="img_box">
-            <image wx:for="{{form.transfers[index].QTimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].QTimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
-            <!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="QTtakephoto"></image> -->
+
+        <view class="main-box">
+          <van-cell>
+            <!-- <view slot="icon">
+              <van-icon class-prefix="my-icon" name="extra" />
+            </view> -->
+            <view slot="title">
+              <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].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
+            </view>
+          </van-cell>
+          <view class="fj-box">
+            <view class="fj-li">
+              <view>
+                <text>收\n据</text>
+              </view>
+              <view class="img_box">
+                <image wx:for="{{form.transfers[index].SJimage}}" wx:for-index="childrenIndex" src="{{item.tempFilePath}}" wx:key="childrenIndex" data-option="{{form.transfers[index].SJimage}}" data-index="{{childrenIndex}}" bindtap="openPreview"></image>
+              </view>
+            </view>
+            <view class="fj-li">
+              <view>
+                <text>发\n票</text>
+              </view>
+              <view class="img_box">
+                <image wx:for="{{form.transfers[index].FPimage}}" wx:for-index="childrenIndex" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].FPimage}}" data-index="{{childrenIndex}}" bindtap="openPreview" wx:key="childrenIndex"></image>
+              </view>
+            </view>
+            <view class="fj-li">
+              <view>
+                <text>其\n他</text>
+              </view>
+              <view class="img_box">
+                <image wx:for="{{form.transfers[index].QTimage}}" wx:for-index="childrenIndex" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].QTimage}}" data-index="{{childrenIndex}}" bindtap="openPreview" wx:key="childrenIndex"></image>
+              </view>
+            </view>
           </view>
         </view>
+
+        <!-- <view class="main-box steps-box">
+          <view class="steps-tit">审批流程</view>
+          <van-row wx:for="{{steps}}" wx:key="index">
+            <van-col span="3">
+              <view class="index">{{index+1}}</view>
+              <block wx:if="{{index==0}}">
+                <view class="indexBorder">
+                  <view class="ssT" wx:if="{{index>0}}"></view>
+                  <view class="yq"></view>
+                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="indexBorder indexCenter">
+                  <view class="ssT" wx:if="{{index>0}}"></view>
+                  <view class="yq"></view>
+                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+                </view>
+              </block>
+            </van-col>
+            <van-col span="21">
+              <van-cell title="{{item.activityName}}" center="{{true}}" border="{{false}}">
+                <view class="agree" wx:if="{{item.type=='1'}}">{{ item.assigneeName }}</view>
+                <view class="in" wx:if="{{item.type=='2'}}">{{ item.assigneeName }}</view>
+                <view class="disagree" wx:if="{{item.type=='3'}}">{{ item.assigneeName }}</view>
+              </van-cell>
+
+              <van-cell center border="{{false}}">
+                <view slot="title">
+                  <view style="color: #999999;">{{ item.durationInMillis }}</view>
+                </view>
+                <view style="color: #999999;font-size: 12px;">{{ item.endTime }}</view>
+              </van-cell>
+            </van-col>
+          </van-row>
+        </view> -->
       </view>
-    </view>
-</view>
-</block>
+    </van-collapse-item>
+  </van-collapse>
 
 <view class="main-box steps-box">
   <view class="steps-tit">审批流程</view>

pages/handle/expenditureAudit/expenditureAudit.wxss

@@ -17,13 +17,16 @@ text{display: block;}
   width: 100%;
   font-size: 16px;
 }
-.input_tit{
+.input_tittop input{
   border: 1px solid #DCDCDC;
   padding: 0px 10px;
   height: 32px;
   line-height: 32px;
   border-radius: 5px;
-  margin-bottom: 15px;
+  width: 100%;
+}
+.error input{
+  border: 1px solid red!important;
 }
 .bgPage{
   width: 140%;
@@ -33,7 +36,8 @@ text{display: block;}
   z-index: -1;
 }
 .center{
-  padding-bottom: 28px;
+  padding-bottom: 15px;
+  background: #f2f2f2;
 }
 .main-title{
   background-image: linear-gradient(to right, #2C8E68 , #B3DB62);
@@ -41,6 +45,7 @@ text{display: block;}
   font-size: 18px;
   padding: 10px 0;
   text-align: center;
+  position: relative;
 }
 .main-box{
   background: #ffffff;
@@ -56,9 +61,23 @@ text{display: block;}
 .title{
   padding: 10px calc(3% + 20px);
 }
+.topBox .van-cell{
+  padding: 0!important;
+  margin-bottom: 15px;
+}
+.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;
+  max-width: 76px!important;
+  min-width: 76px!important;
+}
+
 .top-box{
-  margin-top: 20px;
-  margin-bottom: 28px;
+  /* margin-top: 20px;
+  margin-bottom: 28px; */
 }
 .top-box text{
   margin-bottom: 15px;
@@ -92,7 +111,7 @@ text{display: block;}
   border: 1px solid red;
   color: red;
 }
-.van-cell{
+.table-box .van-cell{
   padding: 0!important;
 }
 @font-face {
@@ -112,7 +131,7 @@ text{display: block;}
   text-align: center;
   border-radius: 5px;
   white-space:pre-wrap;
-  padding: 22px 15px;
+  padding: 22px 8px;
 }
 .fj-li{
   margin-top: 20px;
@@ -132,6 +151,7 @@ text{display: block;}
   width: 94%;
   margin: 0 auto;
   justify-content:space-between;
+  margin-top: 30px;
 }
 .bottomBtn view{
   display: flex;
@@ -189,6 +209,242 @@ text{display: block;}
   color: #fff;
   width: 100%;
 }
+.steps-box{
+  padding: 0;
+  margin-top: 15px;
+}
+.steps-box .van-row{
+  padding: 0 20px;
+}
+
+.steps-box view{
+  margin-bottom: 0;
+}
+
+.steps-box  .van-col{
+    position: relative;
+    height: 70px;
+  }
+  .steps-box  .van-col--21{
+    padding: 12PX 0;
+    padding-left: 10px;
+  }
+  .steps-box  .van-row:nth-child(2n){
+    background: rgba(29,111,233,0.1);
+  }
+  .steps-box  .van-cell{
+    background: transparent;
+    padding: 0 10Px;
+  }
+  .steps-box  .bq{
+    display: inline-block;
+    padding: 0PX 10PX;
+    line-height: 0.64rem;
+    border-radius: 5PX;
+  }
+  .steps-box  .index{
+    background: #1D6FE9;
+    color: #ffffff;
+    text-align: center;
+    width: 20PX;
+    height: 20PX;
+    line-height: 20PX;
+    border-radius: 50%;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translate(0,-50%);
+  }
+  .steps-box  .indexCenter{
+    top: 0!important;
+  }
+  .steps-box  .van-row:first-child .van-col:first-child .indexBorder{
+    top: calc(50% - 5px);
+  }
+  .steps-box  .indexBorder{
+    width: 10PX;
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    
+  }
+  .steps-box  .indexBorder .yq{
+    height: 10PX;
+    width: 10PX;
+    background: #C9C9C9;
+    border-radius: 50%;
+  }
+  .steps-box  .indexBorder .ss{
+    height: calc(50% - 5PX);
+    width: 1PX;
+    background: #C9C9C9;
+    position: relative;
+    left: 4PX;
+  }
+  .steps-box .indexBorder .ssT{
+    height: calc(50% - 5PX);
+    width: 1PX;
+    background: #C9C9C9;
+    position: relative;
+    left: 4PX;
+  }
+  .agree{
+    background-color: rgba(92, 174, 119, 0.1);
+    color:#5CAE77 ;
+    width: 80%;
+    text-align: center;
+    float: right;
+  }
+  .in{
+    background-color: rgba(245, 163, 39, 0.1);
+    color:#F5A327 ;
+    width: 80%;
+    text-align: center;
+    float: right;
+  }
+  .disagree{
+    background-color: rgba(233, 0, 0, 0.1);
+    color:#E90000 ;
+    width: 80%;
+    text-align: center;
+    float: right;
+  }
+  .steps-box .van-cell__title{
+    flex: 0.7;
+  }
+  .steps-box .van-cell__value{
+    flex: 0.3;
+  }
+  .steps-tit{
+    font-size: 16px;
+    text-align: center;
+    background-color: #2C8E68;
+    color: #ffffff;
+    padding: 20px 0;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .bottom{
+    width: 84%;
+    margin: 0 auto;
+    text-align: center;
+    margin-top: 30px;
+    margin-bottom: 80px;
+  }
+
+  .bottom button {
+    width: 47%;
+    margin: 0 auto;
+    border-radius: 30px;
+    display: inline-block;
+  }
+
+  .bottom .btnAgree{
+    border: 1px solid transparent;
+    background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+    margin-left: 6%;
+  }
+
+  .input_tit{
+    border: 1px solid #DCDCDC;
+    padding: 0px 10px;
+    height: 32px;
+    line-height: 32px;
+    border-radius: 5px;
+    margin-bottom: 15px;
+  }
+  .img_box{
+    position: relative;
+    width: 100%;
+  }
+  .van-cell--required:before {
+    left: -8px!important;
+  }
+  .input_money{
+    padding: 0px 10px;
+    height: 32px;
+    line-height: 32px;
+    color: #E90000;
+    font-size: 26px;
+    display: inline-block;
+    width: 50%;
+    text-align: center;
+  }
+  
+  .money_box{
+    font-size: 26px;
+    border-bottom:1px solid #DCDCDC;
+    width: 70%;
+    margin: 0 auto;
+    margin-bottom: 15px;
+    color: #E90000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .btnBox{
+    text-align: center;
+    position: relative;
+    height: 26px;
+  }
+  .down{
+    width: 15px;
+    height: 8px;
+    margin: 0 auto;
+    margin-top: 18px;
+  }
+  
+  .update{
+    width: 26px;
+    height: 26px;
+    position: absolute;
+    right: 41px;
+  }
+  .delete{
+    width: 26px;
+    height: 26px;
+    position: absolute;
+    right: 0;
+  }
+
+  .van-collapse-item {
+    background: transparent;
+      margin: 0 auto;
+      width: 100%;
+      margin: 0 auto;
+      margin-top: 15px;
+  }
+  .van-collapse-item__content{
+    padding: 0!important;
+  }
+  
+  .van-collapse .van-cell{
+    padding: 0;
+    background: transparent;
+  }
+
+  .van-collapse .tit_box .title{
+    text-align: center;
+    font-size: 18px;
+  }
+  .van-collapse .main-box{
+    /* padding: 0;
+    box-shadow: none; */
+  }
+  .van-collapse .tit_box{
+    width: 94%;
+    background: #ffffff;
+    margin: 0 auto;
+    border-radius: 10px;
+    box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+    padding: 20px;
+  }
+  .van-collapse .tit_box .top-box .van-cell{
+    margin-bottom: 15px;
+  }
+  
 .steps-box{
   padding: 0;
 }

pages/inCome/inCome.wxml

@@ -7,7 +7,7 @@
 <view class="top" style="margin-top:{{isIPX?'100px':'75px'}};">
   <image src="../../image/apply/dress_icon.png" mode="widthFix"></image>
   <view class="top-tit">收入单位</view>
-  <view class="top-title">龙水镇龙洞村股份经济联合社</view>
+  <view class="top-title">学坝社区股份经济合作联合社</view>
 </view>
 <view class="title">
   <text>基础信息</text>

pages/index/index.js

@@ -47,13 +47,48 @@ Page({
           {"dictVale":10,"dictLabel":"现金提现"},
           {"dictVale":11,"dictLabel":"现金使用"},
           {"dictVale":12,"dictLabel":"汇票支出"}
-      ]
+        ],
+        showList:false,
+        showListText:'更多',
+        num:1
     },
     onLoad: function (options) {
       //获取滚动条高度
       this.computeBarLocation();
     },
-
+    openView(){
+      var that = this;
+      let num = that.data.num;
+      console.log((num%2));
+      if( (num%2) > 0 ){
+        num++;
+        that.setData({
+          showList:true,
+          showListText:'收起',
+          num:num
+        })
+      }else{
+        num++;
+        that.setData({
+          showList:false,
+          showListText:'更多',
+          num:num
+        })
+      }
+    },
+    // getUserProfile(e) {
+    //   // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
+    //   // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
+    //   wx.getUserProfile({
+    //     desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+    //     success: (res) => {
+    //       this.setData({
+    //         userInfo: res.userInfo,
+    //         hasUserInfo: true
+    //       })
+    //     }
+    //   })
+    // },
     onShow(){
       //获取用户信息
       this.getUserInfo()
@@ -224,6 +259,12 @@ Page({
         url: '../inCome/inCome?',
         })
       },
+    //跳转收入登记
+    swichKeeping:function(e){
+      wx.navigateTo({
+        url: '/pages/Bookkeeping/Bookkeeping',
+        })
+      },
     //跳转支出申请
     swichPayment:function(e){
       console.log(e.currentTarget.dataset.current);
@@ -492,7 +533,7 @@ Page({
     showModal(){
       wx.showModal({
         title: '提示',
-        content: '功能正在开发中，敬请期待',
+        content: '此功能未正式启用！',
         showCancel: false,
         success (res) {
           if (res.confirm) {
@@ -502,5 +543,10 @@ Page({
           }
         }
       })
+    },
+    navigate(even){
+      wx.navigateTo({
+        url: even.currentTarget.dataset.url,
+      })
     }
 })

pages/index/index.json

@@ -2,7 +2,8 @@
   "usingComponents": {
     "icon-loading":"/component/iconLoading/iconLoading",
     "pop-up": "/component/pop-up/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-transition": "@vant/weapp/transition/index"
   },
   "navigationStyle": "custom"
 }

pages/index/index.wxml

@@ -5,7 +5,9 @@
     <!--账户信息-->
     <view class="information_header">
         <navigator url="{{'settle/index?item='+item}}">
-          <view class="portrait_head"></view>
+          <view class="portrait_head">
+            <open-data type="userAvatarUrl"></open-data>
+          </view>
         </navigator> 
         <view class="information_main">
             <view class="name_wrap">
@@ -55,7 +57,7 @@
             </view>
             <text class="desc">收入登记</text>
         </view>
-        <view class="tab_item" bindtap="showModal">
+        <view class="tab_item" bindtap="swichKeeping">
             <view class="icon">
                 <image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
             </view>
@@ -70,34 +72,56 @@
     </view>
     <!--子导航功能导航-->
     <view class="child_function">
-        <view class="flex_block" bindtap="showModal">
+        <view class="flex_block" data-url="/pages/payee/list/list" bindtap="navigate">
             <view class="image"><image class="attribute" src="../../image/index/child_function_01.png" mode="aspectFit"></image></view>
             <text class="desc">收款人</text>
         </view>
-        <view class="flex_block" bindtap="showModal">
+        <view class="flex_block" data-url="/pages/drawee/drawee" bindtap="navigate">
             <view class="image"><image class="attribute" src="../../image/index/child_function_02.png" mode="aspectFit"></image></view>
             <text class="desc">付款人</text>
         </view>
         <view class="flex_block" bindtap="showModal">
-            <view class="image"><image class="attribute" src="../../image/index/child_function_03.png" mode="aspectFit"></image></view>
-            <text class="desc">合同报送</text>
+            <view class="image"><image class="attribute" src="../../image/index/child_function_07.png" mode="aspectFit"></image></view>
+            <text class="desc">开户行</text>
         </view>
         <view class="flex_block" bindtap="showModal">
             <view class="image"><image class="attribute" src="../../image/index/child_function_04.png" mode="aspectFit"></image></view>
-            <text class="desc">固资变动</text>
+            <text class="desc">银行汇票</text>
         </view>
-        <view class="flex_block" bindtap="showModal">
-            <view class="image"><image class="attribute" src="../../image/index/child_function_05.png" mode="aspectFit"></image></view>
-            <text class="desc">资源变动</text>
+        <block wx:if="{{showList}}">
+          <view class="flex_block" bindtap="showModal">
+              <view class="image"><image class="attribute" src="../../image/index/child_function_08.png" mode="aspectFit"></image></view>
+              <text class="desc">工程项目</text>
+          </view>
+          <view class="flex_block" bindtap="showModal">
+              <view class="image"><image class="attribute" src="../../image/index/child_function_03.png" mode="aspectFit"></image></view>
+              <text class="desc">合同信息</text>
+          </view>
+          <view class="flex_block" bindtap="showModal">
+              <view class="image"><image class="attribute" src="../../image/index/child_function_09.png" mode="aspectFit"></image></view>
+              <text class="desc">合同报送</text>
+          </view>
+          <view class="flex_block" bindtap="showModal">
+              <view class="image"><image class="attribute" src="../../image/index/child_function_10.png" mode="aspectFit"></image></view>
+              <text class="desc">固资变动</text>
+          </view>
+          <view class="flex_block" bindtap="showModal">
+              <view class="image"><image class="attribute" src="../../image/index/child_function_05.png" mode="aspectFit"></image></view>
+              <text class="desc">资源变动</text>
+          </view>
+        </block>
+        <view class="flex_block" bindtap="openView">
+            <view class="image"><image class="attribute" src="../../image/index/child_function_06.png" mode="aspectFit"></image></view>
+            <text class="desc">{{showListText}}</text>
         </view>
     </view>
     <!--工作计划-->
     <view class="work_plan">
         <view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
         <view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
-        <view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已发起<text class="remind">{{yfqNum}}</text></view>
-        <view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>已制单<text class="remind">{{yzdNum}}</text></view>
-        <view class="more" bindtap="toList">></view>
+        <view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已提交<text class="remind">{{yfqNum}}</text></view>
+        <view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>草稿箱<text class="remind">{{yzdNum}}</text></view>
+        <!-- <view class="more" bindtap="toList">></view> -->
     </view>
 
     <scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;" > 
@@ -135,7 +159,7 @@
                 </view>
             </view> 
         </view>
-        <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="{{item.status == '1'?'gosee':item.status == '2'?'goUpdate':item.status == '3'?'gosee':''}}">
+        <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
@@ -177,9 +201,9 @@
 
         <van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />
 
-        <van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已发起数据" />
+        <van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已提交数据" />
 
-        <van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无已制单数据" />
+        <van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无草稿箱数据" />
     </scroll-view>
     <pop-up visible="{{visible}}" onClose="closePopUp">
         <view slot="content">

pages/index/index.wxss

@@ -21,8 +21,8 @@
 .information_header .portrait_head{
   width: 110rpx;
   height: 110rpx;
-  background: #000;
   border-radius: 50%;
+  overflow: hidden;
 }
 .information_header .information_main{
   flex: 1;
@@ -155,15 +155,20 @@
 }
 
 .child_function{
-  margin: 55rpx 20rpx 0;
+  margin: 35rpx 20rpx 0;
   display: flex;
+  flex-wrap: wrap;
+  align-content:space-between;
 }
 .child_function .flex_block{
-  flex: 1;
   display: flex;
   justify-content: center; 
   align-items: center; 
   flex-direction: column;
+  width: 20%;
+}
+.child_function .flex_block:nth-child(n+6){
+  margin-top: 25rpx;
 }
 .child_function .flex_block .image{
   width: 76rpx;
@@ -182,6 +187,7 @@
 .work_plan{
   padding: 40rpx 32.5rpx 30rpx;
   display: flex;
+  justify-content: space-between;
 }
 
 .work_plan  .menu_item{
@@ -194,8 +200,6 @@
   text-align: center;
   font-size: 32rpx;
   position: relative;
-  margin-right: 16rpx;
-
 }
 .work_plan  .menu_item.active{
   background-color: #5bae78;

pages/payee/add/add.js

@@ -14,8 +14,9 @@ Page({
       payeeAccount:'',
       bankType:'',
       bankDeposit:'',
-      accountType:'',
-      payeeType:'',
+      accountType:'2',
+      payeeType:'1',
+      payeeTypeText:'收款方',
       payeePaymentLines:'',
       status:'0',
     },
@@ -115,10 +116,12 @@ Page({
     })
   },
   onConfirmDeposit(even){
+    console.log(even);
     this.setData({
       [even.currentTarget.dataset.value]:even.detail.value.id,
       [even.currentTarget.dataset.value+"Text"]:even.detail.value.bankDeposit,
       [even.currentTarget.dataset.name]:false,
+      ["form.payeePaymentLines"]:even.detail.value.payeePaymentLines
     })
   },
   closeBox(even){

pages/payee/add/add.wxml

@@ -1,7 +1,7 @@
 <!--pages/payee/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
   <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
-  <text style="top:{{isIPX?'54px':'30px'}};">新增收款人</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">新增收款方</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">
@@ -15,9 +15,9 @@
         data-value="form.bankType"
       />
     </van-popup>
-    <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-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-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
@@ -43,8 +43,25 @@
         data-value="form.accountType"
       />
     </van-popup>
-    <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.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.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}}"

pages/payee/add/add.wxss

@@ -15,6 +15,15 @@
 }
 .van-cell{
   padding: 0!important;
+  margin-bottom: 15px;
+}
+.van-cell__value {
+  display: flex;
+  justify-content: flex-end;
+}
+.van-radio--horizontal {
+  margin-right: 0!important;
+  margin-left: var(--padding-sm,12px)
 }
 .van-cell--required:before {
   left: 0!important;

pages/payee/index.js

@@ -22,9 +22,9 @@ Page({
     // 可优化：数据请求放到  onload中   新增后在子页面修改父页面数据
     var that = this;
     that.setData({
-      isPeers:options.isPeers,//是否同行
-      bankType:options.bankType,//所属银行
-      accountType:options.accountType,//账户类型
+      // isPeers:options.isPeers,//是否同行
+      // bankType:options.bankType,//所属银行
+      // accountType:options.accountType,//账户类型
       payeeType:options.transferType,//申请转帐类型
       money:options.money,//申请转帐类型
       index:options.index
@@ -35,11 +35,11 @@ Page({
         pageNum:1,
         pageSize:999,
         orderByColumn:'id',
-        isAsc:'asc',
-        isPeers:that.data.isPeers,//是否同行
-        bankType:that.data.bankType,//所属银行
-        accountType:that.data.accountType,//账户类型
-        payeeType:that.data.payeeType,//申请转帐类型
+        isAsc:'desc',
+        // isPeers:that.data.isPeers,//是否同行
+        // bankType:that.data.bankType,//所属银行
+        // accountType:that.data.accountType,//账户类型
+        // payeeType:that.data.payeeType,//申请转帐类型
         status:'0',
         method:'GET'
       }
@@ -54,13 +54,32 @@ Page({
       UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, {
         success: (res) => {
           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;
-          }
+          var payeeType = that.data.payeeType;
+          var list = [];
+          array.map(res=>{
+
+            res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+            console.log(that.data.bankTypeOptions);
+            res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
+
+            console.log(res);
+
+            
+            if(payeeType == 2 && array.length>0){
+              if(res.payeeType == 4 || res.payeeType == 3 ){
+                console.log("2222222222222222222");
+                list.push(res)
+              }
+            }
+            if(payeeType == 1 && array.length>0){
+              if(res.payeeType == 1){
+                console.log("111111111111111111");
+                list.push(res)
+              }
+            }
+          })
           that.setData({
-            list:array,
+            list:list,
           })
         }
       })
@@ -78,10 +97,10 @@ Page({
       pageSize:999,
       orderByColumn:'id',
       isAsc:'asc',
-      isPeers:that.data.isPeers,//是否同行
-      bankType:that.data.bankType,//所属银行
-      accountType:that.data.accountType,//账户类型
-      payeeType:that.data.payeeType,//申请转帐类型
+      // isPeers:that.data.isPeers,//是否同行
+      // bankType:that.data.bankType,//所属银行
+      // accountType:that.data.accountType,//账户类型
+      // payeeType:that.data.payeeType,//申请转帐类型
       status:'0',
       name:e.detail,
       method:'GET'
@@ -97,12 +116,28 @@ Page({
     UTIL.httpRequest(API.URL_GET_PAYEESELECTLIST , prames, {
       success: (res) => {
         let array = res.rows ; 
-        for (let i = 0; i < array.length; i++) {
-          array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
-          array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
-        }
+        var payeeType = that.data.payeeType;
+        var list = [];
+        array.map(res=>{
+
+          res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+          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 ){
+              console.log("2222222222222222222");
+              list.push(res)
+            }
+          }
+          if(payeeType == 1 && array.length>0){
+            if(res.payeeType == 1){
+              console.log("111111111111111111");
+              list.push(res)
+            }
+          }
+        })
         that.setData({
-          list:array,
+          list:list,
         })
       }
     })

pages/payee/index.wxml

@@ -27,7 +27,7 @@
         use-label-slot
       >
         <view slot="icon" style="margin-right: 10px;">
-          <image wx:if="{{item.bankType == 0}}" src="/image/apply/icon_other.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+          <image wx:if="{{item.bankType == 999}}" src="/image/apply/icon_other.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
           <image wx:if="{{item.bankType == 1}}" src="/image/apply/icon_icbc.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
           <image wx:if="{{item.bankType == 2}}" src="/image/apply/icon_RCB.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
           <image wx:if="{{item.bankType == 3}}" src="/image/apply/icon_ABC.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>

pages/payee/list/list.js

@@ -0,0 +1,196 @@
+// pages/payee/index.js
+import * as UTIL from '../../../utils/util.js';
+import * as API from '../../../utils/API.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+    list: {},
+    result: "",
+    bankTypeOptions:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options)
+    // 可优化：数据请求放到  onload中   新增后在子页面修改父页面数据
+    var that = this;
+    that.setData({
+      index:options.index
+    })
+    var that = this;
+      // 获取收款账号列表
+      let prames = {
+        pageNum:1,
+        pageSize:999,
+        orderByColumn:'id',
+        isAsc:'desc',
+        status:'0',
+        method:'GET'
+      }
+      console.log(prames);
+      UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+        success: (res) => {
+          that.setData({
+            bankTypeOptions:res.data,
+          })
+        }
+      })
+      UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, {
+        success: (res) => {
+          let array = res.rows ; 
+          var payeeType = that.data.payeeType;
+          var list = [];
+          array.map(res=>{
+
+            res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+            console.log(that.data.bankTypeOptions);
+            res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
+
+            console.log(res);
+            list.push(res)
+          })
+          that.setData({
+            list:list,
+          })
+        }
+      })
+  },
+  goAdd(){
+    wx.navigateTo({
+      url: '../add/add',
+    })
+  },
+  goSearch(e){
+    var that = this;
+    // 获取收款账号列表
+    let prames = {
+      pageNum:1,
+      pageSize:999,
+      orderByColumn:'id',
+      isAsc:'asc',
+      // isPeers:that.data.isPeers,//是否同行
+      // bankType:that.data.bankType,//所属银行
+      // accountType:that.data.accountType,//账户类型
+      // payeeType:that.data.payeeType,//申请转帐类型
+      status:'0',
+      name:e.detail,
+      method:'GET'
+    }
+    console.log(prames);
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          bankTypeOptions:res.data,
+        })
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_PAYEESELECTLIST , prames, {
+      success: (res) => {
+        let array = res.rows ; 
+        var payeeType = that.data.payeeType;
+        var list = [];
+        array.map(res=>{
+          res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+          res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
+          list.push(res)
+        })
+        that.setData({
+          list:list,
+        })
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    
+  },
+  onChange(event) {
+    console.log(event);
+    this.setData({
+      result: event.detail,
+    });
+  },
+
+  toggle(event) {
+    const { index } = event.currentTarget.dataset;
+    const checkbox = this.selectComponent(`.checkboxes-${index}`);
+    checkbox.toggle();
+  },
+  back:function(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  noop() {},
+  goSubmit(){
+    var that = this;
+    if(that.data.result == ''){
+      UTIL.showToastNoneIcon('请选择一个收款人！');
+      return;
+    }
+    let array = that.data.list.filter(function (e) { return e.id == that.data.result; });
+    array[0].incomeAmount = that.data.money;
+    console.log(array);
+    let pages = getCurrentPages();
+    let currentPage = null;   //当前页面
+    let prevPage = null;  //上一个页面
+    currentPage = pages[pages.length - 1]; //获取当前页面，将其赋值
+    prevPage = pages[pages.length - 2]; //获取上一个页面，将其赋值
+    if (prevPage) {
+      prevPage.setData({         
+        ["form.transfers["+that.data.index+"].payeeList[0]"]: array[0]//将想要传的信息赋值给上一个页面data中的值
+      })
+      that.back()
+    }
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/payee/list/list.json

@@ -0,0 +1,11 @@
+{
+  "usingComponents": {
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-radio": "@vant/weapp/radio/index",
+  "van-radio-group": "@vant/weapp/radio-group/index"
+  }
+}

pages/payee/list/list.wxml

@@ -0,0 +1,43 @@
+<!--pages/payee/list/list.wxml-->
+<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
+</view>
+<view class="search_box" style="margin-top:{{isIPX?'100px':'75px'}};">
+  <van-search
+    value="{{ value }}"
+    shape="round"
+    background="transparent"
+    placeholder="请输入搜索关键词"
+    clearable
+    bind:change="goSearch"
+  />
+  <view class="add_btn" bindtap="goAdd"><text>新增</text></view>
+</view>
+
+<van-cell-group>
+  <van-cell
+    wx:for="{{ list }}"
+    wx:key="index"
+    value-class="value-class"
+    clickable
+    data-index="{{ index }}"
+    bind:click="toggle"
+    use-label-slot
+  >
+    <view slot="icon" style="margin-right: 10px;">
+      <image wx:if="{{item.bankType == 1}}" src="/image/apply/icon_icbc.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+      <image wx:elif="{{item.bankType == 2}}" src="/image/apply/icon_RCB.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+      <image wx:elif="{{item.bankType == 3}}" src="/image/apply/icon_ABC.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+      <image wx:elif="{{item.bankType == 4}}" src="/image/apply/icon_CCB.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+      <image wx:else src="/image/apply/icon_other.png" style="width: 20px;height: 20px;vertical-align: middle;"></image>
+    </view>
+    <view slot="title">
+      {{item.payee}}
+    </view>
+    <view slot="label">
+      <text decode = "{{true}}">{{item.payeeAccountText}}&emsp;&emsp;&emsp;&emsp;{{item.bankTypeText}}</text>
+    </view>
+  </van-cell>
+</van-cell-group>
+<view class="ipXbtn"></view>

pages/payee/list/list.wxss

@@ -0,0 +1,66 @@
+/* pages/payee/index.wxss */
+page{background-color: #fff;}
+.value-class {
+  flex: none !important;
+}
+.van-cell:after {
+  border-bottom: 1px solid #ddd!important;
+}
+.van-cell{
+  background-color: transparent!important;
+}
+.van-search__content {
+  border: 1px solid #5CAE77!important;
+  background: transparent!important;
+}
+van-search {
+  flex: 0.8;
+}
+.search_box{
+  display: flex;
+}
+.add_btn{
+  flex: 0.2;
+  padding: var(--search-padding,10px 12px);
+  padding-left: 0;
+}
+.add_btn text{
+  background-color: #62AD66;
+  display: block;
+  height: 100%;
+  text-align: center;
+  line-height: 36px;
+  color: #fff;
+  border-radius: 36px;
+  box-shadow: 0px 5px 5px #ddd;
+}
+.bottom{
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  padding-top: 30px;
+  padding-bottom: 30px;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  background: #FFF;
+  box-shadow: 0px -5px 9px #eee;
+}
+
+.bottom view {
+  width: 47%;
+  margin: 0 auto;
+  border-radius: 30px;
+  display: inline-block;
+}
+
+.bottom .btn2{
+  border: 1px solid transparent;
+  padding: 8px 0px;
+  background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+  color: #fff;
+}
+
+.van-radio-group{
+  padding-bottom: 100px;
+}

project.private.config.json

@@ -73,11 +73,25 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "记账申请",
+          "pathName": "pages/Bookkeeping/Bookkeeping",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "收款人列表",
+          "pathName": "pages/payee/list/list",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "WXMB",
-  "libVersion": "2.23.4"
+  "libVersion": "2.24.0"
 }

utils/API.js

@@ -149,6 +149,15 @@ const URL_GET_GETRELATIONADD = `${URL_PREFIX}/contraction/info/relationAdd`;
 //根据申请转账id获取关联合同信息
 const URL_GET_GETSELECTINFOBYOUTID = `${URL_PREFIX}/contraction/info/selectInfoByOutId`;
 
+//付款账号余额查询
+const URL_GET_GETBALANCEENQUIRY = `${URL_PREFIX}/yinnong/transfer/balanceEnquiry/`;
+
+//通过审批事项id设置默认模板
+const URL_GET_GETSETDEFAULTVALUES = `${URL_PREFIX}/yinnong/approvalItems/setDefaultValues/`;
+
+//根据附件id删除附件信息
+const URL_GET_GETFILEREMOVE = `${URL_PREFIX}/system/attachment/remove/`;
+
 
 
 /****************接口地址end****************/
@@ -213,5 +222,8 @@ export {
     URL_GET_ADDPROJECTTO,
     URL_GET_GETPROJECTTO,
     URL_GET_GETRELATIONADD,
-    URL_GET_GETSELECTINFOBYOUTID
+    URL_GET_GETSELECTINFOBYOUTID,
+    URL_GET_GETBALANCEENQUIRY,
+    URL_GET_GETSETDEFAULTVALUES,
+    URL_GET_GETFILEREMOVE
 }

utils/util.js

@@ -274,7 +274,7 @@ function getCOdeFromWX({ complate }) {
 /**
  * ，获取到的微信用户信息（昵称、头像、省市 赋值给globalData.wxUserInfo)
  */
-function getUserInfoFomWX({ success }) {
+function getUserInfoFomWX() {
 	wx.getUserProfile({
 		desc: '用于完善会员资料',
 		success: res => {
@@ -285,7 +285,6 @@ function getUserInfoFomWX({ success }) {
 			// getApp().globalData.wxUserInfo.city = res.userInfo.city;
 			console.log("获取到个人信息：" + res.userInfo.nickName);
 			success(res);
-
 		},
 		complete: res => {
 		}