diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js index ef426ec..7553c2f 100644 --- a/pages/apply/approval/approval.js +++ b/pages/apply/approval/approval.js @@ -63,6 +63,7 @@ Page({ */ onLoad(options) { this.setData({itemId:options.id}); + console.log(options) //this.getApprovalItemList(); this.groupList(); this.townList(); diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml index 47174b4..fe77104 100644 --- a/pages/apply/approval/approval.wxml +++ b/pages/apply/approval/approval.wxml @@ -41,17 +41,17 @@ - {{item.roles[0].roleName}}:{{item.nickName}} + {{item.roles[0].roleName}}:{{item.nickName}} - {{item.roles[0].roleName}}:{{item.nickName}} + {{item.roles[0].roleName}}:{{item.nickName}} - {{item.roles[0].roleName}}:{{item.nickName}} + {{item.roles[0].roleName}}:{{item.nickName}} @@ -80,7 +80,7 @@ --> - + diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index f7a7e52..1dc1967 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -602,6 +602,10 @@ Page({ }, goPayeeList(event){ console.log(event); + if(event.currentTarget.dataset.payer == null || event.currentTarget.dataset.payer == ''){ + UTIL.showToastNoneIcon('请先选择付款方!'); + return; + } if(event.currentTarget.dataset.accounttype == null ){ event.currentTarget.dataset.accounttype = '' } @@ -685,9 +689,9 @@ Page({ formData:element, success (response){ console.log(res); - if((j+1) == that.data.form.transfers[j].length && (i+1) == that.data.form.transfers[j].fileForm[i].length && e.currentTarget.dataset.type == 0){ + if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){ wx.navigateTo({ - url: '/pages/apply/approval/approval?id='+res.data.id, + url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id, }) } }, @@ -709,6 +713,7 @@ Page({ 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:[]; + wx.chooseMedia({ count: 9, mediaType: ['image','video'], @@ -729,7 +734,7 @@ Page({ console.log(fileForm); that.setData({ ["form.transfers["+e.currentTarget.dataset.index+"].SJimage"]:res.tempFiles, - ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm + ["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm, }) } }) diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml index 9967556..feafafe 100644 --- a/pages/apply/paymentTemplate/add/add.wxml +++ b/pages/apply/paymentTemplate/add/add.wxml @@ -186,7 +186,7 @@ - + 姓名收款方 @@ -208,7 +208,7 @@ 附件可拍照 - 总数 {{form.transfers[index].imgcount}}张 + 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index 3321c16..fe3dad9 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -72,7 +72,7 @@ Page({ console.log(res); if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){ wx.navigateTo({ - url: '/pages/apply/approval/approval?id='+res.data.id, + url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id, }) } if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type != 0){ diff --git a/pages/payee/index.js b/pages/payee/index.js index 6c3a4c4..d032c0e 100644 --- a/pages/payee/index.js +++ b/pages/payee/index.js @@ -109,6 +109,7 @@ Page({ 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({