接口

env/env.js

@@ -1,29 +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: 'https://dazu.nongshen.net/api',
+        URL_PREFIX: 'http://192.168.31.178/api',
   },
   PRE: {
-        URL_PREFIX: 'https://dazu.nongshen.net/api',
+        URL_PREFIX: 'http://192.168.31.178:8080/api',
   }, 
   PROD: {
-        URL_PREFIX: 'https://dazu.nongshen.net/api',
+        URL_PREFIX: 'http://192.168.31.178:8080/api',
   },
   IMGURL: {
-        URL_PREFIX: 'https://dazu.nongshen.net/api',
+        URL_PREFIX: 'http://192.168.31.178:8080',
   }
-}
+}
+
+// module.exports = {
+//   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/apply/paymentTemplate/add/add.js

@@ -721,6 +721,13 @@ Page({
       ["form.transfers["+event.currentTarget.dataset.index+"].activeName"]:event.detail
     });
   },
+  onClosePayee(event){
+    console.log("aaa");
+    this.setData({
+      ["form.transfers["+event.currentTarget.dataset.index+"].activeName"]:''
+    });
+    console.log(this.data.form.transfers[event.currentTarget.dataset.index]);
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/apply/paymentTemplate/add/add.wxml

@@ -55,7 +55,10 @@
               <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 }}">
+            <van-cell title="{{item.payeeList[0].payee}}" wx:if="{{form.transfers[index].payeeList.length < 2}}" 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>
+            <van-cell title="共{{form.transfers[index].payeeList.length}}条" wx:if="{{form.transfers[index].payeeList.length > 2}}" 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">
@@ -269,14 +272,16 @@
 
             <view class="main-box table-box payeeList" wx:if="{{form.transfers[index].payeeList.length > 1}}">
 
-              <van-collapse accordion value="{{ form.transfers[index].activeName }}" data-index="{{index}}" bind:change="onChangePayee">
-                <van-collapse-item title="{{ form.transfers[index].payeeList[childrenIndex].payee }}" value="￥{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" name="{{childrenIndex}}" wx:for="{{form.transfers[index].payeeList}}" wx:if="{{childrenIndex<10}}" wx:for-index="childrenIndex" wx:key="payeeId">
+              <van-collapse accordion value="{{ form.transfers[index].activeName }}" data-index="{{index}}" bind:change="onChangePayee" bind:close="onClosePayee">
+                <van-collapse-item name="{{childrenIndex}}" wx:for="{{form.transfers[index].payeeList}}" wx:if="{{childrenIndex<10}}" wx:for-index="childrenIndex" wx:key="payeeId">
 
-                  <van-field required readonly border="{{ false }}" input-align="right" is-link arrow-direction	="down" >
-                    <view slot="label" style="color: var(--field-label-color,#646566);">
-                      {{ form.transfers[index].payeeList[childrenIndex].payee }}<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">收款人</van-tag>
-                    </view>
-                  </van-field>
+                  <view slot="title">
+                    {{ form.transfers[index].payeeList[childrenIndex].payee }}<van-tag wx:if="{{ form.transfers[index].activeName == childrenIndex && form.transfers[index].activeName != '' }}" plain type="danger" color="#5CAE77" round style="margin-left:10px;">收款人</van-tag>
+                  </view>
+                  <view slot="value" wx:if="{{ form.transfers[index].activeName != childrenIndex }}">
+                    ￥{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}
+                  </view>
+                  
                   <van-field required readonly label="收款账号" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}"  border="{{ false }}"  input-align="right"/>
                   <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" border="{{ false }}"  input-align="right"/>
                   <van-field required readonly label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" border="{{ false }}"  input-align="right"/>

pages/bill/bill.wxml

@@ -5,7 +5,7 @@
 </view>
 
 <view class="search_box" style="margin-top:{{isIPX?'88px':'64px'}};">
-  <van-search
+  <van-search                   
     value="{{ value }}"
     shape="round"
     background="transparent"
@@ -79,7 +79,7 @@
   </view>
   <view slot="right" class="cell_right">
     <!-- <view class="button_box"><view></view></view> -->
-    <view class="button_box" bindtap="showTransactionDialog">
+    <view class="button_box" bindtap="showTransactionDialog">         
       <view bindtap="showReceiptDialog">
         <image src="/image/icon/icon_xg2.png" style="width: 20.55px;height: 20.55px;"></image>
         <text>修改</text>

pages/drawee/drawee.js

@@ -11,6 +11,7 @@ Page({
     show:false,
     accountList:[],
     approvalItemsOptions:[],
+    receiptOptions:[],
     bookName:'',
     accountListXJ:[],
     showDialog:false,
@@ -28,8 +29,18 @@ Page({
         }, 0);
       });
     },
+    index: 0,
     showTransactionDialog:false,
     showReceiptDialog:false,
