diff --git a/src/views/wf/ticketd_b.vue b/src/views/wf/ticketd_b.vue index 2d65fece..0078a9de 100644 --- a/src/views/wf/ticketd_b.vue +++ b/src/views/wf/ticketd_b.vue @@ -35,7 +35,7 @@ const props = defineProps({ const workflow = ref(null); const transitions = ref([]); onMounted(async () => { - setTimeout(()=>{init()}, 2000) + setTimeout(()=>{init()}, 1000) // watch( // () => props.ticket_, // async (newVal) => { @@ -121,21 +121,27 @@ const submit = async (transition_id) => { ticket.title = props.title; ticket.workflow = workflow.value; if (props.t_id != null && props.t_id != undefined) { - ticket.ticket_data = { - t_id: props.t_id, - }; + ticket.ticket_data = Object.assign({t_id: props.t_id}, props.ticket_data); } else { ElMessage.error("缺少t_id"); isSaveing.value = false; return; } - ticket.transition = transition_id; + try { + // 先创建ticket let res = await API.wf.ticket.create.req(ticket); - isSaveing.value = false; - ElMessage.success("提交成功"); - emit("success", res.id) + ticketId.value = res.id; + try { + await API.wf.ticket.ticketHandle.req(ticketId.value, {transition: transition_id, ticket_data: props.ticket_data?props.ticket_data:{}}) + isSaveing.value = false; + ElMessage.success("提交成功"); + emit("success", res.id) + }catch(e){ + isSaveing.value = false; + return; + } } catch (e) { isSaveing.value = false; return;