Compare commits

..

No commits in common. "fe17edeb39ce2794bd19789395a774c4931f5aa4" and "5f8659f7f4ffbe68946c2a731e0ec68fd743c09e" have entirely different histories.

2 changed files with 6 additions and 6 deletions

View File

@ -65,7 +65,7 @@
<a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="" cancel-text="" <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="" cancel-text=""
@confirm="endThis(item.instanceId)" @cancel="cancel"> @confirm="endThis(item.instanceId)" @cancel="cancel">
<a-button type="primary" danger style="margin-left: 10px"> <a-button type="primary" danger style="margin-left: 10px">
撤回申请 流程终止
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
</div> </div>
@ -271,10 +271,10 @@ console.log(props.refObj, '=====================================')
const endThis = (instanceId) => { const endThis = (instanceId) => {
endProcess({ instanceId: instanceId }).then((res) => { endProcess({ instanceId: instanceId }).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
message.success('撤回申请成功!') message.success('流程终止成功!')
mybus.emit('closeModal', { type: '能力申请', index: 0 }) mybus.emit('closeModal', { type: '能力申请', index: 0 })
} else { } else {
message.warning('撤回申请失败!') message.warning('流程终止失败!')
} }
}) })
} }

View File

@ -19,7 +19,7 @@
@confirm="endThis" @confirm="endThis"
@cancel="cancel" @cancel="cancel"
> >
<a-button type="primary" danger>撤回申请</a-button> <a-button type="primary" danger>流程终止</a-button>
</a-popconfirm> </a-popconfirm>
<div v-else></div> <div v-else></div>
</div> </div>
@ -54,10 +54,10 @@
const endThis = () => { const endThis = () => {
endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => { endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
message.success('撤回申请成功!') message.success('流程终止成功!')
mybus.emit('closeModal', { type: '能力上架', index: 2 }) mybus.emit('closeModal', { type: '能力上架', index: 2 })
} else { } else {
message.warning('撤回申请失败!') message.warning('流程终止失败!')
} }
}) })
} }