优化

env/env.js

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

pages/apply/approval/approval.js

@@ -66,8 +66,8 @@ Page({
     this.setData({itemId:options.id,deptId:options.deptId});
     //this.getApprovalItemList();
     this.groupList();
-    this.townList();
-    this.villageList();
+    // this.townList();
+    // this.villageList();
     this.getApprovalItemsById();
   },
   getApprovalItemsById(){
@@ -265,8 +265,6 @@ Page({
   },
   groupList:function(){
       let data = {
-        deptId : this.data.deptId,
-        deptLevel:1,
         method:"GET"
       }
     UTIL.httpRequest(API.URL_GET_USERLIST,data ,{
@@ -379,10 +377,15 @@ Page({
               success: (res) => {
                 if (res.code == API.SUCCESS_CODE) {
                   wx.showToast({
-                    title: "暂存成功！",
+                    title: "保存成功！",
                     duration: 2000,
                     icon:"success"
                   })
+                  setTimeout(function(){
+                    wx.reLaunch({
+                      url: '/pages/index/index'
+                    })
+                  },2000)
                 }
               }
             })
@@ -401,10 +404,15 @@ Page({
           },
           success: function (response) {
             wx.showToast({
-              title: "暂存成功！",
+              title: "保存成功！",
               duration: 2000,
               icon:"success"
             })
+            setTimeout(function(){
+              wx.reLaunch({
+                url: '/pages/index/index'
+              })
+            },2000)
           },
         })
     }

pages/apply/approval/approval.wxml

@@ -44,7 +44,7 @@
               <van-checkbox wx:for="{{groups}}" wx:for-item="item" wx:key="index"  name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
       </van-row>
-      <van-row>
+      <!-- <van-row>
         <van-col span="24" >
               <van-checkbox wx:for="{{villages}}" wx:for-item="item" wx:key="index" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
@@ -53,7 +53,7 @@
         <van-col span="24">
               <van-checkbox wx:for="{{towns}}" wx:for-item="item"  wx:key="index" name="{{item.userId}}"  shape="square" checked-color="#2C8E68">{{item.roles[0].roleName}}:{{item.nickName}}</van-checkbox>
         </van-col>
-      </van-row>
+      </van-row> -->
     </van-checkbox-group>
   </view> 
 

pages/apply/index.wxml

@@ -24,7 +24,10 @@
           
           <view style="margin-top: 2vh;">{{item.bankAccountNumber}}<text>卡号</text></view> 
           <view>可用余额</view> 
-          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">{{item.balance}}</view> 
+          <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">
+            {{item.balance}}
+            <image src="/image/apply/update.png" style="width: 20px;height: 20px;vertical-align: middle;float: right;"></image>
+          </view> 
         </view>
       </view>
       <van-empty wx:if="{{accountList.length == 0}}" description="暂无银行账户" />

pages/apply/paymentTemplate/add/add.js

@@ -18,13 +18,6 @@ Page({
     active:0,
     projectText:'',
     balance:0,
-    showCapitalExpenditureType:false,
-    showApplyDate:false,
-    showTransferType:false,
-    showProject:false,
-    showProjectFundType:false,
-    showAccount:false,
-    showDialog:false,
     capitalExpenditureTypeOptions:[],
     transferTypeOptions:[],
     projectOptions:[],
@@ -32,6 +25,7 @@ Page({
     contractionOptions:[],
     accountOptions:[],
     moneyorderOptions:[],
+    topInputTirme:false,
     form:{
       approvalItemTemplate:{
         approvalItems:'',//审批事项
@@ -39,15 +33,27 @@ Page({
         submitDate:'',//提交日期
         submitter:'',//提交人
         telephone:'',//联系方式
-        totalAmount:0,//合计金额
+        totalAmount:"0.00",//合计金额
         templateName:'',//模板名称 选择保存模板的时候添加
         dataType:'',//数据类型
       },
       transfers:[{//事项信息集合以下是List对象信息
         num:"一",
+        expenditureAmountTirme:false,
+        remarkTirme:false,
+        showCapitalExpenditureType:false,
+        showApplyDate:false,
+        showTransferType:false,
+        showProject:false,
+        showProjectFundType:false,
+        showAccount:false,
+        showDialog:false,
+        showContraction:false,
         SJimage:[],
         FPimage:[],
         QTimage:[],
+        showTitle:true,
+        collapseDis:false,
         capitalExpenditureType:'1',//资金支出类别
         capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
         succeedAmount:'',//成功支付金额
@@ -94,21 +100,24 @@ Page({
           outId:'',
           ynType:'1',
         },
+        contractionForm:{
+          contractionId:'',
+          name:'',
+          code:'',
+          totalAmount:'',
+        },
       }],
     },
-    contractionForm:{
-      id:'',
-      name:'',
-      code:'',
-      totalAmount:'',
-    },
+    
     accountForm:{},
     fileForm:[],
     isUpdate:false,
     SJimage: [],
     FPimage: [],
     QTimage: [],
-    imgcount:0
+    imgcount:0,
+    activeNames: 0,
+    applyDate:''
   },
 
   /**
@@ -118,6 +127,7 @@ Page({
     var that = this;
     console.log(options);
     if(options.id){
+      UTIL.showLoadingHaveMask();
       setTimeout(function(){
         UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, {
           success: (res) => {
@@ -125,27 +135,55 @@ Page({
               console.log(that.data.capitalExpenditureTypeOptions);
               if(res.data.approvalItemTemplate == null){return;}
               res.data.transfers.forEach( (item,index) => {
+
+                that.setData({
+                  applyDate: res.data.transfers[0].applyDate
+                })
+
                 res.data.transfers[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
+
                 res.data.transfers[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
-    
+
                 res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
-    
+
+                res.data.transfers[index].num = UTIL.convertToChinaNum(index+1);
+
                 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'
+                res.data.transfers[index].showTitle = false;
+                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_GETPROJECTTO , prames, {
-                  success: (res) => {
-                    res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
-                    that.setData({
-                      ["form.transfers["+index+"].projectForm"]:res.data,
-                    })
+
+                if(res.data.transfers[index].capitalExpenditureType == 4){
+                  let prames = {
+                    transferId:res.data.transfers[index].id,
                   }
-                })
+                  // 关联合同查询
+                  UTIL.httpRequest(API.URL_GET_GETSELECTINFOBYOUTID , prames, {
+                    success: (res) => {
+                      that.setData({
+                        ["form.transfers["+index+"].contractionForm"]:res.data,
+                      })
+                    }
+                  })
+                }
+
                 UTIL.httpRequest(
                   API.URL_GET_FINDLIST, 
                   {
@@ -269,8 +307,10 @@ Page({
                 })
               })
               that.setData({
-                form:res.data
+                form:res.data,
+                activeNames:null
               })
+              UTIL.hideLoadingHaveMask();
             }
           }
         })
@@ -451,20 +491,25 @@ Page({
           success: (res) => {
             that.setData({
               accountOptions:res.rows,
+              ["form.transfers[0].applyDate"]: UTIL.formatDate(new Date()),
+              applyDate: UTIL.formatDate(new Date()),
             })
           }
         })
-        
     }
   },
-
+  onChangeBox(event) {
+    console.log(event);
+    this.setData({
+      activeNames: event.detail,
+    });
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
 
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
@@ -535,6 +580,7 @@ Page({
     
   },
   openBox(even){
+    console.log(even.currentTarget.dataset.name);
     this.setData({
       [even.currentTarget.dataset.name]:true
     })
@@ -695,9 +741,9 @@ Page({
     this.setData({
       [event.currentTarget.dataset.name]: false,
       [event.currentTarget.dataset.value]: event.detail.value.name,
-      ['contractionForm.code']: event.detail.value.code,
-      ['contractionForm.totalAmount']: event.detail.value.totalAmount,
-      ['contractionForm.id']: event.detail.value.id,
+      ['form.transfers['+event.detail.index+'].contractionForm.code']: event.detail.value.code,
+      ['form.transfers['+event.detail.index+'].contractionForm.totalAmount']: event.detail.value.totalAmount,
+      ['form.transfers['+event.detail.index+'].contractionForm.contractionId']: event.detail.value.id,
     });
   },
   onConfirmMoneyorder(event) {
@@ -720,7 +766,7 @@ Page({
       event.currentTarget.dataset.accounttype = ''
     }
     wx.navigateTo({
-      url: '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index,
+      url: '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index+'&money='+this.data.form.transfers[event.currentTarget.dataset.index].expenditureAmount,
     })
   },
   onChange(event){
@@ -729,13 +775,39 @@ Page({
       [event.currentTarget.dataset.value]: event.detail,
     })
   },
+  onChangeTime(event){
+    console.log(event);
+    this.setData({
+      applyDate: event.detail,
+    })
+  },
+  onConfirmTime(event){
+    this.setData({
+      [event.currentTarget.dataset.name]: false,
+      applyDate: UTIL.formatDate(event.detail),
+    });
+    for (let i = 0; i < this.data.form.transfers.length; i++) {
+      this.setData({
+        ["form.transfers["+i+"].applyDate"]:UTIL.formatDate(event.detail),
+      })
+    }
+  },
   onChangeMoney(event){
     console.log(event);
     var that = this;
+    if(event.detail == ''){
+      this.setData({
+        ["form.approvalItemTemplate.totalAmount"]:parseFloat(0).toFixed(2),
+      })
+      return
+    }
     this.setData({
-      ["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail,
+      // ["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail,
+      ["form.transfers["+event.currentTarget.dataset.index+"].payeeList[0].incomeAmount"]: event.detail,
+      ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
       // ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
     })
+    console.log(that.data.form);
     var moneyCount = 0 ;
     for (let i = 0; i < that.data.form.transfers.length; i++) {
       const element = that.data.form.transfers[i];
@@ -743,15 +815,17 @@ Page({
         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,
-        })
+        // allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount);
+        // this.setData({
+        //   ["form.transfers["+i+"].expenditureAmount"]:allCount,
+        // })
       }
     }
+
     this.setData({
        ["form.approvalItemTemplate.totalAmount"]:moneyCount.toFixed(2),
     })
+    console.log(that.data.form);
     console.log(moneyCount.toFixed(2));
     console.log(allCount.toFixed(2)); 
   },
@@ -782,6 +856,9 @@ Page({
     approvalItems = list.approvalItemTemplate.approvalItems;
     if(approvalItems == ''){
       UTIL.showToastNoneIcon('请填写审批事项名称！');
+      that.setData({
+        topInputTirme:true
+      })
       return;
     }
 
@@ -792,7 +869,18 @@ Page({
         return;
       }
       if(element.remark == ''){
+
         UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出原因！');
+        that.setData({
+          ["form.transfers["+i+"].remarkTirme"]:true
+        })
+        return;
+      }
+      if(element.expenditureAmount == ''){
+        UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出金额！');
+        that.setData({
+          ["form.transfers["+i+"].expenditureAmountTirme"]:true
+        })
         return;
       }
       if(element.payer == ''){
@@ -830,15 +918,30 @@ Page({
       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].capitalExpenditureType == 2){
+              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].capitalExpenditureType == 4){
+              
+              that.data.form.transfers[j].contractionForm.transferId = res.data.transfers[j].id;
+              that.data.form.transfers[j].contractionForm.method = 'POST';
+
+              // 关联合同提交
+              UTIL.httpRequest(API.URL_GET_GETRELATIONADD , that.data.form.transfers[j].contractionForm, {
+                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
@@ -871,18 +974,30 @@ Page({
               url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
             })
           }
-          // if(e.currentTarget.dataset.type != 0){
-          //   wx.showToast({
-          //     title: '保存成功',
-          //     icon: 'success',
-          //     duration: 2000,
-          //     complete(){
-          //       setTimeout(function(){
-          //         that.back();
-          //       },2000)
-          //     }
-          //   })
-          // }
+          if(e.currentTarget.dataset.type == 2){
+            wx.showToast({
+              title: '保存成功',
+              icon: 'success',
+              duration: 2000,
+              complete(){
+                setTimeout(function(){
+                  that.back();
+                },2000)
+              }
+            })
+          }
+          if(e.currentTarget.dataset.type == 1){
+            wx.showToast({
+              title: '保存成功',
+              icon: 'success',
+              duration: 2000,
+              complete(){
+                setTimeout(function(){
+                  that.back();
+                },2000)
+              }
+            })
+          }
           if(e.currentTarget.dataset.type == 3){
             UTIL.httpRequest(API.URL_GET_TOREVIEWSUBMIT+res.data.approvalItemTemplate.id , {method:'POST'}, {
               success: (res2) => {
@@ -917,6 +1032,24 @@ Page({
       ["form.approvalItemTemplate.approvalItems"]: even.detail.value,
     })
   },
+  errorPd(e){
+    console.log(e);
+    this.setData({
+      [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false
+    })
+  },
+  errorJE(e){
+    console.log(e);
+    this.setData({
+      [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false
+    })
+  },
+  errorYY(e){
+    console.log(e);
+    this.setData({
+      [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false
+    })
+  },
   SJtakephoto(e){
     var that = this;
     let fileForm = that.data.form.transfers[e.currentTarget.dataset.index].fileForm?that.data.form.transfers[e.currentTarget.dataset.index].fileForm:[];
@@ -1026,12 +1159,32 @@ Page({
     })
   },
   addList(){
+    var that = this;
     let transList = this.data.form.transfers;
+    console.log(this.data.form);
+    for (let i = 0; i < transList.length; i++) {
+      const element = transList[i];
+      if(element.applyDate == '' || element.remark == '' || element.payer == '' || element.payeeList[0].payee == '' || element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined){
+        UTIL.showToastNoneIcon('事项'+UTIL.convertToChinaNum(i+1)+'的信息填写不完整，检查后重试！');
+        return;
+      }
+    }
     transList.push({
       num:UTIL.convertToChinaNum(transList.length+1),
+      expenditureAmountTirme:false,
+      remarkTirme:false,
+      showCapitalExpenditureType:false,
+      showApplyDate:false,
+      showTransferType:false,
+      showProject:false,
+      showProjectFundType:false,
+      showAccount:false,
+      showDialog:false,
+      showContraction:false,
       SJimage:[],
       FPimage:[],
       QTimage:[],
+      showTitle:true,
       capitalExpenditureType:'',//资金支出类别
       capitalExpenditureTypeText:'',//资金支出类别（展示用）
       succeedAmount:'',//成功支付金额
@@ -1043,7 +1196,7 @@ Page({
       operatorCode:'',//操作员代码
       enterpriseCode:'',//企业编码
       expenditureAmount:'',//支出总金额
-      applyDate:'',//申请时间
+      applyDate:UTIL.formatDate(that.data.applyDate),//申请时间
       transferStatus:'',//转账状态
       auditStatus:'0',//审批状态
       paymentState:'',//支付状态
@@ -1068,10 +1221,37 @@ Page({
         bankType:'',//所属银行0其他银行1中国银行2农商行（山东省）3农业银行4建设银行5工商银行
         payeeAccount:'',//收款账户
       }],
+      projectForm:{
+        projectId:'',
+        projectName:'',
+        projectContractor:'',
+        projectAmount:'',
+        projectBillNum:'',
+        projectFundType:'',
+        outId:'',
+        ynType:'1',
+      },
+      contractionForm:{
+        contractionId:'',
+        name:'',
+        code:'',
+        totalAmount:'',
+      },
     });
     this.setData({
-      ["form.transfers"] : transList
+      ["form.transfers"] : transList,
+      activeNames:transList.length-1
+    })
+    for (let i = 0; i < this.data.form.transfers.length; i++) {
+      const element = this.data.form.transfers[i];
+      this.setData({
+        ["form.transfers["+i+"].showTitle"] : false,
+      })
+    }
+    this.setData({
+      ["form.transfers["+(transList.length-1)+"].showTitle"] : true,
     })
+    console.log(this.data.form);
   },
   openPreview(e){
     let array = [];
@@ -1103,6 +1283,10 @@ Page({
   },
   deleteTransfers(e){
     var that = this ;
+    console.log(e.currentTarget.dataset.index);
+    that.setData({
+      ["form.transfers["+e.currentTarget.dataset.index+"].collapseDis"]:true
+    })
     if(that.data.form.transfers.length<2){
       UTIL.showToastNoneIcon('最少保留一条事项');
       return;
@@ -1112,6 +1296,27 @@ Page({
       form:that.data.form
     })
   },
+  onOpen(e){
+    var that = this ;
+    console.log(that.data.activeNames);
+    console.log(e);
+    for (let i = 0; i < this.data.form.transfers.length; i++) {
+      const element = this.data.form.transfers[i];
+      this.setData({
+        ["form.transfers["+i+"].showTitle"] : false,
+      })
+    }
+    that.setData({
+      ["form.transfers["+e.detail+"].showTitle"]:true
+    })
+  },
+  onCloseSecond(e){
+    var that = this ;
+    console.log(e);
+    that.setData({
+      ["form.transfers["+e.detail+"].showTitle"]:false
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/apply/paymentTemplate/add/add.json

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

pages/apply/paymentTemplate/add/add.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" style="margin-top:{{isIPX?'100px':'75px'}};">
   <text class="box-title">审批事项</text>
   <input class="input_tit" placeholder="请输入审批事项" value="{{form.approvalItemTemplate.approvalItems}}" bindinput="bindKeyInput"/>
   <text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
@@ -12,13 +12,334 @@
   <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
   <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
   <text>总  金  额：{{form.approvalItemTemplate.totalAmount}}</text>
+</view> -->
+<!-- 
+  顶部审批事项红星  没填标红框
+  非空验证定位位置
+  支出总金额默认0.00
+ -->
+<view class="main-box top-box topBox" style="margin-top:{{isIPX?'100px':'75px'}};">
+  <text class="box-title">审批事项</text>
+
+  <van-field required focus="{{topInputTirme}}" error="{{topInputTirme}}" class="input_tittop {{topInputTirme?'error':''}}" data-formname="topInput" value="{{ form.approvalItemTemplate.approvalItems }}" placeholder="请输入审批事项" border="{{ false }}" bind:input="bindKeyInput" bind:blur="errorPd"/>
+  <text>支出总金额</text>
+  <view class="money_box">￥<input class="input_money" type="digit" disabled placeholder="总金额" placeholder-style="color:#E90000;" value="{{form.approvalItemTemplate.totalAmount}}"/></view>
+  <text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
+  <!-- <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text> class="input_tit" -->
+  <text>提<text style="margin-right:0.5rem;display: inline-block;"></text>交<text style="margin-right:0.5rem;display: inline-block;"></text>人：{{form.approvalItemTemplate.submitter}}</text>
+
+
+  <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
+  <van-field required label="申请时间：" readonly is-link value="{{ applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChangeTime" bindtap="openBox" data-name="showApplyDate" />
+  <van-calendar show="{{ showApplyDate }}" bind:close="closeBox"  data-name="showApplyDate" bind:confirm="onConfirmTime" data-value="form.transfers[{{index}}].applyDate" show-confirm="{{ false }}" />
 </view>
-<block wx:for="{{form.transfers}}" wx:key="index">
-  <view class="main-title">事项{{form.transfers[index].num}}<image src="/image/apply/delete.png" style="width: 25px;height: 25px;position: absolute;right: 4%;top: 7px;" data-index="{{index}}" bindtap="deleteTransfers"></image></view>
+
+  <van-collapse accordion value="{{ activeNames }}" bind:change="onChangeBox" bind:open="onOpen" bind:close="onCloseSecond">
+    <van-collapse-item name="{{index}}" disabled="{{item.collapseDis}}" is-link="{{false}}" wx:for="{{form.transfers}}" wx:key="index">
+      <view slot="title" wx:if="{{item.showTitle}}" class="main-title">事项{{form.transfers[index].num}}
+        <image src="/image/apply/delete.png" style="width: 24px;height: 24px;position: absolute;right: 4%;top: 10px;" data-index="{{index}}" bindtap="deleteTransfers"></image>
+        <image src="/image/apply/icon_close.png" style="width: 24px;height: 24px;position: absolute;right: calc(4% + 30px);top: 10px;transform: rotateX(180deg);" data-index="{{index}}" ></image>
+      </view>
+      <view slot="title" class="tit_box" wx:if="{{!item.showTitle}}">
+        <text class="title" style="text-align: center;">事项{{item.num}}</text>
+        <view class="top-box">
+          <text>支出金额</text>
+          <view class="money_box">￥<input class="input_money" disabled placeholder="金额" placeholder-style="color:#E90000;" value="{{item.expenditureAmount}}"/></view>
+          <van-cell-group border="{{ false }}">
+            <van-cell title="{{item.remark}}" border="{{ false }}" >
+              <view slot="icon" style="width: 15%;">事由：</view>
+            </van-cell>
+            <van-cell title="{{item.payer}}" border="{{ false }}" center >
+              <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_fu.png" style="width: 20px;height: 20px;"></image></view>
+            </van-cell>
+            
+            <van-cell title="{{item.payeeList[0].payee}}" center border="{{ false }}"  >
+              <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_shou.png" style="width: 20px;height: 20px;"></image></view>
+            </van-cell>
+            <view class="btnBox">
+              <image src="/image/apply/down.png" data-index="{{index}}" class="down"></image>
+              <!-- <image src="/image/apply/icon_update.png" class="update" bindtap="goUpdate"></image> -->
+              <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="申请流水号" value="{{ form.approvalItemTemplate.telephone }}" placeholder="请输入申请流水号" border="{{ false }}" bind:change="onChange" input-align="right"/> -->
+          
+
+          <van-field required label="支出金额" focus="{{form.transfers[index].expenditureAmountTirme}}" error="{{form.transfers[index].expenditureAmountTirme}}" type="digit" value="{{ form.transfers[index].expenditureAmount }}" placeholder="请输入支出金额" border="{{ false }}"  data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bind:change="onChangeMoney" bind:blur="errorJE"/>
+
+          <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
+
+          <van-field required label="支出原因" focus="{{form.transfers[index].remarkTirme}}" error="{{form.transfers[index].remarkTirme}}" value="{{  form.transfers[index].remark }}" placeholder="请输入支出原因" border="{{ false }}" bind:change="onChange" input-align="right" data-formname="form.transfers[{{index}}].remark" data-value="form.transfers[{{index}}].remark" bind:blur="errorYY"/>
+          <van-popup show="{{form.transfers[index].showCapitalExpenditureType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showCapitalExpenditureType">
+            <van-picker
+              columns="{{capitalExpenditureTypeOptions}}"
+              show-toolbar
+              value-key="dictLabel"
+              bind:cancel="closeBox"
+              bind:confirm="onConfirmPick"
+              data-name="form.transfers[{{index}}].showCapitalExpenditureType"
+              data-value="form.transfers[{{index}}].capitalExpenditureType"
+            />
+          </van-popup>
+          <van-field required label="资金支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择资金支出类别" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showCapitalExpenditureType"/>
+        </view>
+        <block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
+          <text class="title">关联项目</text>
+          <view class="main-box table-box">
+            <van-popup show="{{form.transfers[index].showProject}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showProject">
+              <van-picker
+                columns="{{projectOptions}}"
+                show-toolbar
+                value-key="projectName"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmProject"
+                data-name="form.transfers[{{index}}].showProject"
+                data-value="form.transfers[{{index}}].projectForm"
+              />
+            </van-popup>
+            <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="form.transfers[{{index}}].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="{{form.transfers[index].showProjectFundType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showProjectFundType">
+              <van-picker
+                columns="{{projectFundTypeOptions}}"
+                show-toolbar
+                value-key="dictLabel"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmPick"
+                data-name="form.transfers[{{index}}].showProjectFundType"
+                data-value="form.transfers[{{index}}].projectForm.projectFundType"
+              />
+            </van-popup>
+            <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="form.transfers[{{index}}].showProjectFundType"/>
+
+            <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>
+
+        <block wx:if="{{form.transfers[index].capitalExpenditureType == 4}}">
+          <text class="title">关联合同</text>
+          <view class="main-box table-box">
+            <van-popup show="{{form.transfers[index].showContraction}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showContraction">
+              <van-picker
+                columns="{{contractionOptions}}"
+                show-toolbar
+                value-key="name"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmContraction"
+                data-name="form.transfers[{{index}}].showContraction"
+                data-value="form.transfers[{{index}}].contractionForm.name"
+              />
+            </van-popup>
+            <van-field label="合同名称" readonly value="{{ form.transfers[index].contractionForm.name }}" placeholder="请选择合同名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="form.transfers[{{index}}].showContraction"/>
+            <van-field label="合同编码" value="{{ form.transfers[index].contractionForm.code }}" placeholder="请输入合同编码" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field label="合同价款(元)" readonly value="{{ form.transfers[index].contractionForm.totalAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            
+          </view>
+        </block>
+
+
+        <text class="title">付款方信息</text>
+        <view class="main-box table-box">
+          <van-popup show="{{form.transfers[index].showTransferType}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showTransferType">
+            <van-picker
+              columns="{{transferTypeOptions}}"
+              show-toolbar
+              value-key="dictLabel"
+              bind:cancel="closeBox"
+              bind:confirm="onConfirmaTransfer"
+              data-name="form.transfers[{{index}}].showTransferType"
+              data-value="form.transfers[{{index}}]"
+            />
+          </van-popup>
+          <van-field required label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showTransferType"/>
+
+          <van-popup show="{{form.transfers[index].showAccount}}" round position="bottom"  bind:close="closeBox" data-name="form.transfers[{{index}}].showAccount">
+            <van-picker
+              columns="{{accountOptions}}"
+              show-toolbar
+              value-key="accountName"
+              bind:cancel="closeBox"
+              bind:confirm="onConfirmAccount"
+              data-name="form.transfers[{{index}}].showAccount"
+              data-value="form.transfers[{{index}}]"
+            />
+          </van-popup>
+          <van-field required wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showAccount">
+            <view slot="label">
+              付款方<van-tag plain type="danger" color="red" round style="margin-left:10px;">必填</van-tag>
+            </view>
+          </van-field>
+
+          <van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          <block wx:elif="{{form.transfers[index].transferType == 12}}">
+            <van-popup show="{{showAccount}}" round position="bottom"  bind:close="closeBox" data-name="showMoneyorder">
+              <van-picker
+                columns="{{moneyorderOptions}}"
+                show-toolbar
+                value-key="accountName"
+                bind:cancel="closeBox"
+                bind:confirm="onConfirmMoneyorder"
+                data-name="showMoneyorder"
+                data-value="form.transfers[{{index}}]"
+              />
+            </van-popup>
+            <van-field readonly label="出票方" value="{{ form.transfers[index].payerAccount }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showMoneyorder"/>
+
+            <van-field readonly label="汇票号码" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="出票金额(元)" value="{{ form.transfers[index].bankTypeText }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="汇票类型" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="开票日" value="{{ form.transfers[index].bankTypeText }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          </block>
+          <block wx:else>
+            <van-field required readonly label="付款方账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field required readonly label="所属银行" value="{{ form.transfers[index].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          </block>
+
+        </view>
+        <text class="title">收款方信息</text>
+        <view class="center-box">
+          <view class="main-box table-box" wx:if="{{form.transfers[index].bankType == 1 && form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12}}">
+            <van-cell title="收款账户类型" center border="{{false}}">
+              <view style="float: right;">
+                <van-radio-group
+                  value="{{ form.transfers[index].bankAccountType }}"
+                  bind:change="onChange"
+                  direction="horizontal"
+                  data-value="form.transfers[{{index}}].bankAccountType"
+                >
+                  <van-radio name="1" checked-color="#2C8E68">公户</van-radio>
+                  <van-radio name="2" checked-color="#2C8E68">私户</van-radio>
+                </van-radio-group>
+              </view>
+            </van-cell>
+          </view>
+          <!-- <view class="main-box table-box" wx:if="{{(form.transfers[index].bankType == 2 || form.transfers[index].bankType == 3 || form.transfers[index].bankType == 4) && (form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12)}}">
+            <van-cell title="是否同行" center border="{{false}}">
+              <view style="float: right;">
+                <van-radio-group
+                  value="{{ form.transfers[index].isPeers }}"
+                  bind:change="onChange"
+                  direction="horizontal"
+                  data-value="form.transfers[{{index}}].isPeers"
+                >
+                  <van-radio name="Y" checked-color="#2C8E68">是</van-radio>
+                  <van-radio name="N" checked-color="#2C8E68">否</van-radio>
+                </van-radio-group>
+              </view>
+            </van-cell>
+          </view> -->
+
+          <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
+            <van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" 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 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 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>
+
+        <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 class="main-box steps-box">
+          <view class="steps-tit">审批流程</view>
+          <van-row wx:for="{{steps}}" wx:key="index">
+            <van-col span="3">
+              <view class="index">{{index+1}}</view>
+              <block wx:if="{{index==0}}">
+                <view class="indexBorder">
+                  <view class="ssT" wx:if="{{index>0}}"></view>
+                  <view class="yq"></view>
+                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="indexBorder indexCenter">
+                  <view class="ssT" wx:if="{{index>0}}"></view>
+                  <view class="yq"></view>
+                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
+                </view>
+              </block>
+            </van-col>
+            <van-col span="21">
+              <van-cell title="{{item.activityName}}" center="{{true}}" border="{{false}}">
+                <view class="agree" wx:if="{{item.type=='1'}}">{{ item.assigneeName }}</view>
+                <view class="in" wx:if="{{item.type=='2'}}">{{ item.assigneeName }}</view>
+                <view class="disagree" wx:if="{{item.type=='3'}}">{{ item.assigneeName }}</view>
+              </van-cell>
+
+              <van-cell center border="{{false}}">
+                <view slot="title">
+                  <view style="color: #999999;">{{ item.durationInMillis }}</view>
+                </view>
+                <view style="color: #999999;font-size: 12px;">{{ item.endTime }}</view>
+              </van-cell>
+            </van-col>
+          </van-row>
+        </view> -->
+      </view>
+    </van-collapse-item>
+  </van-collapse>
+
+   <!--  <block wx:for="{{form.transfers}}" wx:key="index">
+<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 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 }}" />
 
@@ -202,9 +523,6 @@
 
     <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>
@@ -242,46 +560,8 @@
         </view>
       </view>
     </view>
-
-    <!-- <view class="main-box steps-box">
-      <view class="steps-tit">审批流程</view>
-      <van-row wx:for="{{steps}}" wx:key="index">
-        <van-col span="3">
-          <view class="index">{{index+1}}</view>
-          <block wx:if="{{index==0}}">
-            <view class="indexBorder">
-              <view class="ssT" wx:if="{{index>0}}"></view>
-              <view class="yq"></view>
-              <view class="ss" wx:if="{{steps.length != index+1}}"></view>
-            </view>
-          </block>
-          <block wx:else>
-            <view class="indexBorder indexCenter">
-              <view class="ssT" wx:if="{{index>0}}"></view>
-              <view class="yq"></view>
-              <view class="ss" wx:if="{{steps.length != index+1}}"></view>
-            </view>
-          </block>
-        </van-col>
-        <van-col span="21">
-          <van-cell title="{{item.activityName}}" center="{{true}}" border="{{false}}">
-            <view class="agree" wx:if="{{item.type=='1'}}">{{ item.assigneeName }}</view>
-            <view class="in" wx:if="{{item.type=='2'}}">{{ item.assigneeName }}</view>
-            <view class="disagree" wx:if="{{item.type=='3'}}">{{ item.assigneeName }}</view>
-          </van-cell>
-
-          <van-cell center border="{{false}}">
-            <view slot="title">
-              <view style="color: #999999;">{{ item.durationInMillis }}</view>
-            </view>
-            <view style="color: #999999;font-size: 12px;">{{ item.endTime }}</view>
-          </van-cell>
-        </van-col>
-      </van-row>
-    </view> -->
-    
   </view>
-</block>
+</block> -->
 
 <block wx:if="{{!isUpdate}}">
   <view class="bottomBtn">
@@ -296,13 +576,14 @@
   </view>
 
   <view class="bottom">
-    <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view>
+    <!-- <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view> -->
+    <view class="btn1" bindtap="back">上一步</view>
     <view class="btn2" data-type="0" bindtap="goSubmit">下一步</view>
   </view>
 </block>
 <block wx:if="{{isUpdate}}">
   <view class="bottom">
-    <view class="btn3" data-type="0" bindtap="goKeep">保存</view>
+    <view class="btn3" data-type="2" bindtap="goKeep">保存</view>
   </view>
 </block>
 <view class="ipXbtn"></view>

pages/apply/paymentTemplate/add/add.wxss

@@ -17,13 +17,16 @@ text{display: block;}
   width: 100%;
   font-size: 16px;
 }
-.input_tit{
+.input_tittop input{
   border: 1px solid #DCDCDC;
   padding: 0px 10px;
   height: 32px;
   line-height: 32px;
   border-radius: 5px;
-  margin-bottom: 15px;
+  width: 100%;
+}
+.error input{
+  border: 1px solid red!important;
 }
 .bgPage{
   width: 140%;
@@ -33,7 +36,8 @@ text{display: block;}
   z-index: -1;
 }
 .center{
-  padding-bottom: 28px;
+  padding-bottom: 15px;
+  background: #f2f2f2;
 }
 .main-title{
   background-image: linear-gradient(to right, #2C8E68 , #B3DB62);
@@ -57,9 +61,23 @@ text{display: block;}
 .title{
   padding: 10px calc(3% + 20px);
 }
+.topBox .van-cell{
+  padding: 0!important;
+  margin-bottom: 15px;
+}
+.topBox .van-cell .van-cell__title, .topBox .van-cell .van-cell__value , .topBox .van-cell .van-field__label{
+  font-size: 15px;
+  color: #000000!important;
+}
+.topBox .van-cell .van-cell__title{
+  margin-right: 0!important;
+  max-width: 76px!important;
+  min-width: 76px!important;
+}
+
 .top-box{
-  margin-top: 20px;
-  margin-bottom: 28px;
+  /* margin-top: 20px;
+  margin-bottom: 28px; */
 }
 .top-box text{
   margin-bottom: 15px;
@@ -93,7 +111,7 @@ text{display: block;}
   border: 1px solid red;
   color: red;
 }
-.van-cell{
+.table-box .van-cell{
   padding: 0!important;
 }
 @font-face {
@@ -113,7 +131,7 @@ text{display: block;}
   text-align: center;
   border-radius: 5px;
   white-space:pre-wrap;
-  padding: 22px 15px;
+  padding: 22px 8px;
 }
 .fj-li{
   margin-top: 20px;
@@ -133,6 +151,7 @@ text{display: block;}
   width: 94%;
   margin: 0 auto;
   justify-content:space-between;
+  margin-top: 30px;
 }
 .bottomBtn view{
   display: flex;
@@ -341,4 +360,88 @@ text{display: block;}
   }
   .van-cell--required:before {
     left: -8px!important;
-  }
+  }
+  .input_money{
+    padding: 0px 10px;
+    height: 32px;
+    line-height: 32px;
+    color: #E90000;
+    font-size: 26px;
+    display: inline-block;
+    width: 50%;
+    text-align: center;
+  }
+  
+  .money_box{
+    font-size: 26px;
+    border-bottom:1px solid #DCDCDC;
+    width: 70%;
+    margin: 0 auto;
+    margin-bottom: 15px;
+    color: #E90000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .btnBox{
+    text-align: center;
+    position: relative;
+    height: 26px;
+  }
+  .down{
+    width: 15px;
+    height: 8px;
+    margin: 0 auto;
+    margin-top: 18px;
+  }
+  
+  .update{
+    width: 26px;
+    height: 26px;
+    position: absolute;
+    right: 41px;
+  }
+  .delete{
+    width: 26px;
+    height: 26px;
+    position: absolute;
+    right: 0;
+  }
+
+  .van-collapse-item {
+    background: transparent;
+      margin: 0 auto;
+      width: 100%;
+      margin: 0 auto;
+      margin-top: 15px;
+  }
+  .van-collapse-item__content{
+    padding: 0!important;
+  }
+  
+  .van-collapse .van-cell{
+    padding: 0;
+    background: transparent;
+  }
+
+  .van-collapse .tit_box .title{
+    text-align: center;
+    font-size: 18px;
+  }
+  .van-collapse .main-box{
+    /* padding: 0;
+    box-shadow: none; */
+  }
+  .van-collapse .tit_box{
+    width: 94%;
+    background: #ffffff;
+    margin: 0 auto;
+    border-radius: 10px;
+    box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
+    padding: 20px;
+  }
+  .van-collapse .tit_box .top-box .van-cell{
+    margin-bottom: 15px;
+  }
+  

pages/apply/paymentTemplate/paymentTemplate.js

@@ -142,14 +142,83 @@ Page({
    */
   onLoad(options) {
     var that = this ;
+    //所属银行
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          bankTypeOptions:res.data
+        });
+      }
+    })
+    // 资金支出类别字典查询
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'capital_expenditure_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          capitalExpenditureTypeOptions:res.data,
+        })
+      }
+    })
+    // 付款方式类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          transferTypeOptions:res.data,
+        })
+      }
+    })
+    // 项目工程列表 
+    UTIL.httpRequest(API.URL_GET_GETPROJECTLIST , {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          projectOptions:res.rows,
+        })
+      }
+    })
+    // 工程款类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'project_fund_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          projectFundTypeOptions:res.data,
+        })
+      }
+    })
+    // 获取合同信息列表
+    UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          contractionOptions:res.rows,
+        })
+      }
+    })
     UTIL.httpRequest(API.URL_GET_APPROVALITEMS + options.id, {method:'GET'}, {
       success: (res) => {
         let transList = res.data.transfers;
-        let countMoney = that.data.countMoney
         transList.forEach((item,index) => {
           item.num = UTIL.convertToChinaNum(index+1)
-          countMoney +=  parseInt(item.expenditureAmount);
+          
+          transList[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
 
+          transList[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
+
+          transList[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
+
+          transList[index].payeeList.forEach( (response,i) => {
+            transList[index].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, 
@@ -277,7 +346,6 @@ Page({
         
         that.setData({
           form:res.data,
-          countMoney:countMoney
         });
         
       }
@@ -296,13 +364,13 @@ Page({
       UTIL.showToastNoneIcon('最少保留一条事项');
       return;
     }
-    let countMoney = that.data.countMoney;
+    let countMoney = that.data.form.approvalItemTemplate.totalAmount;
     console.log(that.data.form);
     countMoney -=  parseInt(that.data.form.transfers[e.currentTarget.dataset.index].expenditureAmount);
     that.data.form.transfers.splice(e.currentTarget.dataset.index, 1); 
     that.setData({
       form : that.data.form,
-      countMoney:countMoney
+      ["that.data.form.approvalItemTemplate.totalAmount"]:countMoney
     })
     UTIL.showToastNoneIcon('删除成功！');
   },

pages/apply/paymentTemplate/paymentTemplate.wxml

@@ -8,7 +8,7 @@
   <text class="box-title">审批事项</text>
   <input class="input_tit" placeholder="房屋出租整年费用" readonly value="{{form.approvalItemTemplate.approvalItems}}"/>
   <text>支出总金额</text>
-  <view class="money_box">￥<input class="input_money" readonly placeholder="总金额" placeholder-style="color:#E90000;" value="{{countMoney}}"/></view>
+  <view class="money_box">￥<input class="input_money" readonly placeholder="总金额" placeholder-style="color:#E90000;" value="{{form.approvalItemTemplate.totalAmount}}"/></view>
   <text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
   <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
   <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
@@ -55,11 +55,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>
 

pages/index/index.wxml

@@ -4,8 +4,9 @@
     <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
     <!--账户信息-->
     <view class="information_header">
-        <navigator url="{{'settle/index?item='+item}}" class="setup" style="background:url('https://dazu.nongshen.net/api/profile/wechat/setup.png') no-repeat; background-size: 100%  100%;"></navigator> 
-        <view class="portrait_head"></view>
+        <navigator url="{{'settle/index?item='+item}}">
+          <view class="portrait_head"></view>
+        </navigator> 
         <view class="information_main">
             <view class="name_wrap">
                 <text class="name">{{userInfoObj.nickName}}</text>

pages/payee/index.js

@@ -26,6 +26,7 @@ Page({
       bankType:options.bankType,//所属银行
       accountType:options.accountType,//账户类型
       payeeType:options.transferType,//申请转帐类型
+      money:options.money,//申请转帐类型
       index:options.index
     })
     var that = this;
@@ -144,6 +145,7 @@ Page({
       return;
     }
     let array = that.data.list.filter(function (e) { return e.id == that.data.result; });
+    array[0].incomeAmount = that.data.money;
     console.log(array);
     let pages = getCurrentPages();
     let currentPage = null;   //当前页面

pages/user/login/login.wxml

@@ -2,13 +2,14 @@
 <import src="/templates/global/global"/>
 <template is="toast" data="{{...toastData}}"></template>
 <view class="container" style="background: url('https://dazu.nongshen.net/api/profile/wechat/container_bg.jpg') center center  no-repeat; background-size: 100% auto;">    
-    <view class="header"  >
-        <view class="principal">农村事项审批与记账</view>
-         <view class="instructions">报账简单，操作便捷</view>
+    <view class="header" style="text-align: center;" >
+        <!-- <view class="principal">农村事项审批与记账</view>
+         <view class="instructions">报账简单，操作便捷</view> -->
+         <image src="/image/login/login_text.png" style="width: 80%;margin: 0 auto;" mode="widthFix"></image>
     </view>
-    <view class="quick-login" style="bottom:{{isIPhoneX?'8vh':'5vh'}}">
+    <view class="quick-login" style="bottom:{{isIPhoneX?'6vh':'4vh'}}">
         <button  class="key-login"  type='primary' open-type='getPhoneNumber' bindgetphonenumber="getPhoneNumber">微信一键登录</button >
-        <view class="authorization" style="margin-top:{{isIPhoneX?'5vh':'3vh'}}">
+        <view class="authorization" style="margin-top:{{isIPhoneX?'2vh':'2vh'}}">
             <checkbox-group bindchange="checkboxChange">
                 <label>
                     <checkbox value="privacy" checked="{{privacyCheck}}" class="changeSize" />
@@ -16,5 +17,6 @@
                 </label>
             </checkbox-group>
         </view>
+        <text style="display: block;text-align: center;color: #fff;margin-top: 3vh;">北京农燊高科信息技术有限公司</text>
     </view>
 </view>

utils/API.js

@@ -82,7 +82,7 @@ const URL_GET_TEMPLATEDETAIL = `${URL_PREFIX}/service/templateDetail/list`;
 //根据系统组织机构id查询所在乡镇
 const URL_GET_TOWNINFOBYDEPTID = `${URL_PREFIX}/system/dept/getTownInfoByDeptId/`;
 //根据条件查询用户信息
-const URL_GET_USERLIST = `${URL_PREFIX}/system/user/query`;
+const URL_GET_USERLIST = `${URL_PREFIX}/system/user/queryUserByBookId`;
 //新增模板
 const URL_POST_MOBILEADD = `${URL_PREFIX}/service/template/mobileAdd`;
 //删除模板
@@ -143,6 +143,12 @@ const URL_GET_ADDPROJECTTO = `${URL_PREFIX}/yinnong/project/addProjectto`;
 //根据申请转账id获取关联的项目工程信息
 const URL_GET_GETPROJECTTO = `${URL_PREFIX}/yinnong/project/getProjectto`;
 
+//增加转账申请关联合同信息
+const URL_GET_GETRELATIONADD = `${URL_PREFIX}/contraction/info/relationAdd`;
+
+//根据申请转账id获取关联合同信息
+const URL_GET_GETSELECTINFOBYOUTID = `${URL_PREFIX}/contraction/info/selectInfoByOutId`;
+
 
 
 /****************接口地址end****************/
@@ -205,5 +211,7 @@ export {
     URL_GET_TOREVIEWSUBMIT,
     URL_GET_REVIEWPROCESS,
     URL_GET_ADDPROJECTTO,
-    URL_GET_GETPROJECTTO
+    URL_GET_GETPROJECTTO,
+    URL_GET_GETRELATIONADD,
+    URL_GET_GETSELECTINFOBYOUTID
 }