优化

app.json

@@ -20,7 +20,9 @@
     "pages/Bookkeeping/Bookkeeping",
     "pages/payee/list/list",
     "pages/drawee/drawee",
-    "pages/drawee/add/add"
+    "pages/drawee/add/add",
+    "pages/Bookkeeping/update/update",
+    "pages/bank/bank"
   ],
   "window": {
     "backgroundTextStyle": "light",

env/env.js

@@ -1,18 +1,29 @@
+// module.exports = {
+//   DEV: {
+//         URL_PREFIX: 'http://192.168.31.178/api',
+//   },
+//   PRE: {
+//         URL_PREFIX: 'http://192.168.31.178:8080/api',
+//   }, 
+//   PROD: {
+//         URL_PREFIX: 'http://192.168.31.178:8080/api',
+//   },
+//   IMGURL: {
+//         URL_PREFIX: 'http://192.168.31.178:8080',
+//   }
+// }
+
 module.exports = {
-    DEV: {
-          //  URL_PREFIX: 'http://192.168.31.178/api',
-          URL_PREFIX: 'https://dazu.nongshen.net/api',
-    },
-    PRE: {
-          //  URL_PREFIX: 'http://192.168.31.178:8080/api',
-           URL_PREFIX: 'https://dazu.nongshen.net/api',
-    }, 
-    PROD: {
-          //  URL_PREFIX: 'http://192.168.31.178:8080/api',
-           URL_PREFIX: 'https://dazu.nongshen.net/api',
-    },
-    IMGURL: {
-          // URL_PREFIX: 'http://192.168.31.178:8080',
-           URL_PREFIX: 'https://dazu.nongshen.net/api',
-    }
-  }
+  DEV: {
+        URL_PREFIX: 'https://dazu.nongshen.net/api',
+  },
+  PRE: {
+        URL_PREFIX: 'https://dazu.nongshen.net/api',
+  }, 
+  PROD: {
+        URL_PREFIX: 'https://dazu.nongshen.net/api',
+  },
+  IMGURL: {
+        URL_PREFIX: 'https://dazu.nongshen.net/api',
+  }
+}

pages/Bookkeeping/Bookkeeping.js

@@ -259,6 +259,31 @@ Page({
       }
     })
   },
+  goUpdate(event){
+    wx.navigateTo({
+      url: '/pages/Bookkeeping/update/update?id='+event.currentTarget.dataset.id,
+    })
+  },
+  delete(e){
+    console.log(e);
+    var that = this;
+    UTIL.httpRequest(API.URL_GET_FLOWREMOVE + e.currentTarget.dataset.id, {method:'GET'},{
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          that.data.flowListSR.splice(e.currentTarget.dataset.index, 1); 
+          wx.showToast({
+            title: '删除成功！',
+            icon: 'success',
+            duration: 2000
+          })
+          that.setData({
+            flowListSR : that.data.flowListSR,
+            flowListSRNum:that.data.flowListSRNum-1
+          })
+        }
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/Bookkeeping/Bookkeeping.json

@@ -6,6 +6,7 @@
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-empty": "@vant/weapp/empty/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
   }
 }

pages/Bookkeeping/Bookkeeping.wxml

@@ -24,28 +24,35 @@
     </van-popup>
 </view>
 <van-checkbox-group wx:if="{{showGroup}}" value="{{ result }}" bind:change="onChange">
