Commit 84a2de49 by Joey

fix(@gms/gms-plugin-billexpand): 同意按钮先调后端校验,后走选择审批人逻辑

parent eb909d88
...@@ -84,71 +84,72 @@ export default { ...@@ -84,71 +84,72 @@ export default {
}) })
}, },
approvalLogical: function (bill, param) { approvalLogical: function (bill, param) {
let taskId = bill.getGlobalParam('reviewParam').taskId; const getApprovalList = () => {
bill.setControlsSate(param["_control_name_"], "enable", false) let taskId = bill.getGlobalParam('reviewParam').taskId;
let selectedApprovers = [] bill.setControlsSate(param["_control_name_"], "enable", false)
window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => { let selectedApprovers = []
if (res.data.code == 204) { window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
this.executeApproval(bill, param) if (res.data.code == 204) {
return this.executeApproval(bill, param)
} return
else if (res.data.code != 200) { }
else if (res.data.code != 200) {
bill.setControlsSate(param["_control_name_"], "enable", true)
GMS.$hideContainer.$Message.error(res.data.msg || '提交失败,请联系系统管理员');
return
}
bill.setControlsSate(param["_control_name_"], "enable", true) bill.setControlsSate(param["_control_name_"], "enable", true)
GMS.$hideContainer.$Message.error(res.data.msg || '提交失败,请联系系统管理员'); const nodeData = res.data.ApproverVo
return const optionList = [...nodeData.approvers]
} if (optionList.length == 0) {
bill.setControlsSate(param["_control_name_"], "enable", true) GMS.$hideContainer.$Message.error('未找到下一节点的审批人')
const nodeData = res.data.ApproverVo return
const optionList = [...nodeData.approvers] }
if (optionList.length == 0) { GMS.$hideContainer.$Modal.confirm({
GMS.$hideContainer.$Message.error('未找到下一节点的审批人') width: 700,
return render: (h) => {
} return h(
GMS.$hideContainer.$Modal.confirm({ SelectApprovers,
width: 700, {
render: (h) => { props: {
return h( optionList,
SelectApprovers, },
{ on: {
props: { 'on-change': (val) => {
optionList, selectedApprovers = val
}, }
on: {
'on-change': (val) => {
selectedApprovers = val
} }
} }
} )
) },
}, onOk: () => {
onOk: () => { window.GMS.$http.post(
window.GMS.$http.post( '/bpm/bill/selectApprover/addApprovers',
'/bpm/bill/selectApprover/addApprovers', {
{ ...nodeData,
...nodeData, approvers: selectedApprovers,
approvers: selectedApprovers, }
} ).then(() => {
).then(() => { this.executeApproval(bill, param)
this.executeApproval(bill, param) }).catch(() => {
}).catch(() => { GMS.$hideContainer.$Message.error('选择审批人发生错误')
GMS.$hideContainer.$Message.error('选择审批人发生错误') })
}) },
}, onCancel: () => {
onCancel: () => { }
} });
}); }).catch(() => {
}).catch(() => { GMS.$hideContainer.$Message.error('未找到下一节点的审批人');
GMS.$hideContainer.$Message.error('未找到下一节点的审批人'); })
}) }
},
executeApproval: function(bill, param) {
if (param.param.actions) { if (param.param.actions) {
let saveParam = { let saveParam = {
actions: param.param.actions actions: param.param.actions
} }
bill.executeServerAction(saveParam, function (code, data) { bill.executeServerAction(saveParam, function (code, data) {
if (code === 200) { if (code === 200) {
this.approval(bill, param); getApprovalList()
} else { } else {
bill.setControlsSate(param["_control_name_"], "enable", true) bill.setControlsSate(param["_control_name_"], "enable", true)
if (data.message.includes('还款金额不能大于未还金额')) { if (data.message.includes('还款金额不能大于未还金额')) {
...@@ -160,10 +161,10 @@ export default { ...@@ -160,10 +161,10 @@ export default {
} }
}.bind(this)); }.bind(this));
} else { } else {
this.approval(bill, param); getApprovalList()
} }
}, },
approval: function (bill, param) { executeApproval: function(bill, param) {
let taskId = bill.getGlobalParam('reviewParam').taskId; let taskId = bill.getGlobalParam('reviewParam').taskId;
let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : ""; let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : "";
GMS.$http.post('/rbc/workflow/approve/completed/' + taskId + '?result=1&comments=' + comments).then( GMS.$http.post('/rbc/workflow/approve/completed/' + taskId + '?result=1&comments=' + comments).then(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment