支出申请

pages/apply/index.js

@@ -47,9 +47,9 @@ swichPaymentApply:function(e){
       show: false,
     })
   },
-  goTemplate:function(){
+  goTemplate:function(e){
     wx.navigateTo({
-      url: 'paymentTemplate/paymentTemplate'
+      url: 'paymentTemplate/paymentTemplate?id='+e.currentTarget.dataset.id
     })
   },
 

pages/apply/index.wxml

@@ -13,31 +13,22 @@
 <view class="main">
   <van-tabs sticky color="#000">
     <van-tab title="银行账户">
-      <view class="bank_box">
-        <text class="zt">一般户</text>
-        <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
-        <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">
-          <image src="../../image/apply/jsyh_icon.png" style="width: 28%;"  mode="widthFix"></image>
-          <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>
-
-      <view class="bank_box">
+      <view class="bank_box" wx:for="{{accountList}}" wx:key="index">
         <text class="zt">一般户</text>
-        <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
         <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">
-          <image src="../../image/apply/jsyh_icon.png" style="width: 28%;"  mode="widthFix"></image>
-          <view style="margin-bottom: 2vh;">6217 0021 9000 7972 186<text>卡号</text></view> 
+        <view class="bank_content {{item.bankType == 1 ? 'ICBC':item.bankType == 2 ? '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>
+          </view>
+          
+          <view style="margin-top: 2vh;">{{item.bankAccountNumber}}<text>卡号</text></view> 
           <view>可用余额</view> 
-          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">10,288.83</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">{{item.balance}}</view> 
         </view>
       </view>
-
     </van-tab>
+
     <van-tab title="公务卡">
     
       <view class="bank_box">
@@ -63,7 +54,7 @@
 <van-action-sheet show="{{show}}" title="支付模板" bind:close="closeBox">
   <van-swipe-cell right-width="{{ 65 }}" wx:for="{{approvalItemsOptions}}" wx:key="index">
     <van-cell-group>
-      <van-cell label="{{item.approvalItems}}" bindtap="goTemplate"  >
+      <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>

pages/apply/index.wxss

@@ -26,7 +26,7 @@
   color: #fff;
 }
 .main{
-  width: 94%;
+  width: 100%;
   margin: 0 auto;
   margin-top: 3vw;
 }