+    showSelectType:false,
+    form:{
+      selectTypeText:'',
+      selectType:'',
+      directionText:'',
+      direction:'',
+      datescopeFrom:'',
+      datescopeTo:'',
+    }
   },
 
   /**
@@ -38,42 +49,193 @@ Page({
   onLoad: function (options) {
 
   },
-  showTransactionDialog(){
+  bindSelectTypePickerChange: function(e) {
+    var that = this;
+    var dictValue = that.data.selectTypeOptions[e.detail.value].dictValue;
+    var text = UTIL.getTransform(dictValue,that.data.selectTypeOptions);
+    this.setData({
+      ["form.selectTypeText"]: text,
+      ["form.selectType"]:dictValue
+    })
+  },
+  bindDirectionPickerChange: function(e) {
+    var that = this;
+    var dictValue = that.data.directionOptions[e.detail.value].dictValue;
+    var text = UTIL.getTransform(dictValue,that.data.directionOptions);
+    this.setData({
+      ["form.directionText"]: text,
+      ["form.direction"]:dictValue
+    })
+  },
+  bindReceiptPickerChange: function(e) {
+    var that = this;
+    var dictValue = that.data.receiptOptions[e.detail.value].dictValue;
+    var text = UTIL.getTransform(dictValue,that.data.receiptOptions);
+    this.setData({
+      ["form.directionText"]: text,
+      ["form.direction"]:dictValue
+    })
+  },
+  bindDatescopeFromPickerChange: function(e) {
+    console.log(e);
+    var that = this;
+    that.setData({
+      ["form.datescopeFrom"]: e.detail.value,
+    })
+  },
+  bindDatescopeToPickerChange: function(e) {
+    console.log(e);
+    var that = this;
+    that.setData({
+      ["form.datescopeTo"]: e.detail.value,
+    })
+  },
+  onChange(e){
+    var that = this;
+    console.log(e);
+    that.setData({
+      [e.currentTarget.dataset.name]: e.detail,
+    })
+  },
+  selectAccount(){
+    console.log(this.data.form)
+    var that = this ;
+    const form = that.data.form;
+    if(form.selectType == ''){
+      UTIL.showToastNoneIcon('请选择查询类型！');
+      return;
+    }else if(form.direction == ''){
+      UTIL.showToastNoneIcon('请选择来往账标识！');
+      return;
+    }else if(form.datescopeFrom == ''){
+      UTIL.showToastNoneIcon('请选择开始日期！');
+      return;
+    }else if(form.datescopeTo == ''){
+      UTIL.showToastNoneIcon('请选择截止日期！');
+      return;
+    }
+    that.data.form.method = "POST"
+    UTIL.showLoadingHaveMask('正在查询');
+    UTIL.httpRequest(API.URL_GET_SELECTRECORD, that.data.form, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询成功',
+            icon: 'success',
+            duration: 2000,
+          })
+        }else{
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询失败',
+            icon: 'error',
+            duration: 2000,
+          })
+        }
+      }
+    })
+
+  },
+  bankReceipt(){
+    console.log(this.data.form)
+    var that = this ;
+    const form = that.data.form;
+    if(form.selectType == ''){
+      UTIL.showToastNoneIcon('请选择查询类型！');
+      return;
+    }else if(form.direction == ''){
+      UTIL.showToastNoneIcon('请选择来往账标识！');
+      return;
+    }else if(form.datescopeFrom == ''){
+      UTIL.showToastNoneIcon('请选择开始日期！');
+      return;
+    }else if(form.datescopeTo == ''){
+      UTIL.showToastNoneIcon('请选择截止日期！');
+      return;
+    }
+
+    that.data.form.method = "GET"
+    UTIL.showLoadingHaveMask('正在查询');
+    UTIL.httpRequest(API.URL_GET_SELECTBANKRECEIPT, that.data.form, {
+      success: (res) => {
+        if (res.code == API.SUCCESS_CODE) {
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询成功',
+            icon: 'success',
+            duration: 2000,
+          })
+        }else{
+          UTIL.hideLoadingHaveMask();
+          wx.showToast({
+            title: '查询失败',
+            icon: 'error',
+            duration: 2000,
+          })
+        }
+      }
+    })
+
+  },
+  showTransactionDialog(e){
     var that = this;
     that.setData({
-      showTransactionDialog:true
+      form:{
+        selectTypeText:'',
+        selectType:'',
+        directionText:'',
+        direction:'',
+        datescopeFrom:'',
+        datescopeTo:'',
+      }
+    })
+    that.setData({
+      showTransactionDialog:true,
+      ["form.accountId"]:e.currentTarget.dataset.id
     })
   },
-  showReceiptDialog(){
+  showReceiptDialog(e){
     var that = this;
     that.setData({
-      showReceiptDialog:true
+      form:{
+        selectTypeText:'',
+        selectType:'',
+        directionText:'',
+        direction:'',
+        datescopeFrom:'',
+        datescopeTo:'',
+      }
+    })
+    that.setData({
+      showReceiptDialog:true,
+      ["form.accountId"]:e.currentTarget.dataset.id
     })
   },
-  goRegular(){
+  goRegular(e){
     wx.navigateTo({
-      url: '/pages/regular/regular',
+      url: '/pages/regular/regular?id='+e.currentTarget.dataset.id,
     })
   },
    //跳转支出申请
-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({
+  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,
+  openBox(even){
+    console.log(even.currentTarget.dataset.name);
+    this.setData({
+      [even.currentTarget.dataset.name]:true
     })
   },
   closeBox:function(){
@@ -160,6 +322,27 @@ swichPaymentApply:function(e){
         });
       }
     })
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'select_type', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          selectTypeOptions:res.data
+        });
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'direction', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          directionOptions:res.data
+        });
+      }
+    })
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'receipt_trans_type', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          receiptOptions:res.data
+        });
+      }
+    })
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {

pages/drawee/drawee.json

@@ -10,6 +10,8 @@
     "van-tag": "@vant/weapp/tag/index",
     "van-dialog": "@vant/weapp/dialog/index",
     "van-empty": "@vant/weapp/empty/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-picker": "@vant/weapp/picker/index",
     "van-field": "@vant/weapp/field/index"
   }
 }

pages/drawee/drawee.wxml

@@ -38,19 +38,19 @@
           </view>
           <view slot="right" class="cell_right">
             <view class="button_box"><view></view></view>
-            <view class="button_box" bindtap="showTransactionDialog">
+            <view class="button_box" data-id="{{item.id}}" bindtap="showTransactionDialog">
               <view>
                 <image src="/image/icon/icon_mx.png" style="width: 15px;height: 17px;"></image>
                 <text>明细</text>
               </view>
             </view>
-            <view class="button_box" bindtap="goRegular">
+            <view class="button_box" data-id="{{item.id}}" bindtap="goRegular">
               <view>
                 <image src="/image/icon/icon_dq.png" style="width: 15px;height: 17px;"></image>
                 <text>定期</text>
               </view>
             </view>
-            <view class="button_box" bindtap="showReceiptDialog">
+            <view class="button_box" data-id="{{item.id}}" bindtap="showReceiptDialog">
               <view>
                 <image src="/image/icon/icon_hd.png" style="width: 15px;height: 17px;"></image>
                 <text>回单</text>
@@ -143,18 +143,55 @@
   theme='round-button'
   confirmButtonText="查询"
   data-type="1"
-  bind:confirm="edit"
+  bind:confirm="selectAccount"
   before-close="{{beforeClose }}"
   closeOnClickOverlay="{{ true }}"
 >
   <!-- <image src="/image/icon/icon_delete.png" style="width: 20px; height: 20px;position: absolute;top: 0;"></image> -->
   <view style="text-align: center;padding: 20px;border-bottom: 1px dashed #e6e6e6;width: 92%;margin: 0 auto;color: #2C8E68;font-size: 18px;">查询交易明细参数</view>
-  <van-field value="{{ value }}" required label="查询类型" placeholder="请选择查询类型" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="来往账标识" placeholder="请选择来往账标识" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="开始日期" placeholder="请选择开始日期" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="截止日期" placeholder="请选择截止日期" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" label="下限" placeholder="请输入下限" input-align="right" bind:change="onChange" />
-  <van-field value="{{ value }}" label="上限" placeholder="请输入上限" input-align="right" bind:change="onChange" />
+
+  <van-cell title="查询类型" required is-link arrow-direction="down">
+    <view>
+      <picker bindchange="bindSelectTypePickerChange" range="{{selectTypeOptions}}" data-name="selectType" range-key="dictLabel">
+        <view class="picker">
+          <text>{{form.selectTypeText == '' ? '请选择查询类型':form.selectTypeText}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="来往账标识" required is-link arrow-direction="down">
+    <view>
+      <picker bindchange="bindDirectionPickerChange" range="{{directionOptions}}" data-name="direction" range-key="dictLabel">
+        <view class="picker">
+          <text>{{form.directionText == '' ? '请选择来往账标识':form.directionText}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="开始日期" required is-link arrow-direction="down">
+    <view>
+      <picker mode="date" bindchange="bindDatescopeFromPickerChange">
+        <view class="picker">
+          <text>{{form.datescopeFrom == '' ? '请选择开始日期':form.datescopeFrom}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="截止日期" required is-link arrow-direction="down">
+    <view>
+      <picker mode="date" bindchange="bindDatescopeToPickerChange">
+        <view class="picker">
+          <text>{{form.datescopeTo == '' ? '请选择截止日期':form.datescopeTo}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+ 
+  <van-field value="{{ form.amountscopeFrom }}" label="下限" placeholder="请输入下限" input-align="right" data-name="form.amountscopeFrom" bind:change="onChange" />
+  <van-field value="{{ form.amountscopeTo }}" label="上限" placeholder="请输入上限" input-align="right" data-name="form.amountscopeTo" bind:change="onChange" />
 </van-dialog>
 
 <van-dialog
@@ -164,19 +201,57 @@
   theme='round-button'
   confirmButtonText="查询"
   data-type="1"
-  bind:confirm="edit"
+  bind:confirm="bankReceipt"
   before-close="{{beforeClose}}"
   closeOnClickOverlay="{{ true }}"
 >
   <!-- <image src="/image/icon/icon_delete.png" style="width: 20px; height: 20px;position: absolute;top: 0;"></image> -->
   <view style="text-align: center;padding: 20px;border-bottom: 1px dashed #e6e6e6;width: 92%;margin: 0 auto;color: #2C8E68;font-size: 18px;">查询回单明细参数</view>
-  <van-field value="{{ value }}" required label="查询类型" placeholder="请选择查询类型" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="业务类型" placeholder="请选择业务类型" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="开始日期" placeholder="请选择开始日期" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
-  <van-field value="{{ value }}" required label="截止日期" placeholder="请选择截止日期" input-align="right" is-link arrow-direction="down" bind:change="onChange" />
+  
+  <van-cell title="查询类型" required is-link arrow-direction="down">
+    <view>
+      <picker bindchange="bindSelectTypePickerChange" range="{{selectTypeOptions}}" data-name="selectType" range-key="dictLabel">
+        <view class="picker">
+          <text>{{form.selectTypeText == '' ? '请选择查询类型':form.selectTypeText}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="业务类型" required is-link arrow-direction="down">
+    <view>
+      <picker bindchange="bindReceiptPickerChange" range="{{receiptOptions}}" data-name="direction" range-key="dictLabel">
+        <view class="picker">
+          <text>{{form.directionText == '' ? '请选择业务类型':form.directionText}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="开始日期" required is-link arrow-direction="down">
+    <view>
+      <picker mode="date" bindchange="bindDatescopeFromPickerChange">
+        <view class="picker">
+          <text>{{form.datescopeFrom == '' ? '请选择开始日期':form.datescopeFrom}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
+  <van-cell title="截止日期" required is-link arrow-direction="down">
+    <view>
+      <picker mode="date" bindchange="bindDatescopeToPickerChange">
+        <view class="picker">
+          <text>{{form.datescopeTo == '' ? '请选择截止日期':form.datescopeTo}}</text>
+        </view>
+      </picker>
+    </view>
+  </van-cell>
+
 </van-dialog>
 <view class="ipXbtn"></view>
 
+
 <wxs module="iOf">
   var indexOf = function(name,value){
     return name.indexOf(value);

pages/drawee/drawee.wxss

@@ -226,4 +226,7 @@
 }
 .button_box view text{
   display: block;
+}
+.picker{
+  text-align: right;
 }

pages/paymentManager/paymentManager.js

@@ -180,6 +180,11 @@ Page({
     this.getList();
   },
   toPay(e){
+    wx.navigateTo({
+      url: '/pages/paymentManager/toPay/toPay?id='+e.currentTarget.dataset.ids
+    })
+  },
+  toPayDetail(e){
     wx.navigateTo({
       url: '/pages/pay/detail?id='+e.currentTarget.dataset.id+'&&ids='+e.currentTarget.dataset.ids,
     })

pages/paymentManager/paymentManager.wxml

@@ -9,8 +9,8 @@
   <van-dropdown-item value="{{ value3 }}" options="{{ option3 }}" bind:change="changeTab2" />
 </van-dropdown-menu>
 <scroll-view scroll-y refresher-threshold="0" style="height:{{scrollHeight}}px" bindscrolltolower="paging" lower-threshold="100">
-<van-swipe-cell right-width="{{ 50 }}" class="workflow" wx:for="{{list}}" wx:key="index" wx:for-item="item" >
-  <view class="li" >
+<van-swipe-cell right-width="{{ 50 }}" class="workflow" wx:for="{{list}}" wx:key="index" wx:for-item="item">
+  <view class="li" data-id="{{item.approvalItemTemplateId}}" data-ids="{{item.id}}" bindtap="toPayDetail" >
     <view style="width:70%;flex:7;">
       <view class="tit_box">
         <image src="/image/icon/paymentManager_icon.png" style="width: 15px;height: 15px;margin-right: 10px;"  referrer="no-referrer|origin|unsafe-url"></image>

pages/regular/regular.js

@@ -20,7 +20,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    var that = this;
+    let sendData = {
+      pageNum:1,
+      pageSize:10,
+      taccountId:options.id,
+      method:'GET'
+    };
+    UTIL.httpRequest(API.URL_GET_QUERYFIXEDTIMEDEPOSIT, sendData,{
+      success: (res) => {
+        that.setData({
+          list:res.rows
+        })
+      }
+    })
   },
   back:function(){
     wx.navigateBack({
@@ -33,12 +46,11 @@ Page({
   onReady() {
 
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    
   },
 
   /**

pages/regular/regular.wxml

@@ -1,49 +1,49 @@
 <!--pages/regular/index.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
   <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
-  <text style="top:{{isIPX?'54px':'30px'}};">支出管理</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">定期存款</text>
 </view>
 
 <scroll-view scroll-y refresher-threshold="0" style="height:100%" bindscrolltolower="paging" lower-threshold="100" style="margin-top:{{isIPX?'98px':'74px'}};">
   <!-- wx:for="{{list}}" wx:key="index" wx:for-item="item" right-width="{{ 50 }}" -->
-<van-swipe-cell class="workflow" wx:for="{{5}}" >
+<van-swipe-cell class="workflow" wx:for="{{list}}" >
   <view class="li" >
     <view style="width:70%;flex:7;">
       <view class="tit_box">
-        <text class="tit">产品名称产品名称</text>
-        <text class="tit_tab2">活动</text>
+        <text class="tit">{{item.pdtName}}</text>
+        <text class="tit_tab2">{{item.recSts}}</text>
       </view>
       <view class="detail_box">
         <view style="margin-left:5%;color:grey;font-size: 12px;justify-content: space-between;display: contents;">
-          <text>账号：5001010120010492253</text>
+          <text>账号：{{item.acctNo}}</text>
           <text class="tit_tab">钞</text> 
         </view>
         <view class="ll_box">
           <image src="/image/icon/icon_ll.png" style="width: 17px;height: 14px;"></image>
           <text>利率</text>
-          <text style="color: #E90000;">6%</text>
+          <text style="color: #E90000;">{{item.acctIntr}}%</text>
         </view>
       </view>
       <view class="money_box">
         <view>
           <text>定期余额（元）</text>
-          <text style="color: #E90000;font-size: 22px;margin-top: 10px;">150.00</text>
+          <text style="color: #E90000;font-size: 22px;margin-top: 10px;">{{item.tdAcctBal}}</text>
           <view style="display: flex;align-items: center;margin-top: 10px;">
             <image src="/image/icon/clock_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;"></image>
-            <text>2021.09.01</text>
+            <text>{{item.opacIntsDt}}</text>
           </view>
         </view>
         <view>
           <text>可用余额（元）</text>
-          <text style="color: #5CAE77;font-size: 22px;margin-top: 10px;">150.00</text>
+          <text style="color: #5CAE77;font-size: 22px;margin-top: 10px;">{{item.avlAmt}}</text>
           <view style="display: flex;align-items: center;margin-top: 10px;">
             <image src="/image/icon/clock_red_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;"></image>
-            <text>2021.11.30</text>
+            <text>{{item.dueDt}}</text>
           </view>
         </view>
         <view>
           <text>存期（天）</text>
-          <text style="color: #444444;font-size: 22px;margin-top: 10px;">90</text>
+          <text style="color: #444444;font-size: 22px;margin-top: 10px;">{{item.depPrdN}}</text>
         </view>
       </view>
     </view>

pages/transferAccounts/transferAccounts.js

@@ -14,37 +14,139 @@ Page({
    */
   data: {
     isIPX: app.globalData.isIPX,
-    option1: [
-      { text: '收支类型', value: '' },
-      { text: '待支付', value: '1' },
-      { text: '银行受理', value: '3' },
-      { text: '支付失败', value: '4' },
-      { text: '部分失败', value: '5' },
-    ],
-    option2: [
-      { text: '结算方式', value: '' },
-      { text: '结算类', value: '1' },
-      { text: '工程项目类', value: '2' },
-      { text: '合同类', value: '4' },
-      { text: '其他', value: '5' },
-    ],
-    option3: [
-      { text: '票据状态', value: '' },
-      { text: '银行卡转账', value: '1' },
-      { text: '信用卡还款', value: '2' },
-    ],
+    option1: [],
+    option2: [],
+    option3: [],
     value1: '',
     value2: '',
     value3: '',
     showPopup:false,
-    result:[]
+    result1:'',
+    result2:'',
+    result3:'',
+    beginApplyDate:'' , //申请开始时间
+    endApplyDate: '' ,  //申请结束时间
+    txnamtMin: '' , //金额范围 最小
+    xnamtMax: '' , //金额范围最大
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    var that = this;
+    // 业务类型字典查询
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'trans_type', {method:'GET'}, {
+      success: (res) => {
+        let option2 = [{
+          text: '业务类型', value: ''
+        }];
+        res.data.map(rr=>{
+          option2.push({
+            text: rr.dictLabel, value: rr.dictValue
+          })
+        })
+        that.setData({
+          option2:option2,
+          transTypeOptions:res.data,
+        })
+      }
+    })
+    // 来往账标识字典查询
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'direction', {method:'GET'}, {
+      success: (res) => {
+        let option3 = [];
+        res.data.map(rr=>{
+          option3.push({
+            text: rr.dictLabel, value: rr.dictValue
+          })
+        })
+        option3[0].text = '来往账标识';
+        that.setData({
+          option3:option3,
+          value3:res.data[0].dictValue,
+          result3:res.data[0].dictValue,
+          directionOptions:res.data,
+        })
+      }
+    })
+    var sendData = {
+      pageNum:'1',
+      pageSize:'100',
+      accountName:'',
+      bankAccountNumber:'',
+      status:'N',
+      method:'GET',
+      accountType:102
+    }
+
+    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{
+      success: (res) => {
+          console.log(res.rows)
+
+          let option1 = [];
+          res.rows.map(rr=>{
+            console.log(rr);
+            option1.push({
+              text: rr.accountName, value: rr.bankAccountNumber
+            })
+          })
 
+          that.setData({
+            option1:option1,
+            value1:res.rows[0].bankAccountNumber,
+            result1:res.rows[0].bankAccountNumber,
+            accountList:res.rows
+          })
+          let perames = {method:'GET',actacn:res.rows[0].bankAccountNumber}
+          //转账列表
+          UTIL.httpRequest(API.URL_GET_GETRECONCILIATION , perames, {
+            success: (res) => {
+              that.setData({
+                list:res.rows
+              })
+            }
+          })
+      }
+    })
+  },
+  goSubmit(){
+    var that = this ;
+    let form = {
+      actacn:that.data.result1 , //付款账户
+      payeeActacn: '' , //收款账号
+      payeeToname:'' ,  //收款人
+      transtype:that.data.result2 ,//  业务类型 数据字典：trans_type  
+      direction:that.data.result3 ,// 来往账标识 数据字典：direction  
+      params:new Map([
+        ['beginApplyDate', that.data.beginApplyDate],
+        ['endApplyDate', that.data.endApplyDate],
+        ['txnamtMin', that.data.txnamtMin],
+        ['xnamtMax', that.data.xnamtMax],
+      ]),
+      method:'POST',
+    }
+    console.log(form);
+    UTIL.httpRequest(API.URL_GET_GETRECONCILIATIONMOBILE , form, {
+      success: (res) => {
+        that.setData({
+          list:res.rows,
+          showPopup:false
+        })
+      }
+    })
+  },
+  bindDateBeginChange: function(e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      beginApplyDate: e.detail.value
+    })
+  },
+  bindDateEndChange: function(e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      endApplyDate: e.detail.value
+    })
   },
   back:function(){
     wx.navigateBack({
@@ -60,12 +162,54 @@ Page({
   onClose() {
     this.setData({ showPopup: false });
   },
-  onChange(event) {
+  onChangeZH(event) {
     console.log(event.detail);
     this.setData({
-      result: event.detail,
+      result1: event.detail,
     });
   },
+  onChangeLX(event) {
+    console.log(event.detail);
+    this.setData({
+      result2: event.detail,
+    });
+  },
+  onChangeBS(event) {
+    console.log(event.detail);
+    this.setData({
+      result3: event.detail,
+    });
+  },
+  changeTab1(event){
+    this.setData({
+      result1: event.detail,
+      value1: event.detail
+    });
+  },
+  changeTab2(event){
+    this.setData({
+      result2: event.detail,
+      value2: event.detail
+    });
+  },
+  changeTab3(event){
+    this.setData({
+      result3: event.detail,
+      value3: event.detail
+    });
+  },
+  minInput(e){
+    var that = this ;
+    that.setData({
+      txnamtMin: e.detail.value, //金额范围 最小
+    })
+  },
+  maxInput(e){
+    var that = this ;
+    that.setData({
+      xnamtMax: e.detail.value, //金额范围最大
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/transferAccounts/transferAccounts.wxml

@@ -9,55 +9,55 @@
     value="{{ value }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入付款账户搜索"
     clearable
     bind:change="goSearch"
   />
   <view class="add_btn" bindtap="goAdd"><text>新增</text></view>
 </view>
 <view class="top_view">
-  <van-dropdown-menu active-color="#5CAE77" bind:change="changeTab" id="top_view1" style="flex: 1;">
-    <van-dropdown-item value="{{ value1 }}" options="{{ option1 }}" bind:change="changeTab" />
+  <van-dropdown-menu active-color="#5CAE77" bind:change="changeTab" id="top_view1" style="width: 82%;">
+    <van-dropdown-item value="{{ value1 }}" options="{{ option1 }}" bind:change="changeTab1" />
     <van-dropdown-item value="{{ value2 }}" options="{{ option2 }}" bind:change="changeTab2" />
-    <van-dropdown-item value="{{ value3 }}" options="{{ option3 }}" bind:change="changeTab2" />
+    <van-dropdown-item value="{{ value3 }}" options="{{ option3 }}" bind:change="changeTab3" />
   </van-dropdown-menu>
   <view class="sx_view" bindtap="showPopup">
-    <text>筛选</text>
+    <text style="flex-shrink: 0;">筛选</text>
     <image src="/image/icon/icon_sx.png" style="width: 15px;height: 15px;margin-left: 5px;"></image>
   </view>
 </view>
 <scroll-view scroll-y refresher-threshold="0" style="height:100%" bindscrolltolower="paging" lower-threshold="100">
   <!-- wx:for="{{list}}" wx:key="index" wx:for-item="item" right-width="{{ 50 }}" -->
-<van-swipe-cell right-width="{{ 195 }}" class="workflow" wx:for="{{5}}" >
+<van-swipe-cell right-width="{{ 195 }}" class="workflow" wx:for="{{list}}" wx:key="index" >
   <view class="li" >
     <view style="width:70%;flex:7;">
       <view class="tit_box">
         <image src="/image/icon/icon_fu16.png" style="width: 16px;height: 16px;margin-right: 10px;"  referrer="no-referrer|origin|unsafe-url"></image>
         <view>
-          <text class="tit">龙华村联合社华</text>
-          <text class="tit">5001010120010472253</text>
+          <text class="tit">{{item.payer}}</text>
+          <text class="tit">{{item.payerAccount}}</text>
         </view>
         <text class="tit_tab2">人工确认</text>
       </view>
       <view class="tit_box">
         <image src="/image/icon/icon_yn.png" style="width: 16px;height: 36px;margin-right: 10px;"  referrer="no-referrer|origin|unsafe-url"></image>
         <view>
-          <text class="tit">龙华村联合社华</text>
-          <text class="tit">5001010120010472253</text>
+          <text class="tit">{{item.payee}}</text>
+          <text class="tit">{{item.payeeAccount}}</text>
         </view>
-        <text class="tit_tab3 red">￥150.00</text>
+        <text class="tit_tab3 red">￥{{item.incomeAmount}}</text>
       </view>
       <view class="tit_box">
         <image src="/image/icon/icon_yh.png" style="width: 16px;height: 36px;margin-right: 10px;"  referrer="no-referrer|origin|unsafe-url"></image>
         <view>
-          <text class="tit">龙华村联合社华</text>
-          <text class="tit">5001010120010472253</text>
+          <text class="tit">{{item.payeeToname}}</text>
+          <text class="tit">{{item.payeeActacn}}</text>
         </view>
-        <text class="tit_tab3 green">￥150.00</text>
+        <text class="tit_tab3 green">￥{{item.txnamt}}</text>
       </view>
       <view style="display: flex;align-items: center;margin-top: 10px;">
         <image src="/image/icon/clock_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;"></image>
-        <text style="color: #878787;line-height: 1;">2021.09.01</text>
+        <text style="color: #878787;line-height: 1;">{{item.applyTime}}</text>
       </view>
       
     </view>
@@ -134,134 +134,54 @@
   <view class="sx_box" style="margin-top:{{isIPX?'88px':'64px'}};">
     <text class="sx_tit">我方账户</text>
 
-    <van-checkbox-group value="{{ result }}" bind:change="onChange">
-      <van-checkbox use-icon-slot name="a">
-        <view slot="icon" class="{{iOf.indexOf(result,'a') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          乳山市徐家镇农村财务
+    <van-radio-group value="{{ result1 }}" bind:change="onChangeZH">
+      <van-radio use-icon-slot name="{{item.bankAccountNumber}}" wx:for="{{accountList}}" wx:key="index">
+        <view slot="icon" class="{{result1 == item.bankAccountNumber ? 'ys_checkbox_icon':'checkbox_icon'}}">
+          {{item.accountName}}
         </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="b">
-        <view slot="icon" class="{{iOf.indexOf(result,'b') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          重庆农商行
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          村级虚拟账户
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          张村基本账户
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          威海临港经济技术开发区草庙子镇毕家庄股份经济合作社
-        </view>
-      </van-checkbox>
-    </van-checkbox-group>
+      </van-radio>
+    </van-radio-group>
 
     <text class="sx_tit">业务类型</text>
 
-    <van-checkbox-group value="{{ result }}" bind:change="onChange">
-      <van-checkbox use-icon-slot name="a">
-        <view slot="icon" class="{{iOf.indexOf(result,'a') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          国内汇票
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="b">
-        <view slot="icon" class="{{iOf.indexOf(result,'b') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          国外汇票
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          人行大额
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          人行小额
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          现金存款
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          转账收入
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          汇票
+    <van-radio-group value="{{ result2 }}" bind:change="onChangeLX">
+      <van-radio use-icon-slot name="{{item.value}}" wx:for="{{option2}}" wx:key="index" >
+        <view slot="icon" class="{{result2 == item.value ? 'ys_checkbox_icon':'checkbox_icon'}}">
+          {{item.text}}
         </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          本票
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          支票
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          冲账
-        </view>
-      </van-checkbox>
-    </van-checkbox-group>
+      </van-radio>
+    </van-radio-group>
      
     <text class="sx_tit">来往帐标识</text>
 
-    <van-checkbox-group value="{{ result }}" bind:change="onChange">
-      <van-checkbox use-icon-slot name="a">
-        <view slot="icon" class="{{iOf.indexOf(result,'a') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          全部
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="b">
-        <view slot="icon" class="{{iOf.indexOf(result,'b') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          来账/汇入
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          往账/汇出
+    <van-radio-group value="{{ result3 }}" bind:change="onChangeBS">
+      <van-radio use-icon-slot name="{{item.value}}" wx:for="{{option3}}" wx:key="index" >
+        <view slot="icon" class="{{result3 == item.value ? 'ys_checkbox_icon':'checkbox_icon'}}">
+          {{item.text}}
         </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          外部交易
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          内部往来
-        </view>
-      </van-checkbox>
-      <van-checkbox use-icon-slot name="c">
-        <view slot="icon" class="{{iOf.indexOf(result,'c') > -1 ? 'ys_checkbox_icon':'checkbox_icon'}}">
-          部分内部往来
-        </view>
-      </van-checkbox>
-    </van-checkbox-group>
+      </van-radio>
+    </van-radio-group>
 
     <text class="sx_tit">金额范围</text>
     
     <view class="sx_input_box">
-      <input placeholder="最低价" /><text> - </text><input placeholder="最高价" />
+      <input placeholder="最低价" value="{{txnamtMin}}" bindinput="minInput" /><text> - </text><input placeholder="最高价" value="{{xnamtMax}}" bindinput="maxInput" />
     </view>
 
     <text class="sx_tit">交易日期</text>
 
     <view class="sx_input_box">
-      <input placeholder="开始日期" /><text> - </text><input placeholder="结束日期" />
+      <picker mode="date" value="{{beginApplyDate}}" bindchange="bindDateBeginChange">
+        <view class="picker">
+          <input disabled placeholder="开始日期" value="{{beginApplyDate}}" />
+        </view>
+      </picker>
+      <text> - </text>
+      <picker mode="date" value="{{endApplyDate}}" bindchange="bindDateEndChange">
+        <view class="picker">
+          <input disabled placeholder="结束日期" value="{{endApplyDate}}" />
+        </view>
+      </picker>
     </view>
 
 

pages/transferAccounts/transferAccounts.wxss

@@ -354,6 +354,7 @@ text{display: block;}
   display: flex;
   align-items: center;
   padding: 0 3%;
+  width: 18%;
 }
 .sx_box{
   padding: 3% 5%;
@@ -365,6 +366,7 @@ text{display: block;}
   border-radius: 1rem;
   border:1px solid #F6F6F6;
   margin-top: 10px;
+  font-size: 14px;
 }
 .ys_checkbox_icon{
   background-color: rgba(92, 174, 119, 0.3);
@@ -374,8 +376,9 @@ text{display: block;}
   border:1px solid #5CAE77;
   color: #5CAE77;
   margin-top: 10px;
+  font-size: 14px;
 }
-.van-checkbox-group{
+.van-radio-group{
   display: flex;
   flex-wrap: wrap;
 }

project.private.config.json

@@ -191,5 +191,5 @@
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "WXMB",
-  "libVersion": "2.23.4"
+  "libVersion": "2.24.5"
 }

utils/API.js

@@ -387,6 +387,22 @@ const URL_GET_MAJOREVENTDELETE= `${URL_PREFIX}/yinnong/majorevent/remove/`;
 //重大事项提交
 const URL_GET_MAJOREVENTSUBMIT= `${URL_PREFIX}/yinnong/majorevent/customSubmit/`;
 
+//村级账户交易明细查询
+const URL_GET_SELECTRECORD= `${URL_PREFIX}/yinnong/transfer/addRecordAccount`;
+
+//村级账户回单查询
+const URL_GET_SELECTBANKRECEIPT= `${URL_PREFIX}/yinnong/receipt/bankReceipt`;
+
+//村级账户定期存款列表查询
+const URL_GET_QUERYFIXEDTIMEDEPOSIT= `${URL_PREFIX}/yinnong/transfer/queryFixedTimeDeposit`;
+
+//银行转账对账
+const URL_GET_GETRECONCILIATION= `${URL_PREFIX}/yinnong/recordDetail/getReconciliation`;
+
+//银行转账对账
+const URL_GET_GETRECONCILIATIONMOBILE= `${URL_PREFIX}/yinnong/recordDetail/getReconciliationMobile`;
+
+
 
 /****************接口地址end****************/
 
@@ -530,5 +546,10 @@ export {
     URL_POST_MAJOREVENTADD,
     URL_POST_MAJOREVENTUPDATE,
     URL_GET_MAJOREVENTDELETE,
-    URL_GET_MAJOREVENTSUBMIT
+    URL_GET_MAJOREVENTSUBMIT,
+    URL_GET_SELECTRECORD,
+    URL_GET_SELECTBANKRECEIPT,
+    URL_GET_QUERYFIXEDTIMEDEPOSIT,
+    URL_GET_GETRECONCILIATION,
+    URL_GET_GETRECONCILIATIONMOBILE
 }