-  <view class="li" wx:for="{{flowListSR}}" wx:key="index">
-    <van-checkbox name="{{item.id}}"  shape="square" checked-color="#2C8E68" style="width: 100%;">
-      <view style="width: 40%;">
-        <text class="tit">{{item.accountSummary}}</text>
-        <view class="fksr">
-          <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
-          {{item.incomeTypeText}}
-        </view>
-      </view>
-      <view>
-        <text class="fj_name">附件{{item.enclosureCount}}</text>
-        <text class="time">{{item.incomeDate}}</text>
-      </view>
-      <view>
-        <view class="wtj">
-          <image src="/image/icon/stop.png" style="width: 12px;height: 12px;margin-right: 5px;"></image>
-          {{item.checkedStatusText}}
-        </view>
-        <text class="money">￥{{item.jieAmount}}</text>
+  <van-swipe-cell right-width="{{ 65 }}" class="workflow" wx:for="{{flowListSR}}" wx:key="index">
+    <view class="li" data-id="{{item.id}}" bindtap="goUpdate">
+        <van-checkbox name="{{item.id}}"  shape="square" checked-color="#2C8E68" style="width: 100%;">
+          <view style="width: 40%;">
+            <text class="tit">{{item.accountSummary}}</text>
+            <view class="fksr">
+              <image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
+              {{item.incomeTypeText}}
+            </view>
+          </view>
+          <view>
+            <text class="fj_name">附件{{item.enclosureCount}}</text>
+            <text class="time">{{item.accountDate}}</text>
+          </view>
+          <view style="width: 25%;">
+            <view class="wtj {{item.checkedStatusText == '未提交' ? 'no':item.checkedStatusText == '待审核' ? 'white':item.checkedStatusText == '已审核' ? 'yes':item.checkedStatusText == '已挂起' ? 'other':''}}">
+              <image src="{{item.checkedStatusText == '未提交' ? '/image/icon/icon_no.png':item.checkedStatusText == '待审核' ? '/image/icon/icon_white.png':item.checkedStatusText == '已审核' ? '/image/icon/icon_yes.png':item.checkedStatusText == '已挂起' ? '/image/icon/icon_other.png':''}}" style="width: 12px;height: 12px;margin-right: 5px;"></image>
+              {{item.checkedStatusText}}
+            </view>
+            <text class="money">￥{{item.jieAmount}}</text>
+          </view>
+        </van-checkbox>
+    </view>
+    <view slot="right" class="deleteBox">
+      <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>
-    </van-checkbox>
-  </view>
+    </view>
+  </van-swipe-cell>
 </van-checkbox-group>
 
 

pages/Bookkeeping/Bookkeeping.wxss

@@ -38,8 +38,13 @@ text{display: block;}
   font-size: 36rpx;
   color: #31936c;
 }