@@ -37,13 +37,38 @@
 
 .bank_content{
   color: #fff;
-  background:linear-gradient(to right, #176AB7, #318DE5);
   width: 100%;
-  border-radius: 10px;
-  /* height: 100%; */
-  padding: 2vh 2vh 3vh;
+  padding: 2vh;
+}
+
+.ICBC{
+  background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.ABC{
+  background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.CCB{
+  background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center;
+  background-size: 100% 100%;
+}
+.RCB{
+  background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center;
+  background-size: 100% 100%;
 }
 
+.bankName{
+  margin-top: 0!important;
+}
+.bankName image{
+  vertical-align: middle;
+  margin-right: 5px;
+}
+.bankName text{
+  margin: 0!important;
+  display: inline-block;
+}
 .bank_content view{
   margin-top: 1vh;
 }
@@ -55,6 +80,11 @@
 
 .bank_box{
   position: relative;
+  box-shadow: 0px 5px 9px #ccc;
+  overflow: hidden;
+  border-radius: 15px;
+  width: 94%;
+  margin: 0 auto;
   margin-top: 20px;
 }
 .zt {

pages/apply/paymentTemplate/add/add.js

@@ -520,8 +520,13 @@ Page({
                 'Authorization':'Bearer '+getApp().globalData.userInfo.token
               },
               formData:element,
-              success (res){
+              success (response){
                 console.log(res);
+                if((i+1) == that.data.fileForm.length){
+                  wx.navigateTo({
+                    url: '/pages/apply/approval/approval?id='+res.data.id,
+                  })
+                }
               },
               fail(res){
                 console.log(res)

pages/apply/paymentTemplate/paymentTemplate.js

@@ -1,4 +1,6 @@
 // pages/apply/paymentTemplate/paymentTemplate.js
+import * as UTIL from '../../../utils/util.js';
+import * as API from '../../../utils/API.js';
 const app = getApp();
 Page({
 
@@ -7,7 +9,8 @@ Page({
    */
   data: {
     isIPX: app.globalData.isIPX,
-    show: false
+    show: false,
+    form:{}
   },
   showPopup() {
     this.setData({ show: true });
@@ -31,7 +34,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    var that = this ;
+    UTIL.httpRequest(API.URL_GET_APPROVALITEMSBYID + options.id, {method:'GET'}, {
+      success: (res) => {
+        let transList = res.data.transfers;
+        transList.forEach(item => {
+          item.num = UTIL.convertToChinaNum(transList.length)
+        });
+        res.data.transfers = transList
+        that.setData({
+          form:res.data
+        });
+      }
+    })
   },
 
   /**

pages/apply/paymentTemplate/paymentTemplate.wxml

@@ -6,29 +6,29 @@
 <view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
 <view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};">
   <text class="box-title">审批事项</text>
-  <input class="input_tit" placeholder="房屋出租整年费用"/>
+  <input class="input_tit" placeholder="房屋出租整年费用" value="{{form.approvalItems}}"/>
   <text>支出总金额</text>
   <view class="money_box">￥<input class="input_money" placeholder="总金额" placeholder-style="color:#E90000;"/></view>
-  <text>提交单位：龙华村联合社</text>
-  <text>提交日期：2022年1月18日</text>
-  <text>提  交  人：报账员</text>
-  <text>联系电话：13906311234</text>
+  <text>提交单位：{{form.submitCompany}}</text>
+  <text>提交日期：{{form.submitDate}}</text>
+  <text>提  交  人：{{form.submitter}}</text>
+  <text>联系电话：{{form.telephone}}</text>
 </view>
-
-<text class="title">事项一</text>
+<block wx:for="{{form.transfers}}" wx:key="index">
+<text class="title">事项{{item.num}}</text>
 
 <view class="main-box top-box">
   <text>支出金额</text>
-  <view class="money_box">￥<input class="input_money" placeholder="金额" placeholder-style="color:#E90000;"/></view>
+  <view class="money_box">￥<input class="input_money" placeholder="金额" placeholder-style="color:#E90000;" value="{{item.expenditureAmount}}"/></view>
   <van-cell-group border="{{ false }}">
-    <van-cell title="支付联合社办公室12月份租金" border="{{ false }}" >
+    <van-cell title="{{item.remark}}" border="{{ false }}" >
       <view slot="icon" style="width: 15%;">事由：</view>
     </van-cell>
-    <van-cell title="龙华村联合社华" border="{{ false }}" center >
+    <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="龙华村联合社龙华村联合社龙华龙华村联合社" center border="{{ false }}"  >
+    <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">
@@ -39,6 +39,8 @@
   </van-cell-group>
 </view>
 
+</block>
+
 <view class="bottomBtn">
   <view bindtap="showPopup">
     <image src="/image/apply/icon_pres.png"></image>

project.private.config.json

@@ -35,7 +35,7 @@
         {
           "name": "支出模板查看",
           "pathName": "pages/apply/paymentTemplate/paymentTemplate",
-          "query": "",
+          "query": "id=32",
           "launchMode": "default",
           "scene": null
         },

utils/API.js

@@ -161,7 +161,6 @@ export {
     URL_POST_APPROVALITEMSEDIT,
     URL_POST_TEMPLATEEDIT,
     URL_POST_APPROVALITEMSSUBMIT,
-    URL_GET_SELECTACCOUNTLIST,
     URL_GET_MONEYORDERLIST,
     URL_GET_PAYEESELECTLIST,
     URL_GET_DEPOSITLIST,