优化

env/env.js

@@ -13,6 +13,6 @@ module.exports = {
     },
     IMGURL: {
           URL_PREFIX: 'http://192.168.31.178:8080',
-          // URL_PREFIX: 'https://dazu.nongshen.net',
+          // URL_PREFIX: 'https://dazu.nongshen.net/api',
     }
   }

pages/apply/approval/approval.json

@@ -13,6 +13,7 @@
   "van-action-sheet": "@vant/weapp/action-sheet/index",
   "van-swipe-cell": "@vant/weapp/swipe-cell/index",
   "van-dialog": "@vant/weapp/dialog/index",
-  "van-field": "@vant/weapp/field/index"
+  "van-field": "@vant/weapp/field/index",
+  "van-empty": "@vant/weapp/empty/index"
   }
 }

pages/apply/approval/approval.wxml

@@ -57,15 +57,25 @@
     </van-checkbox-group>
   </view> 
 
-  <view class="btn_box">
+  <view class="bottomBtn">
+    <view bindtap="openBox">
+      <image src="/image/apply/icon_add.png"></image>
+      <text>选择审批模板</text>  
+    </view>
+    <view bindtap="showPopup">
+      <image src="/image/apply/icon_pres.png"></image>
+      <text>保存审批模板</text>  
+    </view>
+  </view>
+  <!-- <view class="btn_box">
     <view bindtap="openBox">选择审批模板</view>
     <view bindtap="showPopup">保存审批模板</view>
-  </view>
+  </view> -->
 </view>
 
 <view class="bottom">
-  <view class="btn1" bindtap="save">暂存</view>
-  <view class="btn2" bindtap="submit">提交</view>
+  <view class="btn1" bindtap="save">保存</view>
+  <view class="btn2" bindtap="submit">保存并提交</view>
 </view>
 
 <van-action-sheet show="{{show}}" title="选择审批模板" bind:close="closeBox">
@@ -89,6 +99,7 @@
     </view>
   </van-swipe-cell>
 
+  <van-empty wx:if="{{templateList.length == 0}}" description="暂无审批模板" />
 </van-action-sheet>
 <modal hidden="{{!showPopup}}" title="审批模板" confirm-text="保存" cancel-text="取消" bindcancel="cancelTem" bindconfirm="confirmTem">  
     <input type='text' placeholder="请输入模板名称" bindinput="inputTem" auto-focus/>  

pages/apply/approval/approval.wxss

@@ -234,4 +234,29 @@ text{display: block;}
   }
   .van-button--normal {
     background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
+  }
+
+  .bottomBtn{
+    display: flex;
+    width: 94%;
+    margin: 0 auto;
+    justify-content:space-between;
+  }
+  .bottomBtn view{
+    display: flex;
+    width: 48%;
+    background-color: #ffffff;
+    border-radius: 5px;
+    box-shadow: 0px 5px 9px #DCDCDC;
+    padding: 10px 0px;
+    text-align: center;
+    align-items:center;
+    justify-content:center;
+    font-size: 14px;
+    color: #2C8E68;
+  }
+  .bottomBtn view image{
+    width: 18px;
+    height: 18px;
+    margin-right: 5px;
   }

pages/apply/index.json

@@ -7,6 +7,7 @@
     "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-tag": "@vant/weapp/tag/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }

pages/apply/index.wxml

@@ -27,6 +27,7 @@
           <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">{{item.balance}}</view> 
         </view>
       </view>
+      <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" />
     </van-tab>
 
     <van-tab title="公务卡">
@@ -41,6 +42,7 @@
         <view class="holder">持有人：王强</view>
       </view>
       
+      <!-- <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" /> -->
     </van-tab>
   </van-tabs>
 </view>
@@ -65,5 +67,5 @@
       <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
     </view>
   </van-swipe-cell>
-  
+  <van-empty wx:if="{{approvalItemsOptions.length == 0}}" description="暂无支付模板" />
 </van-action-sheet>

pages/apply/paymentTemplate/add/add.js

