diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js index a57f3c2..c68a839 100644 --- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js +++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js @@ -14,7 +14,9 @@ Page({ nowScore:'', remark:'' }, - scoreMsg:'' + scoreMsg:'', + overruleShow:false, + remark:'' }, /** @@ -121,7 +123,18 @@ Page({ }, //驳回 - handleOverrule(){ + handleOverruleOpen(){ + this.setData({ + overruleShow:true + }) + }, + handleOverruleClose(){ + this.setData({ + overruleShow:false, + remark:'' + }) + }, + handleOverruleSubmit(){ let _this = this; wx.showModal({ title: '温馨提示', @@ -129,7 +142,8 @@ Page({ success (res) { if (res.confirm) { API.reback({ - id:_this.data.fData.id + id:_this.data.fData.id, + remark:_this.data.remark }).then(res => { if(res.code === 0){ wx.showToast({ diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml index feda129..0f018a8 100644 --- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml +++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml @@ -69,7 +69,26 @@ 审批人:{{fData.reviewer || '暂无'}} 审批 - 驳回 + 驳回 + + + + + + + + 提交 + + \ No newline at end of file diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss index 9872eaf..ae27f62 100644 --- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss +++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss @@ -52,4 +52,10 @@ font-size: 30rpx; text-align: center; margin-top: 10px; +} +.overrule_wrap{ + width: 96%; + margin: 0 auto; + box-sizing: border-box; + padding: 10px; } \ No newline at end of file