Skip to content

R
rbc-demo
Commit da3ca9d3 by 乔延琦
Options

Merge branch 'develop-zhouyi' into 'develop' 

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!129
parents eb909d88 0cc81ff9
Showing with 62 additions and 80 deletions
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
...@@ -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(
......
develop/@gms/gms-plugin-billexpand/src/formula/CheckSublistSize.js
...@@ -8,32 +8,12 @@ export default { ...@@ -8,32 +8,12 @@ export default {
if (context.getTableType) { if (context.getTableType) {
let _tn = context.getTableType(table); let _tn = context.getTableType(table);
let _data = context.getSubData(_tn.title); let _data = context.getSubData(_tn.title);
if (_data instanceof Array) { return _data.length>0
let field = arguments[0][0].FieldCode
let matchProp = arguments[0][1].StaticValue
let matchValue = arguments[0][2].StaticValue
if (matchValue) {
for (const iterator of _data) {
let _val = iterator.getValue(field)
if (_val instanceof Object) {
if (_val[matchProp] == matchValue) {
size++;
}
} else {
if (_val == matchValue) {
size++;
}
}
}
} else {
size = _data.length
}
}
} }
} }
return size return size
}, },
getResultType: function () { getResultType: function () {
return FMR.ConstDataTypes.General; return 1;
} }
} }
\ No newline at end of file
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