@@ -45,6 +45,9 @@ Page({
       },
       transfers:[{//事项信息集合以下是List对象信息
         num:"一",
+        SJimage:[],
+        FPimage:[],
+        QTimage:[],
         capitalExpenditureType:'1',//资金支出类别
         capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
         succeedAmount:'',//成功支付金额
@@ -52,7 +55,7 @@ Page({
         payerAccount:'',//付款方账户
         bankType:'',//所属银行
         bankTypeText:'',//所属银行（展示用）
-        isPeers:'',//是否同行
+        isPeers:'N',//是否同行
         operatorCode:'',//操作员代码
         enterpriseCode:'',//企业编码
         expenditureAmount:'',//支出总金额
@@ -81,18 +84,18 @@ Page({
           bankType:'',//所属银行0其他银行1中国银行2农商行（山东省）3农业银行4建设银行5工商银行
           payeeAccount:'',//收款账户
         }],
+        projectForm:{
+          projectId:'',
+          projectName:'',
+          projectContractor:'',
+          projectAmount:'',
+          projectBillNum:'',
+          projectFundType:'',
+          outId:'',
+          ynType:'1',
+        },
       }],
     },
-    projectForm:{
-      projectId:'',
-      projectName:'',
-      projectContractor:'',
-      projectAmount:'',
-      projectBillNum:'',
-      projectFundType:'',
-      outId:'',
-      ynType:'1',
-    },
     contractionForm:{
       id:'',
       name:'',
@@ -130,7 +133,19 @@ Page({
                 res.data.transfers[index].payeeList.forEach( (response,i) => {
                   res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
                 })
-
+                let prames = {
+                  outId:res.data.transfers[index].id,
+                  ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2'
+                }
+                // 工程项目查询
+                UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+                  success: (res) => {
+                    res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+                    that.setData({
+                      ["form.transfers["+index+"].projectForm"]:res.data,
+                    })
+                  }
+                })
                 UTIL.httpRequest(
                   API.URL_GET_FINDLIST, 
                   {
@@ -273,6 +288,21 @@ Page({
           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, 
@@ -405,6 +435,26 @@ Page({
         }
       },1000)
       
+    }else{
+      //村账户查询参数
+      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,
+            })
+          }
+        })
+        
     }
   },
 
