wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-10-12 16:11:31 +08:00
parent adcb0cdbf0 fe17edeb39
commit f2a6e2ffc9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/views/personalCenter/components/AbilityApplication.vue
View File

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

6
front/src/views/personalCenter/components/PutOnTheShelf .vue
View File

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