-.workflow{
-  padding: 10rpx 32.5rpx;
+.deleteBox{
+  width: 65px;
+  text-align: center;
+  height: 100%;
+  background: #F6F6F6;
+  align-items: center;
+  display: flex;
 }
 .workflow .workflow_list{
   height: 150rpx;
@@ -69,17 +74,20 @@ text{display: block;}
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.li{
-  display: flex;
-  justify-content: space-between;
+.van-swipe-cell {
   width: 94%;
-  margin: 0 auto;
   background: #fff;
-  padding: 14px;
   border-radius: 10px;
   box-shadow: 2px 5px 5px #ddd;
+  margin: 0 auto;
   margin-bottom: 15px;
 }
+.li{
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  padding: 14px;
+}
 .li view text{
   margin-top: 15px;
 }
@@ -98,11 +106,25 @@ text{display: block;}
   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;
 }
+.no{
+  background-color:#fbe3e3;
+  color: #e90000;
+}
+.white{
+  background-color:#feeadc;
+  color: #fc9a55;
+}
+.yes{
+  background-color:#ddeee3;
+  color: #5cae77;
+}
+.other{
+  background-color:#f0f1f6;
+  color: #878787;
+}
 .li .tit{
   font-size: 18px;
   color: #444444;

pages/apply/index.js

@@ -149,7 +149,7 @@ swichPaymentApply:function(e){
             if(res.rows[i].bankAccountNumber==null){continue;}
             res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
             res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
-            res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);;
+            res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
           }
           console.log(res.rows)
           that.setData({

pages/bank/bank.js

@@ -0,0 +1,69 @@
+// pages/bank/bank.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isIPX: app.globalData.isIPX,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/bank/bank.json

@@ -0,0 +1,12 @@
+{
+  "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",
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index"
+  }
+}

pages/bank/bank.wxml

@@ -0,0 +1,60 @@
+<!--pages/bank/bank.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-swipe-cell right-width="{{ 65 }}" class="workflow">
+  <view class="li" bindtap="goUpdate">
+      <view class="tit_box">
+        <image src="/image/apply/ICBC.png" style="width: 25px;height: 25px;"></image>
+        <text class="tit">威海农商行临港区支行</text>
+      </view>
+      <view class="detail_box">
+        <view style="width: 35%;">农商行（山东省）</view>
+        <view style="width: 30%;display: flex;justify-content: center;">
+          <image src="/image/icon/dress.png" style="width: 9px;height: 12px;margin-right: 5px;"></image>
+          <text>山东威海</text>
+        </view>
+        <view><text>联行号：2570******</text></view>
+      </view>
+  </view>
+  <view slot="right" class="deleteBox">
+    <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-swipe-cell right-width="{{ 65 }}" class="workflow">
+  <view class="li" bindtap="goUpdate">
+      <view class="tit_box">
+        <image src="/image/apply/ICBC.png" style="width: 25px;height: 25px;"></image>
+        <text class="tit">威海农商行临港区支行</text>
+      </view>
+      <view class="detail_box">
+        <view style="width: 35%;">中国建设银行</view>
+        <view style="width: 30%;display: flex;justify-content: center;">
+          <image src="/image/icon/dress.png" style="width: 9px;height: 12px;margin-right: 5px;"></image>
+          <text>山东威海</text>
+        </view>
+        <view><text>联行号：2570******</text></view>
+      </view>
+  </view>
+  <view slot="right" class="deleteBox">
+    <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>

pages/bank/bank.wxss

@@ -0,0 +1,245 @@
+/* pages/bank/bank.wxss */
+.van-search__content {
+  border: 1px solid #5CAE77!important;
+  background: #fff!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;
+}
+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;
+  position: relative;
+  margin-right: 20px;
+  padding: 8px 10px;
+}
+.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;
+}
+.deleteBox{
+  width: 65px;
+  text-align: center;
+  height: 100%;
+  background: #F6F6F6;
+  align-items: center;
+  display: flex;
+}
+.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;
+}
+.van-swipe-cell {
+  width: 94%;
+  background: #fff;
+  border-radius: 10px;
+  box-shadow: 2px 5px 5px #ddd;
+  margin: 0 auto;
+  margin-bottom: 15px;
+}
+.li{
+  width: 100%;
+  padding: 14px;
+}
+.tit_box{
+  display: flex;
+}
+.detail_box{
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.li view text{
+  /* margin-top: 15px; */
+}
+.li .detail_box view{
+  display: flex;
+  align-items: center;
+}
+.li .detail_box view text{
+  color: #666666;
+  font-size: 12px;
+}
+
+.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;
+  border-radius: 5px;
+  font-size: 14px;
+}
+.no{
+  background-color:#fbe3e3;
+  color: #e90000;
+}
+.white{
+  background-color:#feeadc;
+  color: #fc9a55;
+}
+.yes{
+  background-color:#ddeee3;
+  color: #5cae77;
+}
+.other{
+  background-color:#f0f1f6;
+  color: #878787;
+}
+.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;
+}
+
+.downView{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 20px;
+  border: 1px solid #5CAE77;
+  border-radius: 50px;
+  background: #fff;
+  margin-left: auto;
+}
+.downView image{
+  width: 10px;
+  height: 8px;
+  margin-left: 10px;
+}

pages/drawee/drawee.js

@@ -115,6 +115,13 @@ swichPaymentApply:function(e){
       method:'GET',
       accountType:101
     }
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          bankTypeOptions:res.data
+        });
+      }
+    })
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
@@ -133,14 +140,16 @@ swichPaymentApply:function(e){
     })
     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