@@ -634,10 +684,10 @@ Page({
     console.log(event);
     this.setData({
       [event.currentTarget.dataset.name]: false,
-      [event.currentTarget.dataset.value]: event.detail.value.projectName,
-      ['projectForm.projectId']: event.detail.value.id,
-      ['projectForm.projectContractor']: event.detail.value.projectContractor,
-      ['projectForm.projectAmount']: event.detail.value.projectAmount,
+      [event.currentTarget.dataset.value+'.projectName']: event.detail.value.projectName,
+      [event.currentTarget.dataset.value+'.projectId']: event.detail.value.id,
+      [event.currentTarget.dataset.value+'.projectContractor']: event.detail.value.projectContractor,
+      [event.currentTarget.dataset.value+'.projectAmount']: event.detail.value.projectAmount,
     });
   },
   onConfirmContraction(event) {
@@ -682,11 +732,28 @@ Page({
   onChangeMoney(event){
     console.log(event);
     var that = this;
-    
     this.setData({
       ["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail,
-      ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
+      // ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
     })
+    var moneyCount = 0 ;
+    for (let i = 0; i < that.data.form.transfers.length; i++) {
+      const element = that.data.form.transfers[i];
+      for (let j = 0; j < element.payeeList.length; j++) {
+        const element2 = element.payeeList[j];
+        var allCount = 0 ;
+        moneyCount = parseFloat(moneyCount)+parseFloat(element2.incomeAmount);
+        allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount);
+        this.setData({
+          ["form.transfers["+i+"].expenditureAmount"]:allCount,
+        })
+      }
+    }
+    this.setData({
+       ["form.approvalItemTemplate.totalAmount"]:moneyCount.toFixed(2),
+    })
+    console.log(moneyCount.toFixed(2));
+    console.log(allCount.toFixed(2)); 
   },
   back:function(){
     wx.navigateBack({
@@ -710,6 +777,40 @@ Page({
   },
   goSubmit(e){
     var that = this;
+    console.log(that.data.form);
+    var list = that.data.form,
+    approvalItems = list.approvalItemTemplate.approvalItems;
+    if(approvalItems == ''){
+      UTIL.showToastNoneIcon('请填写审批事项名称！');
+      return;
+    }
+
+    for (let i = 0; i < list.transfers.length; i++) {
+      const element = list.transfers[i];
+      if(element.applyDate == ''){
+        UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的申请时间！');
+        return;
+      }
+      if(element.remark == ''){
+        UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出原因！');
+        return;
+      }
+      if(element.payer == ''){
+        UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的付款方！');
+        return;
+      }
+      if(element.payeeList[0].payee == ''){
+        UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的收款方！');
+        return;
+      }
+      if(element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined){
+        UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'收款方的收入金额！');
+        return;
+      }
+    }
+
+
+
     if(e.currentTarget.dataset.type == 1){
       if(that.data.form.approvalItemTemplate.templateName == ''){
         UTIL.showToastNoneIcon('请输入模板名称！');
@@ -724,16 +825,20 @@ Page({
     }
     that.data.form.method = 'POST';
     that.data.form.approvalItemTemplate.dataType = e.currentTarget.dataset.type;
-
-    let totalAmount = 0 ;
-    for (let i = 0; i < that.data.form.transfers.length; i++) {
-      totalAmount += parseInt(that.data.form.transfers[i].expenditureAmount);
-    }
-    that.data.form.approvalItemTemplate.totalAmount = totalAmount;
+    
     UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
           for (let j = 0; j < res.data.transfers.length; j++) {
+            that.data.form.transfers[j].projectForm.ynType = res.data.transfers[j].transferType=='1'||res.data.transfers[j].transferType=='2'||res.data.transfers[j].transferType=='4'?'1':'2';
+            that.data.form.transfers[j].projectForm.outId = res.data.transfers[j].id;
+            that.data.form.transfers[j].projectForm.method = 'POST';
+            // 工程项目提交
+            UTIL.httpRequest(API.URL_GET_ADDPROJECTTO , that.data.form.transfers[j].projectForm, {
+              success: (res) => {
+                
+              }
+            })
             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
@@ -759,6 +864,8 @@ Page({
             }
           }
 
+          
+
           if(e.currentTarget.dataset.type == 0){
             wx.navigateTo({
               url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
@@ -832,10 +939,19 @@ Page({
           })
         })
         console.log(fileForm);
+
         that.setData({
           ["form.transfers["+e.currentTarget.dataset.index+"].SJimage"]: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 fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+        that.setData({
+          ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+        })
       }
     })
   },
@@ -864,6 +980,13 @@ Page({
           ["form.transfers["+e.currentTarget.dataset.index+"].FPimage"]: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 fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+        that.setData({
+          ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+        })
       }
     })
   },
@@ -892,6 +1015,13 @@ 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 fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+        that.setData({
+          ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+        })
       }
     })
   },
@@ -899,6 +1029,9 @@ Page({
     let transList = this.data.form.transfers;
     transList.push({
       num:UTIL.convertToChinaNum(transList.length+1),
+      SJimage:[],
+      FPimage:[],
+      QTimage:[],
       capitalExpenditureType:'',//资金支出类别
       capitalExpenditureTypeText:'',//资金支出类别（展示用）
       succeedAmount:'',//成功支付金额
@@ -968,9 +1101,16 @@ Page({
       that.back()
     }
   },
-  goSubmitUp(e){
+  deleteTransfers(e){
     var that = this ;
-    
+    if(that.data.form.transfers.length<2){
+      UTIL.showToastNoneIcon('最少保留一条事项');
+      return;
+    }
+    that.data.form.transfers.splice(e.currentTarget.dataset.index,1);
+    that.setData({
+      form:that.data.form
+    })
   },
   /**
    * 生命周期函数--监听页面隐藏

pages/apply/paymentTemplate/add/add.wxml

@@ -11,18 +11,19 @@
   <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
   <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
   <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
+  <text>总  金  额：{{form.approvalItemTemplate.totalAmount}}</text>
 </view>
 <block wx:for="{{form.transfers}}" wx:key="index">
-  <view class="main-title">事项{{form.transfers[index].num}}</view>
+  <view class="main-title">事项{{form.transfers[index].num}}<image src="/image/apply/delete.png" style="width: 25px;height: 25px;position: absolute;right: 4%;top: 7px;" data-index="{{index}}" bindtap="deleteTransfers"></image></view>
   <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 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 required label="申请时间" readonly is-link value="{{ form.transfers[index].applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChange" input-align="right" bindtap="openBox" data-name="showApplyDate" />
       <van-calendar show="{{ showApplyDate }}" bind:close="closeBox"  data-name="showApplyDate" bind:confirm="onConfirm" data-value="form.transfers[{{index}}].applyDate" show-confirm="{{ false }}" />
 
       <van-field readonly label="合计支出" value="{{ form.transfers[index].expenditureAmount }}" placeholder="(自动计算)" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" input-align="right"/>
-      <van-field label="支出原因" 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 required label="支出原因" 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-popup show="{{showCapitalExpenditureType}}" round position="bottom"  bind:close="closeBox" data-name="showCapitalExpenditureType">
         <van-picker
           columns="{{capitalExpenditureTypeOptions}}"
@@ -34,7 +35,7 @@
           data-value="form.transfers[{{index}}].capitalExpenditureType"
         />
       </van-popup>
-      <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"/>
+      <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="showCapitalExpenditureType"/>
     </view>
     <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
       <text class="title">关联项目</text>
@@ -47,12 +48,12 @@
             bind:cancel="closeBox"
             bind:confirm="onConfirmProject"
             data-name="showProject"
-            data-value="projectForm.projectName"
+            data-value="form.transfers[{{index}}].projectForm"
           />
         </van-popup>
-        <van-field label="项目名称" readonly value="{{ projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showProject"/>
-        <van-field label="承建单位" readonly value="{{ projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="合同价款(元)" readonly value="{{ projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
+        <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-popup show="{{showProjectFundType}}" round position="bottom"  bind:close="closeBox" data-name="showProjectFundType">
           <van-picker
@@ -62,12 +63,12 @@
             bind:cancel="closeBox"
             bind:confirm="onConfirmPick"
             data-name="showProjectFundType"
-            data-value="projectForm.projectFundType"
+            data-value="form.transfers[{{index}}].projectForm.projectFundType"
           />
         </van-popup>
-        <van-field label="工程款类型" readonly value="{{ 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.projectFundTypeText }}" placeholder="请选择工程款类型" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showProjectFundType"/>
 
-        <van-field label="工程发票号" value="{{ projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+        <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>
     </block>
 
@@ -106,7 +107,7 @@
           data-value="form.transfers[{{index}}]"
         />
       </van-popup>
-      <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="付款方式" 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-popup show="{{showAccount}}" round position="bottom"  bind:close="closeBox" data-name="showAccount">
         <van-picker
@@ -119,7 +120,7 @@
           data-value="form.transfers[{{index}}]"
         />
       </van-popup>
-      <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">
+      <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="showAccount">
         <view slot="label">
           付款方<van-tag plain type="danger" color="red" round style="margin-left:10px;">必填</van-tag>
         </view>
@@ -147,8 +148,8 @@
         <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"/>
+        <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>
@@ -186,16 +187,16 @@
       </view>
 
       <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
-        <van-field readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="goPayeeList" data-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>
           </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 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].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}}"/>
 
-        <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"/>
+        <van-field required 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>
 

pages/apply/paymentTemplate/add/add.wxss

@@ -41,6 +41,7 @@ text{display: block;}
   font-size: 18px;
   padding: 10px 0;
   text-align: center;
+  position: relative;
 }
 .main-box{
   background: #ffffff;
@@ -337,4 +338,7 @@ text{display: block;}
   .img_box{
     position: relative;
     width: 100%;
+  }
+  .van-cell--required:before {
+    left: -8px!important;
   }

pages/apply/paymentTemplate/paymentTemplate.json

@@ -6,6 +6,16 @@
     "van-dialog": "@vant/weapp/dialog/index",
     "van-field": "@vant/weapp/field/index",
     "van-collapse": "@vant/weapp/collapse/index",
-    "van-collapse-item": "@vant/weapp/collapse-item/index"
+    "van-collapse-item": "@vant/weapp/collapse-item/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-tag": "@vant/weapp/tag/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-popup": "@vant/weapp/popup/index",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-calendar": "@vant/weapp/calendar/index"
   }
 }

pages/apply/paymentTemplate/paymentTemplate.wxml

@@ -4,7 +4,7 @@
   <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" placeholder="房屋出租整年费用" readonly value="{{form.approvalItemTemplate.approvalItems}}"/>
   <text>支出总金额</text>
@@ -34,19 +34,167 @@
             <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" bindtap="goSee"></image>
+            <image src="/image/apply/down.png" data-index="{{index}}" class="down"></image>
             <image src="/image/apply/icon_update.png" class="update" bindtap="goUpdate"></image>
             <image src="/image/apply/icon_delete.png" class="delete" data-index="{{index}}" bindtap="goDelete"></image>
           </view>
         </van-cell-group>
       </view>
     </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="{{ projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showProject"/>
+          <van-field label="承建单位" readonly value="{{ projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          <van-field label="合同价款(元)" readonly value="{{ projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          <van-field label="工程款类型" readonly value="{{ 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="{{ projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+        </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>
+      </block>
+
+
+      <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 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 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 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>
+
+      </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" 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="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" disabled checked-color="#2C8E68">是</van-radio>
+                <van-radio name="N" disabled 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 readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
+            <view slot="label">
+              姓名<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">收款方</van-tag>
+            </view>
+          </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}}"/>
+
+          <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>
+          </view>
+          <view class="fj-li">
+            <view>
+              <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>
+          </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>
+          </view>
+        </view>
+      </view>
+
+    </view>
   </van-collapse-item>
 </van-collapse>
 
 
-<block wx:for="{{form.transfers}}" wx:key="index">
+<!-- <block wx:for="{{form.transfers}}" wx:key="index">
 <text class="title">事项{{item.num}}</text>
 
 <view class="main-box top-box">
@@ -71,7 +219,7 @@
   </van-cell-group>
 </view>
 
-</block>
+</block> -->
 
 <view class="bottomBtn">
   <view bindtap="showPopup">

pages/apply/paymentTemplate/paymentTemplate.wxss

@@ -53,6 +53,13 @@ text{display: block;}
 }
 
 .main-box{
+  background: #ffffff;
+  padding: 10px 0;
+  width: 100%;
+  margin: 0 auto;
+}
+
+.topBox{
   background: #ffffff;
   padding: 20px;
   width: 94%;
@@ -70,6 +77,8 @@ text{display: block;}
     box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
     width: 94%;
     margin: 0 auto;
+    padding-top: 0;
+    margin-top: 15px;
 }
 .van-collapse-item__content{
   padding: 0!important;
@@ -118,7 +127,7 @@ text{display: block;}
   justify-content: center;
 }
 .title{
-  padding: 10px calc(3% + 20px);
+  padding: 10px 0;
   color: #2C8E68;
   font-size: 16px;
 }
@@ -221,4 +230,26 @@ text{display: block;}
 }
 .van-button--normal {
   background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
+}
+
+.fj-box text{
+  background-color: #5CAE77;
+  color: #ffffff;
+  text-align: center;
+  border-radius: 5px;
+  white-space:pre-wrap;
+  padding: 22px 15px;
+}
+.fj-li{
+  margin-top: 20px;
+  display: flex;
+  /* flex-wrap: wrap; */
+}
+.fj-li image{
+  width: 25%;
+  height: 18.5vw;
+  margin-left: 5%;
+}
+.fj-li image:nth-child(n+5){
+  margin-top: 15px;
 }

pages/handle/expenditureAudit/expenditureAudit.js

@@ -106,7 +106,22 @@ Page({
             res.data.transfers[index].payeeList.forEach( (response,i) => {
               res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
             })
-
+            console.log(res.data.transfers[index].capitalExpenditureType);
+            if(res.data.transfers[index].capitalExpenditureType == 2){
+              let prames = {
+                outId:res.data.transfers[index].id,
+                ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2'
+              }
+              // 工程项目查询
+              UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+                success: (res) => {
+                  res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+                  that.setData({
+                    ["form.transfers["+index+"].projectForm"]:res.data,
+                  })
+                }
+              })
+            }
             UTIL.httpRequest(
               API.URL_GET_FINDLIST, 
               {
@@ -121,34 +136,13 @@ Page({
                 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
-                        });
-                      }
-                    }
+                  list.push({
+                    tempFilePath:URL_PREFIX+item2.fileUrl
                   })
+                  that.setData({
+                    ["form.transfers["+index+"].SJimage"]:list,
+                  });
                 })
-                
               }
             })
             //发票
@@ -164,28 +158,13 @@ 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
-                        });
-                      }
-                    }
+
+                  list.push({
+                    tempFilePath:URL_PREFIX+item2.fileUrl
                   })
