diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js index 5db9ee3..911ce19 100644 --- a/pages/apply/approval/approval.js +++ b/pages/apply/approval/approval.js @@ -456,11 +456,24 @@ Page({ 'Authorization':'Bearer '+getApp().globalData.userInfo.token }, success: function (r) { - wx.showToast({ - title: "提交成功!", - duration: 2000, - icon:"success" - }) + if (r.data.code == API.SUCCESS_CODE) { + wx.showToast({ + title: "提交成功!", + duration: 2000, + icon:"success" + }) + setTimeout(function(){ + wx.switchTab({ + url: '/pages/index/index' + }) + },2000) + }else{ + wx.showToast({ + title: "操作失败!", + duration: 2000, + icon:"error" + }) + } }, }) }, diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 1244d63..39bf39c 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -45,8 +45,8 @@ Page({ }, transfers:[{//事项信息集合以下是List对象信息 num:"一", - capitalExpenditureType:'',//资金支出类别 - capitalExpenditureTypeText:'',//资金支出类别(展示用) + capitalExpenditureType:'1',//资金支出类别 + capitalExpenditureTypeText:'结算类',//资金支出类别(展示用) succeedAmount:'',//成功支付金额 payer:'',//付款方 payerAccount:'',//付款方账户 @@ -64,8 +64,8 @@ Page({ paymentTime:'',//支付时间 bankPriority:'',//银行处理优先级 clientPriority:'',//客户处理优先级 - transferType:'',//付款方式 - transferTypeText:'',//付款方式(展示用) + transferType:'1',//付款方式 + transferTypeText:'村账户转账',//付款方式(展示用) requiredTransferTime:'',//要求转账时间 remark:'',//付款事由 startTime:'',//开票日期 diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index 732eefa..adfc6eb 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -21,6 +21,7 @@ Page({ FPimage: [], QTimage: [], fileForm:[], + activeNames: ['1'], }, showPopup() { this.setData({ show: true }); @@ -310,6 +311,11 @@ Page({ delta: 1 }) }, + onChange(event) { + this.setData({ + activeNames: event.detail, + }); + }, /** * 生命周期函数--监听页面显示 */ diff --git a/pages/apply/paymentTemplate/paymentTemplate.json b/pages/apply/paymentTemplate/paymentTemplate.json index 7c415ff..8e81dac 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.json +++ b/pages/apply/paymentTemplate/paymentTemplate.json @@ -4,6 +4,8 @@ "van-cell-group": "@vant/weapp/cell-group/index", "van-icon": "@vant/weapp/icon/index", "van-dialog": "@vant/weapp/dialog/index", - "van-field": "@vant/weapp/field/index" + "van-field": "@vant/weapp/field/index", + "van-collapse": "@vant/weapp/collapse/index", + "van-collapse-item": "@vant/weapp/collapse-item/index" } } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index ce36edb..6aac790 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -14,6 +14,38 @@ 提 交 人:{{form.approvalItemTemplate.submitter}} 联系电话:{{form.approvalItemTemplate.telephone}} + + + + + 事项{{item.num}} + + 支出金额 + + + + 事由: + + + + + + + + + + + + + + + + + 代码是写出来给人看的,附带能在机器上运行 + + + + 事项{{item.num}} diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss index edd2ef2..5483208 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxss +++ b/pages/apply/paymentTemplate/paymentTemplate.wxss @@ -61,6 +61,22 @@ text{display: block;} box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); } +.van-collapse-item .van-cell{ + width: 94%; + margin: 0 auto; +} +.van-collapse-item .van-cell .tit_box{ + background: #ffffff; + padding: 20px; + /* width: 94%; */ + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} +.van-collapse-item__content{ + width: 94%; + margin: 0 auto; +} .top-box text{ margin-bottom: 15px; }