-        })
+          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 ");
+            res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
+            res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
+          }
+          console.log(res.rows)
+          that.setData({
+            accountList:res.rows
+          })
       }
     })
 

pages/drawee/drawee.wxml

@@ -15,10 +15,11 @@
     <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':''}}">
+        <image src="../../image/apply/bgt.png" wx:if="{{item.bankUseType == 1}}" style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
+        <image src="../../image/apply/bgy.png" wx:else style="width: 100%;position: absolute;top:0;right:0;z-index: 9;height: 100%;"></image>
+        <view class="bank_content {{iOf.indexOf(item.bankTypeText,'中国银行') > -1 ? 'ICBC':iOf.indexOf(item.bankTypeText,'农商行') > -1 ? 'RCB':iOf.indexOf(item.bankTypeText,'农业银行') > -1 ? 'ABC':iOf.indexOf(item.bankTypeText,'建设银行') > -1 ? '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>
+            <image src="../../image/apply/{{iOf.indexOf(item.bankTypeText,'中国银行') > -1 ? 'ICBC':iOf.indexOf(item.bankTypeText,'农商行') > -1 ? 'RCB':iOf.indexOf(item.bankTypeText,'农业银行') > -1 ? 'ABC':iOf.indexOf(item.bankTypeText,'建设银行') > -1 ? 'CCB':''}}.png" style="width: 25px"  mode="widthFix"></image>
             <text>{{item.accountName}}</text>
           </view>
           
@@ -36,7 +37,6 @@
         <text>添加银行账户</text>
       </view>
     </van-tab>
-
     <van-tab title="现金账户">
     
       <view class="bank_box" wx:for="{{accountListXJ}}" wx:key="index">
@@ -95,7 +95,7 @@
 
 <wxs module="iOf">
   var indexOf = function(name,value){
-    return name.indexOf(value)>0;
+    return name.indexOf(value);
   }
   module.exports.indexOf = indexOf;
 </wxs>

pages/inCome/inCome.js