+                  that.setData({
+                    ["form.transfers["+index+"].FPimage"]:list,
+                  });
                 })
               }
             })
@@ -201,30 +180,13 @@ 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
-                        });
-                      }
-                    }
+                  list.push({
+                    tempFilePath:URL_PREFIX+item2.fileUrl
                   })
+                  that.setData({
+                    ["form.transfers["+index+"].QTimage"]:list,
+                  });
                 })
               }
             })
@@ -246,19 +208,23 @@ Page({
           that.setData({spsxOptions:res.data.processSchedule.spsx})
         }
         that.setData({instanceId:res.data.instanceId})
-      }
-    })
-    console.log(that.data.instanceId)
-    // 查询现金审批事项流转进度
-    UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, {
-      success: (res) => {
-        console.log(res);
-        if(res.data.processSchedule.spsx){
-          that.setData({spsxOptions:res.data.processSchedule.spsx})
+
+        if(options.business == 'xj'){
+          console.log(that.data.instanceId)
+          // 查询现金审批事项流转进度
+          UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, {
+            success: (res) => {
+              console.log(res);
+              if(res.data.processSchedule.spsx){
+                that.setData({spsxOptions:res.data.processSchedule.spsx})
+              }
+              that.setData({instanceId:res.data.instanceId})
+            }
+          })
         }
-        that.setData({instanceId:res.data.instanceId})
       }
     })