@@ -32,7 +32,7 @@ Page({
     qtPics:[],  //其他图片列表数据
     //收入时间弹窗显隐
     srShow:false,
-    minDate: new Date(2021, 6, 1).getTime(),
+    minDate: new Date(2008, 5, 1).getTime(),
     maxDate: new Date(2023, 0, 31).getTime(),
     crzhShow:false,
     accountListOptions:[], //存入账户类型选项
@@ -82,7 +82,8 @@ Page({
     this.setData({
       payerText:obj.name,
       showHt:false,
-      'formData.contractionId':obj.code,
+      'formData.contractionId':obj.id,
+      contractionIdID:obj.code
     })
   },
   selectContraction(){
@@ -106,7 +107,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onShow: function (options) {
-   
+    this.setData({
+      ["formData.accountDate"]:this.getNewDate(new Date())
+    })
   },
    /**
    * 生命周期函数--监听页面初次渲染完成

pages/inCome/inCome.json

@@ -1,14 +1,24 @@
 {
+  "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"
-
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-dialog": "@vant/weapp/dialog/index",
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index"
 
   }
 }

pages/inCome/inCome.wxml

@@ -9,16 +9,8 @@
   <view class="top-tit">收入单位</view>
   <view class="top-title">{{bookName}}</view>
 </view>
-<view class="title">
-  <text>基础信息</text>
-</view>
+<text class="title">基础信息</text>
 <view class="main-box table-box">
-
-      <van-field readonly  label="收入时间" value="{{formData.accountDate }}"
-        placeholder="请选择收入时间" border="{{ false }}" input-align="right" is-link arrow-direction	="down"
-        bindtap="onsrDate"  required="{{true}}"
-      />
-      <van-calendar
       <view class="flex-block">
         <text class="rules">收入时间</text>
         <view class="wrap" bindtap="onsrDate" >
@@ -59,16 +51,30 @@
       
       
       </view>
-      <view  class="flex-block"><text class="rules">收入类型</text>
-        <picker bindchange="bindPickerChange"  class="wrap picker_wrap"
+      <view  class="flex-block">
+        <text class="rules">收入类型</text>
+        <view bindtap="oncrlxShow" class="wrap">
+          <text wx:if="{{incomeTypeText==''}}" class="color-gray">请选择收入类型</text>
+          <text wx:else>{{incomeTypeText}}</text>
+        </view>
+      </view>
+      <van-popup
+        show="{{ crlxShow }}"
+        position="bottom"
+        bind:close="onCancelcrlx"
+      >
+      <van-picker 
+        columns="{{ incomeTypeOptions }}" 
+        value-key="dictLabel"   
+        bind:cancel="onCancelcrlx"
+        show-toolbar="{{true}}"
+        bind:confirm="bindPickerChange"/>
+        <!-- <picker bindchange="bindPickerChange"  class="wrap picker_wrap"
             value="{{incomeTypeText}}"
             range="{{incomeTypeOptions}}"
-             range-key="dictLabel">
-              <view class="picker">
-              {{incomeTypeText}}
-              </view>
-        </picker>
-      </view>
+            range-key="dictLabel">
+        </picker> -->
+      </van-popup>
       <view  class="flex-block"><text class="rules">单据编码</text> <input class="wrap" type="number" bindinput="inputChange"  data-prop="formData.billNum" value="{{formData.billNum}}" placeholder="请输入单据编码"/></view>
       <view  class="flex-block"><text class="rules">备注说明</text> <input class="wrap" type="number"  bindinput="inputChange" data-prop="formData.accountSummary"  placeholder="请输入备注说明" value="{{formData.accountSummary}}"/></view>
 </view>
@@ -95,17 +101,72 @@
       </view>
       <view  class="flex-block"><text class="rules {{formData.incomeType == '2' ?'':'no'}}">合同编码</text>
         <view class="wrap" bindtap="selectContraction">
-          <text wx:if="{{formData.contractionId==''}}" class="color-gray">请选择合同编码</text>
-          <text wx:else>{{formData.contractionId}}</text>
+          <text wx:if="{{contractionIdID==''}}" class="color-gray">请选择合同编码</text>
+          <text wx:else>{{contractionIdID}}</text>
         </view>
       
       </view>
 </view>
-<view class="title">
-  <text>附件</text>
-</view>
-<view class="main-box table-box">
-  <view style="margin:10px 0 5px;" class="flex-block">
+
+<view class="main-box table-box" style="margin-top: 15px;">
+  <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">
+        <view class="img_list" wx:for="{{sjPics}}" wx:for-index="index" wx:key="index">
+          <image class="img_li" src="{{item.file}}"bindlongpress="bindlongpressimg" data-status="sjPics" bindtap="imgPreviewImage" data-id='{{index}}'></image>
+          <van-icon name="/image/apply/img_delete.png" data-id="{{index}}" size="20px" data-status="sjPics" bindtap="deleteimg" />
+        </view>
+        <view class="img_list">
+          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadSjPics"></image>
+        </view>
+      </view>
+    </view>
+    <view class="fj-li">
+      <view>
+        <text>发\n票</text>
+      </view>
+      <view class="img_box">
+
+        <view class="img_list" wx:for="{{fpPics}}" wx:for-index="index" wx:key="index">
+          <image class="img_li" src="{{item.file}}" data-status="fpPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
+          <van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="fpPics"  bindtap="deleteimg" />
+        </view>
+        <view class="img_list">
+          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadFpPics"></image>
+        </view>
+      </view>
+    </view>
+    <view class="fj-li">
+      <view>
+        <text>其\n他</text>
+      </view>
+      <view class="img_box">
+        <view class="img_list" wx:for="{{qtPics}}" wx:for-index="index" wx:key="index">
+          <image class="img_li" src="{{item.file}}"  data-status="qtPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
+          <van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics" bindtap="deleteimg" />
+        </view>
+        <view class="img_list">
+          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadQtPics"></image>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- <view style="margin:10px 0 5px;" class="flex-block">
         <text class="fjLable">收据</text> 
         <view class='content'>
           <view class='img-box'>
@@ -148,7 +209,7 @@
             <view class='img-list'>
               <block wx:for="{{qtPics}}"  wx:for-index="index" wx:key="index">
                 <view class='img-item'>
-                  <van-icon class="close-ico" data-id="{{index}}" name="/image/apply/img_delete.png" size="20px" data-status="qtPics"  bindtap="deleteimg"  />
+                  <van-icon class="close-ico" name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics"  bindtap="deleteimg"  />
                   <image src='{{item.file}}'  data-status="qtPics" bindtap="imgPreviewImage" class="imagea" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
                 </view>
               </block>
@@ -158,11 +219,18 @@
             </view>
           </view>
         </view>
-  </view>
+  </view> -->
 </view>
-<view class="main-box table-box" style="margin-top: 30rpx;">
+
+<view class="bottom">
+  <!-- <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view> -->
+  <view class="btn1" data-code="1" bindtap="swichAccounting">暂存</view>
+  <view class="btn2" data-code="2" bindtap="swichAccounting">提交</view>
+</view>
+
+<!-- <view class="main-box table-box" style="margin-top: 30rpx;">
     <view class="btn flex-block">
         <button type="primary" data-code="1"  bindtap="swichAccounting" plain="true">暂存</button>
         <button type="primary" data-code="2" bindtap="swichAccounting">提交</button>
     </view>
-</view>
+</view> -->

pages/index/index.wxml

@@ -72,15 +72,15 @@
     </view>
     <!--子导航功能导航-->
     <view class="child_function">
-        <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="showModal"><!--bindtap="navigate"-->
+        <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="navigate"><!--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" data-url="/pages/drawee/drawee"  bindtap="showModal"><!--bindtap="navigate"-->
+        <view class="flex_block" data-url="/pages/drawee/drawee"  bindtap="navigate"><!--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="flex_block" data-url="/pages/bank/bank" bindtap="navigate">
             <view class="image"><image class="attribute" src="../../image/index/child_function_07.png" mode="aspectFit"></image></view>
             <text class="desc">开户行</text>
         </view>

pages/payee/list/list.js

@@ -11,7 +11,10 @@ Page({
     isIPX: app.globalData.isIPX,
     list: {},
     result: "",
-    bankTypeOptions:[]
+    bankTypeOptions:[],
+    pageNum:1,
+    scrollHeight:'',
+    searchName:''
   },
 
   /**
@@ -22,13 +25,14 @@ Page({
     // 可优化：数据请求放到  onload中   新增后在子页面修改父页面数据
     var that = this;
     that.setData({
-      index:options.index
+      index:options.index,
+      scrollHeight:wx.getSystemInfoSync().windowHeight
     })
     var that = this;
       // 获取收款账号列表
       let prames = {
         pageNum:1,
-        pageSize:999,
+        pageSize:10,
         orderByColumn:'id',
         isAsc:'desc',
         status:'0',
@@ -48,12 +52,8 @@ Page({
           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({
@@ -69,10 +69,13 @@ Page({
   },
   goSearch(e){
     var that = this;
+    that.setData({
+      searchName:e.detail,
+    })
     // 获取收款账号列表
     let prames = {
       pageNum:1,
-      pageSize:999,
+      pageSize:10,
       orderByColumn:'id',
       isAsc:'asc',
       // isPeers:that.data.isPeers,//是否同行
@@ -82,7 +85,7 @@ Page({
       status:'0',
       name:e.detail,
       method:'GET'
-    }
+    } 
     console.log(prames);
     UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
       success: (res) => {
@@ -107,6 +110,46 @@ Page({
       }
     })
   },
+  paging(){
+    console.log('aaa')
+    var that = this;
+    that.setData({
+      pageNum:that.data.pageNum+1,
+    })
+    // 获取收款账号列表
+    let prames = {
+      pageNum:that.data.pageNum,
+      pageSize:10,
+      orderByColumn:'id',
+      isAsc:'desc',
+      status:'0',
+      method:'GET',
+      name:that.data.searchName,
+    }
+    UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, {
+      success: (res) => {
+        let array = res.rows ; 
+        var payeeType = that.data.payeeType;
+        var list = that.data.list;
+        var pagecount = res.total/10
+        if(that.data.pageNum>pagecount){
+          return;
+        }
+        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,
+        })
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -121,7 +164,6 @@ Page({
     
   },
   onChange(event) {
-    console.log(event);
     this.setData({
       result: event.detail,
     });
@@ -146,7 +188,6 @@ Page({
     }
     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;  //上一个页面

pages/payee/list/list.wxml

@@ -1,43 +1,45 @@
 <!--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>
+  <text style="top:{{isIPX?'54px':'30px'}};">收款人</text>
 </view>
+<scroll-view scroll-y refresher-threshold="0" style="height:{{scrollHeight}}px" bindscrolltolower="paging" lower-threshold="100">
+  <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>
 
-<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>
+</scroll-view>

project.private.config.json

@@ -101,6 +101,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "付款人列表",
+          "pathName": "pages/drawee/drawee",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "开户行",
+          "pathName": "pages/bank/bank",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

utils/API.js

@@ -67,7 +67,7 @@ const URL_GET_GETPROJECTLIST = `${URL_PREFIX}/yinnong/project/list`;
 const URL_GET_CONTRACTIONLIST = `${URL_PREFIX}/contraction/info/list`;
 
 //查询收款账号列表
-const URL_GET_SELECTLIST = `${URL_PREFIX}/yinnong/payee/selectlist`;
+const URL_GET_SELECTLIST = `${URL_PREFIX}/yinnong/payee/list`;
 
 //查询收款账号列表2
 const URL_GET_PAYEESELECTLIST = `${URL_PREFIX}/yinnong/payee/list`;
@@ -197,7 +197,20 @@ const URL_GET_GETCASHDETAILADD = `${URL_PREFIX}/yinnong/cashdetail/add`;
 //汇票、现金支出申请
 const URL_GET_GETCASHLISTCASGBYID = `${URL_PREFIX}/yinnong/cashdetail/listCashdetailByCashId/`;
 
+//增加收入流水
+const URL_POST_GERFLOWADD = `${URL_PREFIX}/cashier/flow/add`;
 
+//修改收入流水
+const URL_POST_GERFLOWEDIT = `${URL_PREFIX}/cashier/flow/edit`;
+
+//根据id获取 银行收支流水
+const URL_GET_FLOWGET = `${URL_PREFIX}/cashier/flow/get/`;
+
+//根据id获取关联合同
+const URL_GET_INFOGET = `${URL_PREFIX}/contraction/info/get/`;
+
+//根据id删除 银行收支流水
+const URL_GET_FLOWREMOVE = `${URL_PREFIX}/cashier/flow/remove/`;
 
 /****************接口地址end****************/
 
@@ -277,5 +290,10 @@ export {
     URL_GET_GETCASHSAVE,
     URL_GET_GETCASHDETAILADD,
     URL_GET_GETCASHLISTCASGBYID,
-    URL_GET_GETCASHDETAILEDIT
+    URL_GET_GETCASHDETAILEDIT,
+    URL_POST_GERFLOWADD,
+    URL_GET_FLOWGET,
+    URL_GET_INFOGET,
+    URL_POST_GERFLOWEDIT,
+    URL_GET_FLOWREMOVE
 }