+   
   },
   goDis(){
     var that = this ;

pages/handle/expenditureAudit/expenditureAudit.wxml

@@ -11,6 +11,7 @@
   <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
   <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
   <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
+  <text>总  金  额：{{form.approvalItemTemplate.totalAmount}}</text>
 </view>
 <block wx:for="{{form.transfers}}" wx:key="index">
   <view class="main-title">事项{{form.transfers[index].num}}</view>
@@ -28,11 +29,11 @@
     <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
       <text class="title">关联项目</text>
       <view class="main-box table-box">
-        <van-field label="项目名称" readonly value="{{ projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showProject"/>
-        <van-field label="承建单位" readonly value="{{ projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="合同价款(元)" readonly value="{{ projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
-        <van-field label="工程款类型" readonly value="{{ 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="{{ projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+        <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"/>
       </view>
     </block>
 
@@ -161,61 +162,61 @@
         </view>
       </view>
     </view>
+</view>
+</block>
 
-  <view class="main-box steps-box">
-    <view class="steps-tit">审批流程</view>
-    <van-row wx:for="{{spsxOptions}}" wx:key="index">
-      <van-col span="3">
-        <view class="index {{(item.approverStatus != null || item.assigneeName==nickName) ? 'active':'' }}">{{index+1}}</view>
-        <!-- :class="{'indexCenter':index==0 ? false : true}" -->
-        <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="{{spsxOptions.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="{{spsxOptions.length != index+1}}"></view>
-          </view>
-        </block>
-      </van-col>
-      <van-col span="21" style="height: 77px;">
-        <van-cell center="{{true}}" border="{{false}}">
-          <view slot="title" class="cellTit">
-            <text>{{item.assigneeName}}</text>
-            <text>{{item.deptLabel}}</text>
-          </view>
-          <view class="agree" wx:if="{{item.approverStatus=='true'}}">同意</view>
-          <view class="in" wx:elif="{{item.assigneeName==nickName && pageType!='see'}}">审核中</view>
-          <view class="disagree" wx:elif="{{item.approverStatus=='false'}}">驳回</view>
-        </van-cell>
-
-        <view wx:if="{{item.assigneeName==nickName && pageType!='see'}}">
-          <input class="input_tit" value="{{comment}}" placeholder="意见输入" bindinput="commentInput" style="margin-top: 10px;margin-bottom: 0;"/>
-          <!--  -->
+<view class="main-box steps-box">
+  <view class="steps-tit">审批流程</view>
+  <van-row wx:for="{{spsxOptions}}" wx:key="index">
+    <van-col span="3">
+      <view class="index {{(item.approverStatus != null||index==0) ? 'active':'' }}">{{index+1}}</view>
+      <!-- :class="{'indexCenter':index==0 ? false : true}" -->
+      <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="{{spsxOptions.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="{{spsxOptions.length != index+1}}"></view>
+        </view>
+      </block>
+    </van-col>
+    <van-col span="21" style="height: 77px;">
+      <van-cell center="{{true}}" border="{{false}}">
+        <view slot="title" class="cellTit">
+          <text>{{item.assigneeName}}</text>
+          <text>{{item.deptLabel}}</text>
+        </view>
+        <view class="agree" wx:if="{{item.approverStatus=='true'}}">同意</view>
+        <view class="in" wx:elif="{{(item.assigneeName==nickName && pageType!='see')}}">审核中</view>
+        <view class="disagree" wx:elif="{{item.approverStatus=='false'}}">驳回</view>
+      </van-cell>
 
-        <van-cell wx:elif="{{item.approverStatus!=null}}" center border="{{false}}">
-          <view slot="title" style="margin-top: 10px;">
-            <view style="color: #999999;line-height: 32px;">{{ item.comment }}</view>
-          </view>
-          <view style="color: #999999;font-size: 12px;margin-top: 10px;line-height: 32px;">{{ sub.times(item.time) }}</view>
-        </van-cell>
+      <view wx:if="{{item.assigneeName==nickName && pageType!='see'}}">
+        <input class="input_tit" value="{{comment}}" placeholder="意见输入" bindinput="commentInput" style="margin-top: 10px;margin-bottom: 0;"/>
+        <!--  -->
+      </view>
 
-      </van-col>
-    </van-row>
-  </view>
+      <van-cell wx:elif="{{item.approverStatus!=null}}" center border="{{false}}">
+        <view slot="title" style="margin-top: 10px;">
+          <view style="color: #999999;line-height: 32px;">{{ item.comment }}</view>
+        </view>
+        <view style="color: #999999;font-size: 12px;margin-top: 10px;line-height: 32px;">{{ sub.times(item.time) }}</view>
+      </van-cell>
+
+    </van-col>
+  </van-row>
 </view>
-</block>
 <view class="bottom" wx:if="{{pageType!='see'}}">
   <button type="warn" plain class="btnDis" bindtap="goDis">驳回</button>
   <button type="primary" class="btnAgree" bindtap="goAgree">同意</button>
 </view>
-
+<view class="ipXbtn"></view>
 <wxs module="sub">
   var times = function(time){
     console.log(time)

pages/handle/expenditureAudit/expenditureAudit.wxss

@@ -191,7 +191,6 @@ text{display: block;}
 }
 .steps-box{
   padding: 0;
-  margin-top: 15px;
 }
 .steps-box .van-row{
   padding: 0 20px;

pages/index/index.js

@@ -50,18 +50,21 @@ Page({
       ]
     },
     onLoad: function (options) {
-      
-        //获取用户信息
-        this.getUserInfo()
-        //获取滚动条高度
-        this.computeBarLocation();
-        //查询待办
-        this.getTaskList();
-        //查询已办
-        this.getTaskDoneList();
-        //查询dept
-        this.getTreeDept();
+      //获取滚动条高度
+      this.computeBarLocation();
+    },
+
+    onShow(){
+      //获取用户信息
+      this.getUserInfo()
+      //查询待办
+      this.getTaskList();
+      //查询已办
+      this.getTaskDoneList();
+      //查询dept
+      this.getTreeDept();
     },
+
     reset:function(){
         this.setData({
           active:1,
@@ -160,10 +163,9 @@ Page({
         success: (res) => {
           console.log(res);
           if (res.code == API.SUCCESS_CODE) {
-            let a = this.data.yfqNum+res.total
+            let a = res.total
             this.setData({yfqNum:a})
-            let b = this.data.yfqList
-            this.setData({yfqList:res.rows.concat(b)})
+            this.setData({yfqList:res.rows})
           }
         },	fail: (res) => {
         },
@@ -479,7 +481,7 @@ Page({
     },
     gosee:function(e){
       wx.navigateTo({
-        url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
+        url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type+'&business='+e.currentTarget.dataset.business,
       })
     },
     goUpdate(e){
@@ -487,4 +489,18 @@ Page({
         url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
       })
     },
+    showModal(){
+      wx.showModal({
+        title: '提示',
+        content: '功能正在开发中，敬请期待',
+        showCancel: false,
+        success (res) {
+          if (res.confirm) {
+            console.log('用户点击确定')
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    }
 })

pages/index/index.wxml

@@ -54,13 +54,13 @@
             </view>
             <text class="desc">收入登记</text>
         </view>
-        <view class="tab_item">
+        <view class="tab_item" bindtap="showModal">
             <view class="icon">
                 <image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
             </view>
             <text class="desc">记账申请</text>
         </view>
-        <view class="tab_item">
+        <view class="tab_item" bindtap="showModal">
             <view class="icon">
              <image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
             </view>
@@ -69,23 +69,23 @@
     </view>
     <!--子导航功能导航-->
     <view class="child_function">
-        <view class="flex_block">
+        <view class="flex_block" bindtap="showModal">
             <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">
+        <view class="flex_block" bindtap="showModal">
             <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">
+        <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">
+        <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>
         </view>
-        <view class="flex_block">
+        <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>
@@ -100,7 +100,7 @@
     </view>
 
     <scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;" > 
-        <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="up" bindtap="gosee">
+        <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="up" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
@@ -117,7 +117,7 @@
                 </view>
             </view> 
         </view>
-        <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
+        <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="see" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">

pages/payee/add/add.js

@@ -130,12 +130,50 @@ Page({
   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
           })

pages/payee/add/add.wxml

@@ -15,7 +15,7 @@
         data-value="form.bankType"
       />
     </van-popup>
-    <van-field 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 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"/>
 
@@ -30,7 +30,7 @@
         data-value="form.payeeType"
       />
     </van-popup>
-    <van-field 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-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
@@ -43,7 +43,7 @@
         data-value="form.accountType"
       />
     </van-popup>
-    <van-field 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.accountTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showAccountType"/>
 
     <van-popup show="{{showDeposit}}" round position="bottom"  bind:close="closeBox" data-name="showDeposit">
       <van-picker
@@ -56,7 +56,7 @@
         data-value="form.bankDeposit"
       />
     </van-popup>
-    <van-field 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 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">

pages/payee/index.js

@@ -28,6 +28,41 @@ Page({
       payeeType:options.transferType,//申请转帐类型
       index:options.index
     })
+    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',
+        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 ; 
+          for (let i = 0; i < array.length; i++) {
+            array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+            console.log(that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }));
+            array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
+          }
+          that.setData({
+            list:array,
+          })
+        }
+      })
   },
   goAdd(){
     wx.navigateTo({
@@ -82,43 +117,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    var that = this;
-    setTimeout(function(){
-      // 获取收款账号列表
-      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',
-        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 ; 
-          for (let i = 0; i < array.length; i++) {
-            array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
-            console.log(that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }));
-            array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
-          }
-          that.setData({
-            list:array,
-          })
-        }
-      })
-    },1000)
+    
   },
   onChange(event) {
     console.log(event);

utils/API.js

@@ -42,7 +42,7 @@ const URL_GET_TRANSFERLIST = `${URL_PREFIX}/yinnong/approvalItems/list`;
 // 修改密码
 const URL_POST_UPDATEPWD = `${URL_PREFIX}/system/user/profile/updatePwd`;
 // 上传图片
-const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignature`;
+const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignatureWX`;
 // 保存电子签名
 const URL_POST_USEREDIT = `${URL_PREFIX}/system/user/edit`;
 //当前账套付款账户列表
@@ -137,6 +137,12 @@ const URL_GET_TOREVIEWSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/toReviewSubm
 //复核
 const URL_GET_REVIEWPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getToReviewProcessSchedule/`;
 
+//关联项目工程接口
+const URL_GET_ADDPROJECTTO = `${URL_PREFIX}/yinnong/project/addProjectto`;
+
+//根据申请转账id获取关联的项目工程信息
+const URL_GET_GETPROJECTTO = `${URL_PREFIX}/yinnong/project/getProjectto`;
+
 
 
 /****************接口地址end****************/
@@ -197,5 +203,7 @@ export {
     URL_GET_GETPROCESS,
     URL_GET_PROCESSCOMPLETE,
     URL_GET_TOREVIEWSUBMIT,
-    URL_GET_REVIEWPROCESS
+    URL_GET_REVIEWPROCESS,
+    URL_GET_ADDPROJECTTO,
+    URL_GET_GETPROJECTTO
 }